move ErrorResponse to common project

NitorCreations · Jan 7, 2020 · c66f7e0 · c66f7e0
1 parent 98f90a7
commit c66f7e0
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 2 deletions.
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
@@ -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<ValidationException> {
 

diff --git a/...w-jetty/src/main/java/io/nflow/jetty/mapper/StateVariableValueTooLongExceptionMapper.java b/...w-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<StateVariableValueTooLongException> {

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
@@ -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<WebApplicationException> {
   @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
@@ -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/...tty/src/test/java/io/nflow/jetty/mapper/StateVariableValueTooLongExceptionMapperTest.java b/...tty/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
@@ -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/.../io/nflow/jetty/mapper/ErrorResponse.java → ...a/io/nflow/rest/v1/msg/ErrorResponse.java b/.../io/nflow/jetty/mapper/ErrorResponse.java → ...a/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
@@ -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;