refactor(core): separate models

core/src/main/java/org/floworc/core/executions/MetricEntry.java

@@ -1,5 +0,0 @@
-package org.floworc.core.executions;
-
-public class MetricEntry {
-
-}

core/src/main/java/org/floworc/core/models/executions/Context.java

@@ -1,11 +1,11 @@
-package org.floworc.core.executions;
+package org.floworc.core.models.executions;
 
-import lombok.Data;
-import org.floworc.core.flows.State;
+import lombok.Value;
+import org.floworc.core.models.flows.State;
 
 import java.util.Map;
 
-@Data
+@Value
 public class Context {
     private Map<String, Object> inputs;
 

core/src/main/java/org/floworc/core/models/executions/Execution.java

@@ -1,9 +1,9 @@
-package org.floworc.core.executions;
+package org.floworc.core.models.executions;
 
 import lombok.*;
 import lombok.experimental.Wither;
-import org.floworc.core.flows.State;
-import org.floworc.core.tasks.Task;
+import org.floworc.core.models.flows.State;
+import org.floworc.core.models.tasks.Task;
 
 import javax.validation.constraints.NotNull;
 import java.util.ArrayList;

core/src/main/java/org/floworc/core/models/executions/LogEntry.java

@@ -1,11 +1,11 @@
-package org.floworc.core.executions;
+package org.floworc.core.models.executions;
 
-import lombok.Data;
+import lombok.Value;
 import org.slf4j.event.Level;
 
 import java.time.Instant;
 
-@Data
+@Value
 public class LogEntry {
     Instant timestamp;
 

core/src/main/java/org/floworc/core/models/executions/MetricEntry.java

@@ -0,0 +1,5 @@
+package org.floworc.core.models.executions;
+
+public class MetricEntry {
+
+}

core/src/main/java/org/floworc/core/models/executions/TaskRun.java

@@ -1,10 +1,10 @@
-package org.floworc.core.executions;
+package org.floworc.core.models.executions;
 
 import com.devskiller.friendly_id.FriendlyId;
 import lombok.Builder;
 import lombok.Value;
-import org.floworc.core.flows.State;
-import org.floworc.core.tasks.Task;
+import org.floworc.core.models.flows.State;
+import org.floworc.core.models.tasks.Task;
 
 import javax.validation.constraints.NotNull;
 import java.util.ArrayList;

core/src/main/java/org/floworc/core/models/flows/Flow.java

@@ -1,8 +1,8 @@
-package org.floworc.core.flows;
+package org.floworc.core.models.flows;
 
 import lombok.*;
-import org.floworc.core.tasks.Task;
-import org.floworc.core.triggers.Trigger;
+import org.floworc.core.models.tasks.Task;
+import org.floworc.core.models.triggers.Trigger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

core/src/main/java/org/floworc/core/models/flows/Inputs.java

@@ -1,11 +1,10 @@
-package org.floworc.core.flows;
+package org.floworc.core.models.flows;
 
-
-import lombok.Data;
+import lombok.Value;
 
 import javax.validation.constraints.NotNull;
 
-@Data
+@Value
 public class Inputs {
     @NotNull
     private String name;

core/src/main/java/org/floworc/core/models/flows/State.java

@@ -1,8 +1,7 @@
-package org.floworc.core.flows;
+package org.floworc.core.models.flows;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Value;
-import org.floworc.core.executions.TaskRun;
 
 import java.time.Duration;
 import java.time.Instant;

core/src/main/java/org/floworc/core/models/tasks/FlowableTask.java

@@ -1,6 +1,6 @@
-package org.floworc.core.tasks;
+package org.floworc.core.models.tasks;
 
-import org.floworc.core.executions.Execution;
+import org.floworc.core.models.executions.Execution;
 
 import java.util.List;
 import java.util.Optional;

core/src/main/java/org/floworc/core/models/tasks/Retry.java

@@ -1,10 +1,10 @@
-package org.floworc.core.tasks;
+package org.floworc.core.models.tasks;
 
-import lombok.*;
+import lombok.Value;
 
 import java.time.Duration;
 
-@Data
+@Value
 public class Retry {
     private int limit;
 

core/src/main/java/org/floworc/core/models/tasks/RetryIntervalType.java

@@ -1,4 +1,4 @@
-package org.floworc.core.tasks;
+package org.floworc.core.models.tasks;
 
 public enum RetryIntervalType {
     CONSTANT,

core/src/main/java/org/floworc/core/models/tasks/RunnableTask.java

@@ -1,4 +1,4 @@
-package org.floworc.core.tasks;
+package org.floworc.core.models.tasks;
 
 public interface RunnableTask {
     Void run() throws Exception;

core/src/main/java/org/floworc/core/models/tasks/Task.java

@@ -1,13 +1,12 @@
-package org.floworc.core.tasks;
+package org.floworc.core.models.tasks;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import lombok.Data;
 import org.apache.avro.reflect.Nullable;
-import org.floworc.core.executions.Execution;
-import org.floworc.core.executions.TaskRun;
+import org.floworc.core.models.executions.Execution;
+import org.floworc.core.models.executions.TaskRun;
 
 import javax.validation.constraints.NotNull;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;

core/src/main/java/org/floworc/core/models/tasks/TaskResult.java

@@ -1,12 +1,12 @@
-package org.floworc.core.tasks;
+package org.floworc.core.models.tasks;
 
-import lombok.Data;
-import org.floworc.core.flows.State;
+import lombok.Value;
+import org.floworc.core.models.flows.State;
 
 import java.time.Duration;
 import java.time.Instant;
 
-@Data
+@Value
 public class TaskResult {
     private State state;
 

core/src/main/java/org/floworc/core/models/triggers/Trigger.java

@@ -1,4 +1,4 @@
-package org.floworc.core.triggers;
+package org.floworc.core.models.triggers;
 
 import lombok.Data;
 

core/src/main/java/org/floworc/core/models/triggers/types/Schedule.java

@@ -1,11 +1,11 @@
-package org.floworc.core.triggers.types;
+package org.floworc.core.models.triggers.types;
 
 import lombok.*;
-import org.floworc.core.triggers.Trigger;
+import org.floworc.core.models.triggers.Trigger;
 
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
-@Data
+@Value
 public class Schedule extends Trigger {
     private String expression;
 

core/src/main/java/org/floworc/core/models/triggers/types/ScheduleBackfill.java

@@ -1,10 +1,10 @@
-package org.floworc.core.triggers.types;
+package org.floworc.core.models.triggers.types;
 
-import lombok.*;
+import lombok.Value;
 
 import java.time.Instant;
 
-@Data
+@Value
 public class ScheduleBackfill {
     private Instant start;
 }

core/src/main/java/org/floworc/core/queues/QueueMessage.java

@@ -1,14 +1,12 @@
 package org.floworc.core.queues;
 
 import lombok.Builder;
-import lombok.Data;
+import lombok.Value;
 
-@Data
+@Value
 @Builder
 public class QueueMessage <T> {
     private String key;
 
     private T body;
-
-
 }

core/src/main/java/org/floworc/core/repositories/ExecutionRepository.java

@@ -1,6 +1,6 @@
 package org.floworc.core.repositories;
 
-import org.floworc.core.executions.Execution;
+import org.floworc.core.models.executions.Execution;
 
 import java.util.List;
 

core/src/main/java/org/floworc/core/repositories/RepositoryInterface.java

@@ -1,6 +1,6 @@
 package org.floworc.core.repositories;
 
-import org.floworc.core.flows.Flow;
+import org.floworc.core.models.flows.Flow;
 
 import java.util.List;
 import java.util.Optional;

core/src/main/java/org/floworc/core/repositories/types/LocalRepository.java

@@ -1,6 +1,6 @@
 package org.floworc.core.repositories.types;
 
-import org.floworc.core.flows.Flow;
+import org.floworc.core.models.flows.Flow;
 import org.floworc.core.repositories.RepositoryInterface;
 import org.floworc.core.serializers.YamlFlowParser;
 

core/src/main/java/org/floworc/core/runners/ExecutionService.java

@@ -1,11 +1,13 @@
-package org.floworc.core.executions;
+package org.floworc.core.runners;
 
 import lombok.extern.slf4j.Slf4j;
-import org.floworc.core.flows.State;
+import org.floworc.core.models.executions.Execution;
+import org.floworc.core.models.executions.TaskRun;
+import org.floworc.core.models.flows.State;
 import org.floworc.core.queues.QueueInterface;
 import org.floworc.core.queues.QueueMessage;
-import org.floworc.core.tasks.FlowableTask;
-import org.floworc.core.tasks.Task;
+import org.floworc.core.models.tasks.FlowableTask;
+import org.floworc.core.models.tasks.Task;
 
 import java.util.ArrayList;
 import java.util.Collections;

core/src/main/java/org/floworc/core/runners/ExecutionState.java

@@ -1,9 +1,8 @@
 package org.floworc.core.runners;
 
 import lombok.extern.slf4j.Slf4j;
-import org.floworc.core.executions.Execution;
-import org.floworc.core.executions.TaskRun;
-import org.floworc.core.executions.WorkerTask;
+import org.floworc.core.models.executions.Execution;
+import org.floworc.core.models.executions.TaskRun;
 import org.floworc.core.queues.QueueInterface;
 import org.floworc.core.queues.QueueMessage;
 

core/src/main/java/org/floworc/core/runners/Executor.java

@@ -1,12 +1,10 @@
 package org.floworc.core.runners;
 
 import lombok.extern.slf4j.Slf4j;
-import org.floworc.core.executions.Execution;
-import org.floworc.core.executions.ExecutionService;
-import org.floworc.core.executions.TaskRun;
-import org.floworc.core.executions.WorkerTask;
-import org.floworc.core.flows.Flow;
-import org.floworc.core.flows.State;
+import org.floworc.core.models.executions.Execution;
+import org.floworc.core.models.executions.TaskRun;
+import org.floworc.core.models.flows.Flow;
+import org.floworc.core.models.flows.State;
 import org.floworc.core.queues.QueueInterface;
 import org.floworc.core.queues.QueueMessage;
 import org.floworc.core.repositories.RepositoryInterface;

core/src/main/java/org/floworc/core/runners/RunnerInterface.java

@@ -1,8 +1,5 @@
 package org.floworc.core.runners;
 
-import org.floworc.core.executions.Execution;
-import org.floworc.core.flows.Flow;
-
 public interface RunnerInterface {
     void run();
 }

core/src/main/java/org/floworc/core/runners/Worker.java

@@ -1,10 +1,9 @@
 package org.floworc.core.runners;
 
-import org.floworc.core.executions.WorkerTask;
-import org.floworc.core.flows.State;
+import org.floworc.core.models.flows.State;
 import org.floworc.core.queues.QueueInterface;
 import org.floworc.core.queues.QueueMessage;
-import org.floworc.core.tasks.RunnableTask;
+import org.floworc.core.models.tasks.RunnableTask;
 
 public class Worker implements Runnable {
     private QueueInterface<WorkerTask> workerTaskQueue;

core/src/main/java/org/floworc/core/runners/WorkerTask.java

@@ -1,9 +1,10 @@
-package org.floworc.core.executions;
+package org.floworc.core.runners;
 
 import lombok.Builder;
 import lombok.Value;
 import lombok.experimental.Wither;
-import org.floworc.core.tasks.Task;
+import org.floworc.core.models.executions.TaskRun;
+import org.floworc.core.models.tasks.Task;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

core/src/main/java/org/floworc/core/runners/types/StandAloneRunner.java

@@ -2,11 +2,11 @@ package org.floworc.core.runners.types;
 
 import com.devskiller.friendly_id.FriendlyId;
 import lombok.extern.slf4j.Slf4j;
-import org.floworc.core.executions.Execution;
-import org.floworc.core.executions.ExecutionService;
-import org.floworc.core.executions.WorkerTask;
-import org.floworc.core.flows.Flow;
-import org.floworc.core.flows.State;
+import org.floworc.core.models.executions.Execution;
+import org.floworc.core.runners.ExecutionService;
+import org.floworc.core.runners.WorkerTask;
+import org.floworc.core.models.flows.Flow;
+import org.floworc.core.models.flows.State;
 import org.floworc.core.queues.QueueMessage;
 import org.floworc.core.queues.QueueName;
 import org.floworc.core.queues.types.LocalQueue;

core/src/main/java/org/floworc/core/serializers/InvalidDefinitionException.java

@@ -1,7 +1,7 @@
 package org.floworc.core.serializers;
 
 import lombok.Getter;
-import org.floworc.core.flows.Flow;
+import org.floworc.core.models.flows.Flow;
 
 import javax.validation.ConstraintViolation;
 import java.util.List;

core/src/main/java/org/floworc/core/serializers/YamlFlowParser.java

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import org.hibernate.validator.messageinterpolation.ParameterMessageInterpolator;
-import org.floworc.core.flows.Flow;
+import org.floworc.core.models.flows.Flow;
 
 import javax.validation.ConstraintViolation;
 import javax.validation.Validation;

core/src/main/java/org/floworc/core/tasks/debugs/Echo.java

@@ -2,12 +2,12 @@ package org.floworc.core.tasks.debugs;
 
 import lombok.*;
 import lombok.extern.slf4j.Slf4j;
-import org.floworc.core.tasks.RunnableTask;
-import org.floworc.core.tasks.Task;
+import org.floworc.core.models.tasks.RunnableTask;
+import org.floworc.core.models.tasks.Task;
 
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
-@Data
+@Value
 @Slf4j
 public class Echo extends Task implements RunnableTask {
     private String format;

core/src/main/java/org/floworc/core/tasks/flows/Each.java

@@ -1,15 +1,15 @@
 package org.floworc.core.tasks.flows;
 
-import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+import lombok.Value;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.List;
 
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
-@Data
+@Value
 @Slf4j
 public class Each extends Parallel {
     private List<String> values;

core/src/main/java/org/floworc/core/tasks/flows/Parallel.java

@@ -3,10 +3,11 @@ package org.floworc.core.tasks.flows;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+import lombok.Value;
 import lombok.extern.slf4j.Slf4j;
-import org.floworc.core.executions.Execution;
-import org.floworc.core.tasks.FlowableTask;
-import org.floworc.core.tasks.Task;
+import org.floworc.core.models.executions.Execution;
+import org.floworc.core.models.tasks.FlowableTask;
+import org.floworc.core.models.tasks.Task;
 
 import javax.validation.Valid;
 import java.util.List;

core/src/main/java/org/floworc/core/tasks/flows/Switch.java

@@ -1,16 +1,18 @@
 package org.floworc.core.tasks.flows;
 
-import lombok.*;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.Value;
 import lombok.extern.slf4j.Slf4j;
-import org.floworc.core.tasks.FlowableTask;
-import org.floworc.core.tasks.Task;
+import org.floworc.core.models.tasks.FlowableTask;
+import org.floworc.core.models.tasks.Task;
 
 import java.util.List;
 import java.util.Map;
 
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
-@Data
+@Value
 @Slf4j
 public class Switch extends Task implements FlowableTask {
     private Map<String, List<Task>> cases;

core/src/main/java/org/floworc/core/tasks/scripts/Bash.java

@@ -4,8 +4,8 @@ import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.Value;
 import lombok.extern.slf4j.Slf4j;
-import org.floworc.core.tasks.RunnableTask;
-import org.floworc.core.tasks.Task;
+import org.floworc.core.models.tasks.RunnableTask;
+import org.floworc.core.models.tasks.Task;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -18,7 +18,7 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 @Value
 @Slf4j
-public class Bash extends Task  implements RunnableTask {
+public class Bash extends Task implements RunnableTask {
     private String[] commands;
 
     @Override

core/src/test/java/org/floworc/core/Utils.java

@@ -1,6 +1,6 @@
 package org.floworc.core;
 
-import org.floworc.core.flows.Flow;
+import org.floworc.core.models.flows.Flow;
 import org.floworc.core.serializers.YamlFlowParser;
 
 import java.io.File;

core/src/test/java/org/floworc/core/runners/StandAloneRunnerTest.java

@@ -2,8 +2,8 @@ package org.floworc.core.runners;
 
 import org.junit.jupiter.api.Test;
 import org.floworc.core.Utils;
-import org.floworc.core.executions.Execution;
-import org.floworc.core.flows.Flow;
+import org.floworc.core.models.executions.Execution;
+import org.floworc.core.models.flows.Flow;
 import org.floworc.core.runners.types.StandAloneRunner;
 
 import java.io.File;

core/src/test/java/org/floworc/core/serializers/YamlFlowParserTest.java

@@ -2,9 +2,9 @@ package org.floworc.core.serializers;
 
 import org.junit.jupiter.api.Test;
 import org.floworc.core.Utils;
-import org.floworc.core.flows.Flow;
-import org.floworc.core.tasks.RetryIntervalType;
-import org.floworc.core.tasks.Task;
+import org.floworc.core.models.flows.Flow;
+import org.floworc.core.models.tasks.RetryIntervalType;
+import org.floworc.core.models.tasks.Task;
 
 import java.io.IOException;