From 7174e2e67f39f15c01df5dfeafbae0996a31012b Mon Sep 17 00:00:00 2001 From: Francisco Javier Tirado Sarti Date: Tue, 26 Nov 2024 12:45:31 +0100 Subject: [PATCH] Change resource package location Signed-off-by: Francisco Javier Tirado Sarti --- .../java/io/serverlessworkflow/impl/WorkflowApplication.java | 5 +++-- .../java/io/serverlessworkflow/impl/WorkflowDefinition.java | 3 ++- .../main/java/io/serverlessworkflow/impl/WorkflowUtils.java | 5 +++-- .../{ => impl}/resources/ClasspathResource.java | 2 +- .../{ => impl}/resources/DefaultResourceLoader.java | 2 +- .../{ => impl}/resources/DefaultResourceLoaderFactory.java | 2 +- .../{ => impl}/resources/DynamicResource.java | 2 +- .../{ => impl}/resources/FileResource.java | 2 +- .../{ => impl}/resources/HttpResource.java | 2 +- .../{ => impl}/resources/ResourceLoader.java | 2 +- .../{ => impl}/resources/ResourceLoaderFactory.java | 2 +- .../{ => impl}/resources/StaticResource.java | 2 +- impl/core/src/test/resources/switch-then-string.yaml | 2 +- .../src/test/resources/call-http-endpoint-interpolation.yaml | 2 +- .../call-http-query-parameters-external-schema.yaml | 2 +- impl/http/src/test/resources/call-http-query-parameters.yaml | 2 +- impl/http/src/test/resources/callGetHttp.yaml | 2 +- impl/http/src/test/resources/callPostHttp.yaml | 2 +- 18 files changed, 23 insertions(+), 20 deletions(-) rename impl/core/src/main/java/io/serverlessworkflow/{ => impl}/resources/ClasspathResource.java (95%) rename impl/core/src/main/java/io/serverlessworkflow/{ => impl}/resources/DefaultResourceLoader.java (98%) rename impl/core/src/main/java/io/serverlessworkflow/{ => impl}/resources/DefaultResourceLoaderFactory.java (95%) rename impl/core/src/main/java/io/serverlessworkflow/{ => impl}/resources/DynamicResource.java (95%) rename impl/core/src/main/java/io/serverlessworkflow/{ => impl}/resources/FileResource.java (96%) rename impl/core/src/main/java/io/serverlessworkflow/{ => impl}/resources/HttpResource.java (96%) rename impl/core/src/main/java/io/serverlessworkflow/{ => impl}/resources/ResourceLoader.java (95%) rename impl/core/src/main/java/io/serverlessworkflow/{ => impl}/resources/ResourceLoaderFactory.java (94%) rename impl/core/src/main/java/io/serverlessworkflow/{ => impl}/resources/StaticResource.java (94%) diff --git a/impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowApplication.java b/impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowApplication.java index 3fd81b00..02d807f3 100644 --- a/impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowApplication.java +++ b/impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowApplication.java @@ -23,8 +23,9 @@ import io.serverlessworkflow.impl.expressions.JQExpressionFactory; import io.serverlessworkflow.impl.jsonschema.DefaultSchemaValidatorFactory; import io.serverlessworkflow.impl.jsonschema.SchemaValidatorFactory; -import io.serverlessworkflow.resources.DefaultResourceLoaderFactory; -import io.serverlessworkflow.resources.ResourceLoaderFactory; +import io.serverlessworkflow.impl.resources.DefaultResourceLoaderFactory; +import io.serverlessworkflow.impl.resources.ResourceLoaderFactory; + import java.util.Collection; import java.util.Collections; import java.util.HashSet; diff --git a/impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowDefinition.java b/impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowDefinition.java index 136d2853..f593cea3 100644 --- a/impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowDefinition.java +++ b/impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowDefinition.java @@ -27,7 +27,8 @@ import io.serverlessworkflow.impl.json.JsonUtils; import io.serverlessworkflow.impl.jsonschema.SchemaValidator; import io.serverlessworkflow.impl.jsonschema.SchemaValidatorFactory; -import io.serverlessworkflow.resources.ResourceLoader; +import io.serverlessworkflow.impl.resources.ResourceLoader; + import java.nio.file.Path; import java.util.Collection; import java.util.Map; diff --git a/impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowUtils.java b/impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowUtils.java index 47191272..259a0e6a 100644 --- a/impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowUtils.java +++ b/impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowUtils.java @@ -33,8 +33,9 @@ import io.serverlessworkflow.impl.json.JsonUtils; import io.serverlessworkflow.impl.jsonschema.SchemaValidator; import io.serverlessworkflow.impl.jsonschema.SchemaValidatorFactory; -import io.serverlessworkflow.resources.ResourceLoader; -import io.serverlessworkflow.resources.StaticResource; +import io.serverlessworkflow.impl.resources.ResourceLoader; +import io.serverlessworkflow.impl.resources.StaticResource; + import java.io.IOException; import java.io.InputStream; import java.io.UncheckedIOException; diff --git a/impl/core/src/main/java/io/serverlessworkflow/resources/ClasspathResource.java b/impl/core/src/main/java/io/serverlessworkflow/impl/resources/ClasspathResource.java similarity index 95% rename from impl/core/src/main/java/io/serverlessworkflow/resources/ClasspathResource.java rename to impl/core/src/main/java/io/serverlessworkflow/impl/resources/ClasspathResource.java index 81455712..dad39237 100644 --- a/impl/core/src/main/java/io/serverlessworkflow/resources/ClasspathResource.java +++ b/impl/core/src/main/java/io/serverlessworkflow/impl/resources/ClasspathResource.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.serverlessworkflow.resources; +package io.serverlessworkflow.impl.resources; import java.io.InputStream; diff --git a/impl/core/src/main/java/io/serverlessworkflow/resources/DefaultResourceLoader.java b/impl/core/src/main/java/io/serverlessworkflow/impl/resources/DefaultResourceLoader.java similarity index 98% rename from impl/core/src/main/java/io/serverlessworkflow/resources/DefaultResourceLoader.java rename to impl/core/src/main/java/io/serverlessworkflow/impl/resources/DefaultResourceLoader.java index be6015b8..a23a9224 100644 --- a/impl/core/src/main/java/io/serverlessworkflow/resources/DefaultResourceLoader.java +++ b/impl/core/src/main/java/io/serverlessworkflow/impl/resources/DefaultResourceLoader.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.serverlessworkflow.resources; +package io.serverlessworkflow.impl.resources; import io.serverlessworkflow.api.types.Endpoint; import io.serverlessworkflow.api.types.EndpointUri; diff --git a/impl/core/src/main/java/io/serverlessworkflow/resources/DefaultResourceLoaderFactory.java b/impl/core/src/main/java/io/serverlessworkflow/impl/resources/DefaultResourceLoaderFactory.java similarity index 95% rename from impl/core/src/main/java/io/serverlessworkflow/resources/DefaultResourceLoaderFactory.java rename to impl/core/src/main/java/io/serverlessworkflow/impl/resources/DefaultResourceLoaderFactory.java index 4efddb30..60717e1d 100644 --- a/impl/core/src/main/java/io/serverlessworkflow/resources/DefaultResourceLoaderFactory.java +++ b/impl/core/src/main/java/io/serverlessworkflow/impl/resources/DefaultResourceLoaderFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.serverlessworkflow.resources; +package io.serverlessworkflow.impl.resources; import java.nio.file.Path; diff --git a/impl/core/src/main/java/io/serverlessworkflow/resources/DynamicResource.java b/impl/core/src/main/java/io/serverlessworkflow/impl/resources/DynamicResource.java similarity index 95% rename from impl/core/src/main/java/io/serverlessworkflow/resources/DynamicResource.java rename to impl/core/src/main/java/io/serverlessworkflow/impl/resources/DynamicResource.java index 476f24e7..ee9432c0 100644 --- a/impl/core/src/main/java/io/serverlessworkflow/resources/DynamicResource.java +++ b/impl/core/src/main/java/io/serverlessworkflow/impl/resources/DynamicResource.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.serverlessworkflow.resources; +package io.serverlessworkflow.impl.resources; import com.fasterxml.jackson.databind.JsonNode; import io.serverlessworkflow.impl.TaskContext; diff --git a/impl/core/src/main/java/io/serverlessworkflow/resources/FileResource.java b/impl/core/src/main/java/io/serverlessworkflow/impl/resources/FileResource.java similarity index 96% rename from impl/core/src/main/java/io/serverlessworkflow/resources/FileResource.java rename to impl/core/src/main/java/io/serverlessworkflow/impl/resources/FileResource.java index a8b54ff7..6358b6ce 100644 --- a/impl/core/src/main/java/io/serverlessworkflow/resources/FileResource.java +++ b/impl/core/src/main/java/io/serverlessworkflow/impl/resources/FileResource.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.serverlessworkflow.resources; +package io.serverlessworkflow.impl.resources; import java.io.IOException; import java.io.InputStream; diff --git a/impl/core/src/main/java/io/serverlessworkflow/resources/HttpResource.java b/impl/core/src/main/java/io/serverlessworkflow/impl/resources/HttpResource.java similarity index 96% rename from impl/core/src/main/java/io/serverlessworkflow/resources/HttpResource.java rename to impl/core/src/main/java/io/serverlessworkflow/impl/resources/HttpResource.java index 27d64a94..906e5c83 100644 --- a/impl/core/src/main/java/io/serverlessworkflow/resources/HttpResource.java +++ b/impl/core/src/main/java/io/serverlessworkflow/impl/resources/HttpResource.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.serverlessworkflow.resources; +package io.serverlessworkflow.impl.resources; import java.io.IOException; import java.io.InputStream; diff --git a/impl/core/src/main/java/io/serverlessworkflow/resources/ResourceLoader.java b/impl/core/src/main/java/io/serverlessworkflow/impl/resources/ResourceLoader.java similarity index 95% rename from impl/core/src/main/java/io/serverlessworkflow/resources/ResourceLoader.java rename to impl/core/src/main/java/io/serverlessworkflow/impl/resources/ResourceLoader.java index 1e6ff2d5..346856bd 100644 --- a/impl/core/src/main/java/io/serverlessworkflow/resources/ResourceLoader.java +++ b/impl/core/src/main/java/io/serverlessworkflow/impl/resources/ResourceLoader.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.serverlessworkflow.resources; +package io.serverlessworkflow.impl.resources; import io.serverlessworkflow.api.types.ExternalResource; import io.serverlessworkflow.impl.WorkflowContext; diff --git a/impl/core/src/main/java/io/serverlessworkflow/resources/ResourceLoaderFactory.java b/impl/core/src/main/java/io/serverlessworkflow/impl/resources/ResourceLoaderFactory.java similarity index 94% rename from impl/core/src/main/java/io/serverlessworkflow/resources/ResourceLoaderFactory.java rename to impl/core/src/main/java/io/serverlessworkflow/impl/resources/ResourceLoaderFactory.java index 56347041..c064672b 100644 --- a/impl/core/src/main/java/io/serverlessworkflow/resources/ResourceLoaderFactory.java +++ b/impl/core/src/main/java/io/serverlessworkflow/impl/resources/ResourceLoaderFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.serverlessworkflow.resources; +package io.serverlessworkflow.impl.resources; import java.nio.file.Path; diff --git a/impl/core/src/main/java/io/serverlessworkflow/resources/StaticResource.java b/impl/core/src/main/java/io/serverlessworkflow/impl/resources/StaticResource.java similarity index 94% rename from impl/core/src/main/java/io/serverlessworkflow/resources/StaticResource.java rename to impl/core/src/main/java/io/serverlessworkflow/impl/resources/StaticResource.java index 3b52a79c..32443dfc 100644 --- a/impl/core/src/main/java/io/serverlessworkflow/resources/StaticResource.java +++ b/impl/core/src/main/java/io/serverlessworkflow/impl/resources/StaticResource.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.serverlessworkflow.resources; +package io.serverlessworkflow.impl.resources; import java.io.InputStream; diff --git a/impl/core/src/test/resources/switch-then-string.yaml b/impl/core/src/test/resources/switch-then-string.yaml index 6c54b359..a35ebd45 100644 --- a/impl/core/src/test/resources/switch-then-string.yaml +++ b/impl/core/src/test/resources/switch-then-string.yaml @@ -1,6 +1,6 @@ document: dsl: 1.0.0-alpha5 - namespace: examples + namespace: test name: switch version: 0.1.0 do: diff --git a/impl/http/src/test/resources/call-http-endpoint-interpolation.yaml b/impl/http/src/test/resources/call-http-endpoint-interpolation.yaml index 4d6453a5..5c1239f0 100644 --- a/impl/http/src/test/resources/call-http-endpoint-interpolation.yaml +++ b/impl/http/src/test/resources/call-http-endpoint-interpolation.yaml @@ -1,6 +1,6 @@ document: dsl: 1.0.0-alpha5 - namespace: examples + namespace: test name: call-http-shorthand-endpoint version: '0.1.0' do: diff --git a/impl/http/src/test/resources/call-http-query-parameters-external-schema.yaml b/impl/http/src/test/resources/call-http-query-parameters-external-schema.yaml index e72b79e4..9488592e 100644 --- a/impl/http/src/test/resources/call-http-query-parameters-external-schema.yaml +++ b/impl/http/src/test/resources/call-http-query-parameters-external-schema.yaml @@ -1,6 +1,6 @@ document: dsl: 1.0.0-alpha2 - namespace: examples + namespace: test name: http-query-params-schema version: 1.0.0-alpha2 input: diff --git a/impl/http/src/test/resources/call-http-query-parameters.yaml b/impl/http/src/test/resources/call-http-query-parameters.yaml index 75f33378..d209bf07 100644 --- a/impl/http/src/test/resources/call-http-query-parameters.yaml +++ b/impl/http/src/test/resources/call-http-query-parameters.yaml @@ -1,6 +1,6 @@ document: dsl: 1.0.0-alpha2 - namespace: examples + namespace: test name: http-query-params version: 1.0.0-alpha2 input: diff --git a/impl/http/src/test/resources/callGetHttp.yaml b/impl/http/src/test/resources/callGetHttp.yaml index eb7145fa..6fc07807 100644 --- a/impl/http/src/test/resources/callGetHttp.yaml +++ b/impl/http/src/test/resources/callGetHttp.yaml @@ -1,6 +1,6 @@ document: dsl: 1.0.0-alpha1 - namespace: examples + namespace: test name: http-call-with-response version: 1.0.0 do: diff --git a/impl/http/src/test/resources/callPostHttp.yaml b/impl/http/src/test/resources/callPostHttp.yaml index 0e998094..d66dcfaa 100644 --- a/impl/http/src/test/resources/callPostHttp.yaml +++ b/impl/http/src/test/resources/callPostHttp.yaml @@ -1,6 +1,6 @@ document: dsl: 1.0.0-alpha1 - namespace: examples + namespace: test name: http-call-with-response-output version: 1.0.0 do: