[Fix #648] Avoid splitting packages

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 → 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 → 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 → 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 → 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 → 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 → 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 → 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 → 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;

experimental/lambda/src/main/resources/META-INF/services/io.serverlessworkflow.impl.executors.CallableTask

@@ -1 +1 @@
-io.serverlessworkflow.impl.executors.JavaCallExecutor
+io.serverlessworkflow.impl.executors.func.JavaCallExecutor

experimental/lambda/src/main/resources/META-INF/services/io.serverlessworkflow.impl.executors.TaskExecutorFactory

@@ -1 +1 @@
-io.serverlessworkflow.impl.executors.JavaTaskExecutorFactory
+io.serverlessworkflow.impl.executors.func.JavaTaskExecutorFactory

experimental/lambda/src/main/resources/META-INF/services/io.serverlessworkflow.impl.expressions.ExpressionFactory

@@ -1 +1 @@
-io.serverlessworkflow.impl.expressions.JavaExpressionFactory
+io.serverlessworkflow.impl.expressions.func.JavaExpressionFactory

experimental/lambda/src/test/java/io/serverless/workflow/impl/CallTest.java

@@ -17,19 +17,19 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import io.serverlessworkflow.api.types.CallJava;
-import io.serverlessworkflow.api.types.CallTaskJava;
 import io.serverlessworkflow.api.types.Document;
 import io.serverlessworkflow.api.types.FlowDirective;
 import io.serverlessworkflow.api.types.FlowDirectiveEnum;
 import io.serverlessworkflow.api.types.ForTaskConfiguration;
-import io.serverlessworkflow.api.types.ForTaskFunction;
-import io.serverlessworkflow.api.types.SwitchCaseFunction;
 import io.serverlessworkflow.api.types.SwitchItem;
 import io.serverlessworkflow.api.types.SwitchTask;
 import io.serverlessworkflow.api.types.Task;
 import io.serverlessworkflow.api.types.TaskItem;
 import io.serverlessworkflow.api.types.Workflow;
+import io.serverlessworkflow.api.types.func.CallJava;
+import io.serverlessworkflow.api.types.func.CallTaskJava;
+import io.serverlessworkflow.api.types.func.ForTaskFunction;
+import io.serverlessworkflow.api.types.func.SwitchCaseFunction;
 import io.serverlessworkflow.impl.WorkflowApplication;
 import io.serverlessworkflow.impl.WorkflowDefinition;
 import java.util.Collection;

experimental/lambda/src/test/java/io/serverless/workflow/impl/ModelTest.java

@@ -20,7 +20,6 @@
 import io.serverlessworkflow.api.types.Document;
 import io.serverlessworkflow.api.types.DurationInline;
 import io.serverlessworkflow.api.types.Output;
-import io.serverlessworkflow.api.types.OutputAsFunction;
 import io.serverlessworkflow.api.types.Set;
 import io.serverlessworkflow.api.types.SetTask;
 import io.serverlessworkflow.api.types.SetTaskConfiguration;
@@ -29,6 +28,7 @@
 import io.serverlessworkflow.api.types.TimeoutAfter;
 import io.serverlessworkflow.api.types.WaitTask;
 import io.serverlessworkflow.api.types.Workflow;
+import io.serverlessworkflow.api.types.func.OutputAsFunction;
 import io.serverlessworkflow.impl.WorkflowApplication;
 import java.util.List;
 import java.util.Map;

experimental/types/src/main/java/io/serverlessworkflow/api/types/CallJava.java → experimental/types/src/main/java/io/serverlessworkflow/api/types/func/CallJava.java

@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.api.types;
+package io.serverlessworkflow.api.types.func;
 
+import io.serverlessworkflow.api.types.TaskBase;
 import io.serverlessworkflow.impl.expressions.LoopFunction;
 import io.serverlessworkflow.impl.expressions.LoopFunctionIndex;
 import java.util.function.Consumer;

experimental/types/src/main/java/io/serverlessworkflow/api/types/CallTaskJava.java → experimental/types/src/main/java/io/serverlessworkflow/api/types/func/CallTaskJava.java

@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.api.types;
+package io.serverlessworkflow.api.types.func;
+
+import io.serverlessworkflow.api.types.CallTask;
 
 public class CallTaskJava extends CallTask {
 

experimental/types/src/main/java/io/serverlessworkflow/api/types/ExportAsFunction.java → experimental/types/src/main/java/io/serverlessworkflow/api/types/func/ExportAsFunction.java

@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.api.types;
+package io.serverlessworkflow.api.types.func;
 
+import io.serverlessworkflow.api.types.ExportAs;
 import java.util.function.Function;
 
 public class ExportAsFunction extends ExportAs {

experimental/types/src/main/java/io/serverlessworkflow/api/types/ForTaskFunction.java → experimental/types/src/main/java/io/serverlessworkflow/api/types/func/ForTaskFunction.java

@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.api.types;
+package io.serverlessworkflow.api.types.func;
 
+import io.serverlessworkflow.api.types.ForTask;
 import io.serverlessworkflow.impl.expressions.LoopPredicate;
 import io.serverlessworkflow.impl.expressions.LoopPredicateIndex;
 import java.util.Collection;

experimental/types/src/main/java/io/serverlessworkflow/api/types/InputFromFunction.java → experimental/types/src/main/java/io/serverlessworkflow/api/types/func/InputFromFunction.java

@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.api.types;
+package io.serverlessworkflow.api.types.func;
 
+import io.serverlessworkflow.api.types.InputFrom;
 import java.util.function.Function;
 
 public class InputFromFunction extends InputFrom {

experimental/types/src/main/java/io/serverlessworkflow/api/types/OutputAsFunction.java → experimental/types/src/main/java/io/serverlessworkflow/api/types/func/OutputAsFunction.java

@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.api.types;
+package io.serverlessworkflow.api.types.func;
 
+import io.serverlessworkflow.api.types.OutputAs;
 import java.util.function.Function;
 
 public class OutputAsFunction extends OutputAs {

experimental/types/src/main/java/io/serverlessworkflow/api/types/SwitchCaseFunction.java → experimental/types/src/main/java/io/serverlessworkflow/api/types/func/SwitchCaseFunction.java

@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.api.types;
+package io.serverlessworkflow.api.types.func;
 
+import io.serverlessworkflow.api.types.SwitchCase;
 import java.util.function.Predicate;
 
 public class SwitchCaseFunction extends SwitchCase {

fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncCallTaskBuilder.java

@@ -15,8 +15,8 @@
  */
 package io.serverlessworkflow.fluent.func;
 
-import io.serverlessworkflow.api.types.CallJava;
-import io.serverlessworkflow.api.types.CallTaskJava;
+import io.serverlessworkflow.api.types.func.CallJava;
+import io.serverlessworkflow.api.types.func.CallTaskJava;
 import io.serverlessworkflow.fluent.spec.TaskBaseBuilder;
 import java.util.function.Function;
 

fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncForTaskBuilder.java

@@ -15,12 +15,12 @@
  */
 package io.serverlessworkflow.fluent.func;
 
-import io.serverlessworkflow.api.types.CallJava;
-import io.serverlessworkflow.api.types.CallTaskJava;
 import io.serverlessworkflow.api.types.ForTaskConfiguration;
-import io.serverlessworkflow.api.types.ForTaskFunction;
 import io.serverlessworkflow.api.types.Task;
 import io.serverlessworkflow.api.types.TaskItem;
+import io.serverlessworkflow.api.types.func.CallJava;
+import io.serverlessworkflow.api.types.func.CallTaskJava;
+import io.serverlessworkflow.api.types.func.ForTaskFunction;
 import io.serverlessworkflow.fluent.spec.TaskBaseBuilder;
 import io.serverlessworkflow.impl.expressions.LoopFunction;
 import io.serverlessworkflow.impl.expressions.LoopPredicate;

fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncSwitchTaskBuilder.java

@@ -18,9 +18,9 @@
 import io.serverlessworkflow.api.types.FlowDirective;
 import io.serverlessworkflow.api.types.FlowDirectiveEnum;
 import io.serverlessworkflow.api.types.SwitchCase;
-import io.serverlessworkflow.api.types.SwitchCaseFunction;
 import io.serverlessworkflow.api.types.SwitchItem;
 import io.serverlessworkflow.api.types.SwitchTask;
+import io.serverlessworkflow.api.types.func.SwitchCaseFunction;
 import io.serverlessworkflow.fluent.spec.TaskBaseBuilder;
 import java.util.ArrayList;
 import java.util.List;

fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncTransformations.java

@@ -16,11 +16,11 @@
 package io.serverlessworkflow.fluent.func;
 
 import io.serverlessworkflow.api.types.Export;
-import io.serverlessworkflow.api.types.ExportAsFunction;
 import io.serverlessworkflow.api.types.Input;
-import io.serverlessworkflow.api.types.InputFromFunction;
 import io.serverlessworkflow.api.types.Output;
-import io.serverlessworkflow.api.types.OutputAsFunction;
+import io.serverlessworkflow.api.types.func.ExportAsFunction;
+import io.serverlessworkflow.api.types.func.InputFromFunction;
+import io.serverlessworkflow.api.types.func.OutputAsFunction;
 import io.serverlessworkflow.fluent.spec.TransformationHandlers;
 import java.util.function.Function;
 

fluent/func/src/test/java/io/serverlessworkflow/fluent/func/JavaWorkflowBuilderTest.java

@@ -17,7 +17,15 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import io.serverlessworkflow.api.types.*;
+import io.serverlessworkflow.api.types.Document;
+import io.serverlessworkflow.api.types.Export;
+import io.serverlessworkflow.api.types.Output;
+import io.serverlessworkflow.api.types.SetTask;
+import io.serverlessworkflow.api.types.Task;
+import io.serverlessworkflow.api.types.TaskBase;
+import io.serverlessworkflow.api.types.TaskItem;
+import io.serverlessworkflow.api.types.Workflow;
+import io.serverlessworkflow.api.types.func.*;
 import io.serverlessworkflow.fluent.spec.BaseWorkflowBuilder;
 // if you reuse anything
 import java.util.List;