diff --git a/nflow-jetty/src/main/java/io/nflow/jetty/mapper/CustomValidationExceptionMapper.java b/nflow-jetty/src/main/java/io/nflow/jetty/mapper/CustomValidationExceptionMapper.java index 624c8ff84..cdcd994eb 100644 --- a/nflow-jetty/src/main/java/io/nflow/jetty/mapper/CustomValidationExceptionMapper.java +++ b/nflow-jetty/src/main/java/io/nflow/jetty/mapper/CustomValidationExceptionMapper.java @@ -12,6 +12,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import io.nflow.rest.v1.msg.ErrorResponse; + @Provider public class CustomValidationExceptionMapper implements ExceptionMapper { diff --git a/nflow-jetty/src/main/java/io/nflow/jetty/mapper/StateVariableValueTooLongExceptionMapper.java b/nflow-jetty/src/main/java/io/nflow/jetty/mapper/StateVariableValueTooLongExceptionMapper.java index 48231231b..e9189e871 100644 --- a/nflow-jetty/src/main/java/io/nflow/jetty/mapper/StateVariableValueTooLongExceptionMapper.java +++ b/nflow-jetty/src/main/java/io/nflow/jetty/mapper/StateVariableValueTooLongExceptionMapper.java @@ -7,6 +7,7 @@ import javax.ws.rs.ext.Provider; import io.nflow.engine.workflow.executor.StateVariableValueTooLongException; +import io.nflow.rest.v1.msg.ErrorResponse; @Provider public class StateVariableValueTooLongExceptionMapper implements ExceptionMapper { diff --git a/nflow-jetty/src/main/java/io/nflow/jetty/mapper/WebApplicationExceptionMapper.java b/nflow-jetty/src/main/java/io/nflow/jetty/mapper/WebApplicationExceptionMapper.java index d1d3273f2..1469ad53d 100644 --- a/nflow-jetty/src/main/java/io/nflow/jetty/mapper/WebApplicationExceptionMapper.java +++ b/nflow-jetty/src/main/java/io/nflow/jetty/mapper/WebApplicationExceptionMapper.java @@ -7,6 +7,8 @@ import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; +import io.nflow.rest.v1.msg.ErrorResponse; + @Provider public class WebApplicationExceptionMapper implements ExceptionMapper { @Override diff --git a/nflow-jetty/src/test/java/io/nflow/jetty/mapper/CustomValidationExceptionMapperTest.java b/nflow-jetty/src/test/java/io/nflow/jetty/mapper/CustomValidationExceptionMapperTest.java index c2e0961ab..7cfdbb97e 100644 --- a/nflow-jetty/src/test/java/io/nflow/jetty/mapper/CustomValidationExceptionMapperTest.java +++ b/nflow-jetty/src/test/java/io/nflow/jetty/mapper/CustomValidationExceptionMapperTest.java @@ -22,6 +22,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; +import io.nflow.rest.v1.msg.ErrorResponse; + @ExtendWith(MockitoExtension.class) public class CustomValidationExceptionMapperTest { diff --git a/nflow-jetty/src/test/java/io/nflow/jetty/mapper/StateVariableValueTooLongExceptionMapperTest.java b/nflow-jetty/src/test/java/io/nflow/jetty/mapper/StateVariableValueTooLongExceptionMapperTest.java index b34c286f3..edc22a7cf 100644 --- a/nflow-jetty/src/test/java/io/nflow/jetty/mapper/StateVariableValueTooLongExceptionMapperTest.java +++ b/nflow-jetty/src/test/java/io/nflow/jetty/mapper/StateVariableValueTooLongExceptionMapperTest.java @@ -9,6 +9,7 @@ import org.junit.jupiter.api.Test; import io.nflow.engine.workflow.executor.StateVariableValueTooLongException; +import io.nflow.rest.v1.msg.ErrorResponse; public class StateVariableValueTooLongExceptionMapperTest { StateVariableValueTooLongExceptionMapper mapper = new StateVariableValueTooLongExceptionMapper(); diff --git a/nflow-jetty/src/test/java/io/nflow/jetty/mapper/WebApplicationExceptionMapperTest.java b/nflow-jetty/src/test/java/io/nflow/jetty/mapper/WebApplicationExceptionMapperTest.java index 92abee867..e1f1cea8e 100644 --- a/nflow-jetty/src/test/java/io/nflow/jetty/mapper/WebApplicationExceptionMapperTest.java +++ b/nflow-jetty/src/test/java/io/nflow/jetty/mapper/WebApplicationExceptionMapperTest.java @@ -9,6 +9,8 @@ import org.junit.jupiter.api.Test; +import io.nflow.rest.v1.msg.ErrorResponse; + public class WebApplicationExceptionMapperTest { WebApplicationExceptionMapper mapper = new WebApplicationExceptionMapper(); diff --git a/nflow-jetty/src/main/java/io/nflow/jetty/mapper/ErrorResponse.java b/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/ErrorResponse.java similarity index 90% rename from nflow-jetty/src/main/java/io/nflow/jetty/mapper/ErrorResponse.java rename to nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/ErrorResponse.java index ff4ef197e..d453b73d5 100644 --- a/nflow-jetty/src/main/java/io/nflow/jetty/mapper/ErrorResponse.java +++ b/nflow-rest-api-common/src/main/java/io/nflow/rest/v1/msg/ErrorResponse.java @@ -1,4 +1,4 @@ -package io.nflow.jetty.mapper; +package io.nflow.rest.v1.msg; import io.nflow.engine.model.ModelObject; diff --git a/nflow-tests/src/test/java/io/nflow/tests/StateVariablesTest.java b/nflow-tests/src/test/java/io/nflow/tests/StateVariablesTest.java index a15a28d33..3ee898fe3 100644 --- a/nflow-tests/src/test/java/io/nflow/tests/StateVariablesTest.java +++ b/nflow-tests/src/test/java/io/nflow/tests/StateVariablesTest.java @@ -30,10 +30,10 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import io.nflow.jetty.mapper.ErrorResponse; import io.nflow.rest.v1.msg.Action; import io.nflow.rest.v1.msg.CreateWorkflowInstanceRequest; import io.nflow.rest.v1.msg.CreateWorkflowInstanceResponse; +import io.nflow.rest.v1.msg.ErrorResponse; import io.nflow.rest.v1.msg.ListWorkflowInstanceResponse; import io.nflow.rest.v1.msg.UpdateWorkflowInstanceRequest; import io.nflow.tests.demo.workflow.StateWorkflow;