Skip to content

Commit b87bab8

Browse files
committed
[Fix #648] Avoid splitting packages
1 parent a64027f commit b87bab8

File tree

50 files changed

+127
-121
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+127
-121
lines changed

api/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@
8787
<version>${project.version}</version>
8888
<dependencies/>
8989
<configuration>
90-
<targetPackage>io.serverlessworkflow.api.types</targetPackage>
90+
<srcPackage>io.serverlessworkflow.api.types</srcPackage>
91+
<targetPackage>io.serverlessworkflow.api.types.jackson</targetPackage>
9192
</configuration>
9293
<executions>
9394
<execution>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.fasterxml.jackson.databind.module.SimpleModule;
2222
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
2323
import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator.Feature;
24-
import io.serverlessworkflow.api.types.JacksonMixInModule;
24+
import io.serverlessworkflow.api.types.jackson.JacksonMixInModule;
2525
import io.serverlessworkflow.serialization.BeanDeserializerModifierWithValidation;
2626
import io.serverlessworkflow.serialization.URIDeserializer;
2727
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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,16 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.serverlessworkflow.impl.executors;
16+
package io.serverlessworkflow.impl.executors.func;
1717

18-
import io.serverlessworkflow.api.types.CallJava;
1918
import io.serverlessworkflow.api.types.TaskBase;
19+
import io.serverlessworkflow.api.types.func.CallJava;
2020
import io.serverlessworkflow.impl.TaskContext;
2121
import io.serverlessworkflow.impl.WorkflowApplication;
2222
import io.serverlessworkflow.impl.WorkflowContext;
2323
import io.serverlessworkflow.impl.WorkflowModel;
2424
import io.serverlessworkflow.impl.WorkflowModelFactory;
25+
import io.serverlessworkflow.impl.executors.CallableTask;
2526
import io.serverlessworkflow.impl.resources.ResourceLoader;
2627
import java.util.concurrent.CompletableFuture;
2728

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.serverlessworkflow.impl.executors;
17+
package io.serverlessworkflow.impl.executors.func;
1818

19-
import static io.serverlessworkflow.impl.executors.JavaCallExecutor.safeObject;
19+
import static io.serverlessworkflow.impl.executors.func.JavaCallExecutor.safeObject;
2020

2121
import io.serverlessworkflow.api.types.ForTask;
22-
import io.serverlessworkflow.api.types.ForTaskFunction;
2322
import io.serverlessworkflow.api.types.Workflow;
23+
import io.serverlessworkflow.api.types.func.ForTaskFunction;
2424
import io.serverlessworkflow.impl.WorkflowApplication;
2525
import io.serverlessworkflow.impl.WorkflowFilter;
2626
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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.serverlessworkflow.impl.executors;
17+
package io.serverlessworkflow.impl.executors.func;
1818

1919
import io.serverlessworkflow.api.types.SwitchCase;
20-
import io.serverlessworkflow.api.types.SwitchCaseFunction;
2120
import io.serverlessworkflow.api.types.SwitchTask;
2221
import io.serverlessworkflow.api.types.Workflow;
22+
import io.serverlessworkflow.api.types.func.SwitchCaseFunction;
2323
import io.serverlessworkflow.impl.WorkflowApplication;
2424
import io.serverlessworkflow.impl.WorkflowFilter;
2525
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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.serverlessworkflow.impl.executors;
16+
package io.serverlessworkflow.impl.executors.func;
1717

1818
import io.serverlessworkflow.api.types.Task;
1919
import io.serverlessworkflow.api.types.TaskBase;
2020
import io.serverlessworkflow.api.types.Workflow;
2121
import io.serverlessworkflow.impl.WorkflowApplication;
2222
import io.serverlessworkflow.impl.WorkflowPosition;
23+
import io.serverlessworkflow.impl.executors.DefaultTaskExecutorFactory;
24+
import io.serverlessworkflow.impl.executors.TaskExecutorBuilder;
2325
import io.serverlessworkflow.impl.resources.ResourceLoader;
2426

2527
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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.serverlessworkflow.impl.expressions;
16+
package io.serverlessworkflow.impl.expressions.func;
1717

1818
import io.serverlessworkflow.impl.TaskContext;
1919
import io.serverlessworkflow.impl.WorkflowContext;
2020
import io.serverlessworkflow.impl.WorkflowFilter;
2121
import io.serverlessworkflow.impl.WorkflowModel;
2222
import io.serverlessworkflow.impl.WorkflowModelFactory;
23+
import io.serverlessworkflow.impl.expressions.Expression;
24+
import io.serverlessworkflow.impl.expressions.ExpressionFactory;
2325
import java.util.function.BiFunction;
2426
import java.util.function.BiPredicate;
2527
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

Lines changed: 1 addition & 1 deletion
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.impl.expressions;
16+
package io.serverlessworkflow.impl.expressions.func;
1717

1818
import io.cloudevents.CloudEventData;
1919
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

Lines changed: 1 addition & 1 deletion
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.impl.expressions;
16+
package io.serverlessworkflow.impl.expressions.func;
1717

1818
import io.serverlessworkflow.impl.WorkflowModel;
1919
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

Lines changed: 1 addition & 1 deletion
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.impl.expressions;
16+
package io.serverlessworkflow.impl.expressions.func;
1717

1818
import io.cloudevents.CloudEvent;
1919
import io.cloudevents.CloudEventData;

0 commit comments

Comments
 (0)