Merge pull request #661 from fjtirado/Fix_#648

[Fix #648] Avoid splitting packages

Author: fjtirado

api/pom.xml

@@ -87,7 +87,8 @@
             <version>${project.version}</version>
             <dependencies/>
             <configuration>
-              <targetPackage>io.serverlessworkflow.api.types</targetPackage>
+              <srcPackage>io.serverlessworkflow.api.types</srcPackage>
+              <targetPackage>io.serverlessworkflow.api.types.jackson</targetPackage>
             </configuration>
             <executions>
                 <execution>

api/src/main/java/io/serverlessworkflow/api/ObjectMapperFactory.java

@@ -21,7 +21,7 @@
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator.Feature;
-import io.serverlessworkflow.api.types.JacksonMixInModule;
+import io.serverlessworkflow.api.types.jackson.JacksonMixInModule;
 import io.serverlessworkflow.serialization.BeanDeserializerModifierWithValidation;
 import io.serverlessworkflow.serialization.URIDeserializer;
 import io.serverlessworkflow.serialization.URISerializer;

experimental/lambda/src/main/java/io/serverlessworkflow/impl/executors/JavaCallExecutor.java renamed to experimental/lambda/src/main/java/io/serverlessworkflow/impl/executors/func/JavaCallExecutor.java

@@ -13,15 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.impl.executors;
+package io.serverlessworkflow.impl.executors.func;
 
-import io.serverlessworkflow.api.types.CallJava;
 import io.serverlessworkflow.api.types.TaskBase;
+import io.serverlessworkflow.api.types.func.CallJava;
 import io.serverlessworkflow.impl.TaskContext;
 import io.serverlessworkflow.impl.WorkflowApplication;
 import io.serverlessworkflow.impl.WorkflowContext;
 import io.serverlessworkflow.impl.WorkflowModel;
 import io.serverlessworkflow.impl.WorkflowModelFactory;
+import io.serverlessworkflow.impl.executors.CallableTask;
 import io.serverlessworkflow.impl.resources.ResourceLoader;
 import java.util.concurrent.CompletableFuture;
 

experimental/lambda/src/main/java/io/serverlessworkflow/impl/executors/JavaForExecutorBuilder.java renamed to experimental/lambda/src/main/java/io/serverlessworkflow/impl/executors/func/JavaForExecutorBuilder.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package io.serverlessworkflow.impl.executors;
+package io.serverlessworkflow.impl.executors.func;
 
-import static io.serverlessworkflow.impl.executors.JavaCallExecutor.safeObject;
+import static io.serverlessworkflow.impl.executors.func.JavaCallExecutor.safeObject;
 
 import io.serverlessworkflow.api.types.ForTask;
-import io.serverlessworkflow.api.types.ForTaskFunction;
 import io.serverlessworkflow.api.types.Workflow;
+import io.serverlessworkflow.api.types.func.ForTaskFunction;
 import io.serverlessworkflow.impl.WorkflowApplication;
 import io.serverlessworkflow.impl.WorkflowFilter;
 import io.serverlessworkflow.impl.WorkflowPosition;

experimental/lambda/src/main/java/io/serverlessworkflow/impl/executors/JavaSwitchExecutorBuilder.java renamed to experimental/lambda/src/main/java/io/serverlessworkflow/impl/executors/func/JavaSwitchExecutorBuilder.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package io.serverlessworkflow.impl.executors;
+package io.serverlessworkflow.impl.executors.func;
 
 import io.serverlessworkflow.api.types.SwitchCase;
-import io.serverlessworkflow.api.types.SwitchCaseFunction;
 import io.serverlessworkflow.api.types.SwitchTask;
 import io.serverlessworkflow.api.types.Workflow;
+import io.serverlessworkflow.api.types.func.SwitchCaseFunction;
 import io.serverlessworkflow.impl.WorkflowApplication;
 import io.serverlessworkflow.impl.WorkflowFilter;
 import io.serverlessworkflow.impl.WorkflowPosition;

experimental/lambda/src/main/java/io/serverlessworkflow/impl/executors/JavaTaskExecutorFactory.java renamed to experimental/lambda/src/main/java/io/serverlessworkflow/impl/executors/func/JavaTaskExecutorFactory.java

@@ -13,13 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.impl.executors;
+package io.serverlessworkflow.impl.executors.func;
 
 import io.serverlessworkflow.api.types.Task;
 import io.serverlessworkflow.api.types.TaskBase;
 import io.serverlessworkflow.api.types.Workflow;
 import io.serverlessworkflow.impl.WorkflowApplication;
 import io.serverlessworkflow.impl.WorkflowPosition;
+import io.serverlessworkflow.impl.executors.DefaultTaskExecutorFactory;
+import io.serverlessworkflow.impl.executors.TaskExecutorBuilder;
 import io.serverlessworkflow.impl.resources.ResourceLoader;
 
 public class JavaTaskExecutorFactory extends DefaultTaskExecutorFactory {

experimental/lambda/src/main/java/io/serverlessworkflow/impl/expressions/JavaExpressionFactory.java renamed to experimental/lambda/src/main/java/io/serverlessworkflow/impl/expressions/func/JavaExpressionFactory.java

@@ -13,13 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.impl.expressions;
+package io.serverlessworkflow.impl.expressions.func;
 
 import io.serverlessworkflow.impl.TaskContext;
 import io.serverlessworkflow.impl.WorkflowContext;
 import io.serverlessworkflow.impl.WorkflowFilter;
 import io.serverlessworkflow.impl.WorkflowModel;
 import io.serverlessworkflow.impl.WorkflowModelFactory;
+import io.serverlessworkflow.impl.expressions.Expression;
+import io.serverlessworkflow.impl.expressions.ExpressionFactory;
 import java.util.function.BiFunction;
 import java.util.function.BiPredicate;
 import java.util.function.Function;

experimental/lambda/src/main/java/io/serverlessworkflow/impl/expressions/JavaModel.java renamed to experimental/lambda/src/main/java/io/serverlessworkflow/impl/expressions/func/JavaModel.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.impl.expressions;
+package io.serverlessworkflow.impl.expressions.func;
 
 import io.cloudevents.CloudEventData;
 import io.serverlessworkflow.impl.WorkflowModel;

experimental/lambda/src/main/java/io/serverlessworkflow/impl/expressions/JavaModelCollection.java renamed to experimental/lambda/src/main/java/io/serverlessworkflow/impl/expressions/func/JavaModelCollection.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.impl.expressions;
+package io.serverlessworkflow.impl.expressions.func;
 
 import io.serverlessworkflow.impl.WorkflowModel;
 import io.serverlessworkflow.impl.WorkflowModelCollection;

experimental/lambda/src/main/java/io/serverlessworkflow/impl/expressions/JavaModelFactory.java renamed to experimental/lambda/src/main/java/io/serverlessworkflow/impl/expressions/func/JavaModelFactory.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.impl.expressions;
+package io.serverlessworkflow.impl.expressions.func;
 
 import io.cloudevents.CloudEvent;
 import io.cloudevents.CloudEventData;