Skip to content

Commit 9087cb9

Browse files
authored
Merge pull request #481 from fjtirado/relocate_some_resources
Change resource package location
2 parents 50a6a33 + 7174e2e commit 9087cb9

18 files changed

+23
-20
lines changed

impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowApplication.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@
2323
import io.serverlessworkflow.impl.expressions.JQExpressionFactory;
2424
import io.serverlessworkflow.impl.jsonschema.DefaultSchemaValidatorFactory;
2525
import io.serverlessworkflow.impl.jsonschema.SchemaValidatorFactory;
26-
import io.serverlessworkflow.resources.DefaultResourceLoaderFactory;
27-
import io.serverlessworkflow.resources.ResourceLoaderFactory;
26+
import io.serverlessworkflow.impl.resources.DefaultResourceLoaderFactory;
27+
import io.serverlessworkflow.impl.resources.ResourceLoaderFactory;
28+
2829
import java.util.Collection;
2930
import java.util.Collections;
3031
import java.util.HashSet;

impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowDefinition.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
import io.serverlessworkflow.impl.json.JsonUtils;
2828
import io.serverlessworkflow.impl.jsonschema.SchemaValidator;
2929
import io.serverlessworkflow.impl.jsonschema.SchemaValidatorFactory;
30-
import io.serverlessworkflow.resources.ResourceLoader;
30+
import io.serverlessworkflow.impl.resources.ResourceLoader;
31+
3132
import java.nio.file.Path;
3233
import java.util.Collection;
3334
import java.util.Map;

impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowUtils.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,9 @@
3333
import io.serverlessworkflow.impl.json.JsonUtils;
3434
import io.serverlessworkflow.impl.jsonschema.SchemaValidator;
3535
import io.serverlessworkflow.impl.jsonschema.SchemaValidatorFactory;
36-
import io.serverlessworkflow.resources.ResourceLoader;
37-
import io.serverlessworkflow.resources.StaticResource;
36+
import io.serverlessworkflow.impl.resources.ResourceLoader;
37+
import io.serverlessworkflow.impl.resources.StaticResource;
38+
3839
import java.io.IOException;
3940
import java.io.InputStream;
4041
import java.io.UncheckedIOException;

impl/core/src/main/java/io/serverlessworkflow/resources/ClasspathResource.java impl/core/src/main/java/io/serverlessworkflow/impl/resources/ClasspathResource.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.serverlessworkflow.resources;
16+
package io.serverlessworkflow.impl.resources;
1717

1818
import java.io.InputStream;
1919

impl/core/src/main/java/io/serverlessworkflow/resources/DefaultResourceLoader.java impl/core/src/main/java/io/serverlessworkflow/impl/resources/DefaultResourceLoader.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.serverlessworkflow.resources;
16+
package io.serverlessworkflow.impl.resources;
1717

1818
import io.serverlessworkflow.api.types.Endpoint;
1919
import io.serverlessworkflow.api.types.EndpointUri;

impl/core/src/main/java/io/serverlessworkflow/resources/DefaultResourceLoaderFactory.java impl/core/src/main/java/io/serverlessworkflow/impl/resources/DefaultResourceLoaderFactory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.serverlessworkflow.resources;
16+
package io.serverlessworkflow.impl.resources;
1717

1818
import java.nio.file.Path;
1919

impl/core/src/main/java/io/serverlessworkflow/resources/DynamicResource.java impl/core/src/main/java/io/serverlessworkflow/impl/resources/DynamicResource.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.serverlessworkflow.resources;
16+
package io.serverlessworkflow.impl.resources;
1717

1818
import com.fasterxml.jackson.databind.JsonNode;
1919
import io.serverlessworkflow.impl.TaskContext;

impl/core/src/main/java/io/serverlessworkflow/resources/FileResource.java impl/core/src/main/java/io/serverlessworkflow/impl/resources/FileResource.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.serverlessworkflow.resources;
16+
package io.serverlessworkflow.impl.resources;
1717

1818
import java.io.IOException;
1919
import java.io.InputStream;

impl/core/src/main/java/io/serverlessworkflow/resources/HttpResource.java impl/core/src/main/java/io/serverlessworkflow/impl/resources/HttpResource.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.serverlessworkflow.resources;
16+
package io.serverlessworkflow.impl.resources;
1717

1818
import java.io.IOException;
1919
import java.io.InputStream;

impl/core/src/main/java/io/serverlessworkflow/resources/ResourceLoader.java impl/core/src/main/java/io/serverlessworkflow/impl/resources/ResourceLoader.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.serverlessworkflow.resources;
16+
package io.serverlessworkflow.impl.resources;
1717

1818
import io.serverlessworkflow.api.types.ExternalResource;
1919
import io.serverlessworkflow.impl.WorkflowContext;

impl/core/src/main/java/io/serverlessworkflow/resources/ResourceLoaderFactory.java impl/core/src/main/java/io/serverlessworkflow/impl/resources/ResourceLoaderFactory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.serverlessworkflow.resources;
16+
package io.serverlessworkflow.impl.resources;
1717

1818
import java.nio.file.Path;
1919

impl/core/src/main/java/io/serverlessworkflow/resources/StaticResource.java impl/core/src/main/java/io/serverlessworkflow/impl/resources/StaticResource.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.serverlessworkflow.resources;
16+
package io.serverlessworkflow.impl.resources;
1717

1818
import java.io.InputStream;
1919

impl/core/src/test/resources/switch-then-string.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
document:
22
dsl: 1.0.0-alpha5
3-
namespace: examples
3+
namespace: test
44
name: switch
55
version: 0.1.0
66
do:

impl/http/src/test/resources/call-http-endpoint-interpolation.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
document:
22
dsl: 1.0.0-alpha5
3-
namespace: examples
3+
namespace: test
44
name: call-http-shorthand-endpoint
55
version: '0.1.0'
66
do:

impl/http/src/test/resources/call-http-query-parameters-external-schema.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
document:
22
dsl: 1.0.0-alpha2
3-
namespace: examples
3+
namespace: test
44
name: http-query-params-schema
55
version: 1.0.0-alpha2
66
input:

impl/http/src/test/resources/call-http-query-parameters.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
document:
22
dsl: 1.0.0-alpha2
3-
namespace: examples
3+
namespace: test
44
name: http-query-params
55
version: 1.0.0-alpha2
66
input:

impl/http/src/test/resources/callGetHttp.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
document:
22
dsl: 1.0.0-alpha1
3-
namespace: examples
3+
namespace: test
44
name: http-call-with-response
55
version: 1.0.0
66
do:

impl/http/src/test/resources/callPostHttp.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
document:
22
dsl: 1.0.0-alpha1
3-
namespace: examples
3+
namespace: test
44
name: http-call-with-response-output
55
version: 1.0.0
66
do:

0 commit comments

Comments
 (0)