Skip to content

Commit

Permalink
Promote REST api to v1
Browse files Browse the repository at this point in the history
  • Loading branch information
jsyrjala committed Aug 25, 2014
1 parent e17359c commit ea29580
Show file tree
Hide file tree
Showing 24 changed files with 73 additions and 69 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
import com.nitorcreations.nflow.jetty.validation.CustomValidationExceptionMapper;
import com.nitorcreations.nflow.rest.config.RestConfiguration;
import com.nitorcreations.nflow.rest.v0.WorkflowDefinitionResource;
import com.nitorcreations.nflow.rest.v0.WorkflowInstanceResource;
import com.nitorcreations.nflow.rest.v1.WorkflowDefinitionResource;
import com.nitorcreations.nflow.rest.v1.WorkflowInstanceResource;
import com.wordnik.swagger.jaxrs.config.BeanConfig;
import com.wordnik.swagger.jaxrs.listing.ApiDeclarationProvider;
import com.wordnik.swagger.jaxrs.listing.ApiListingResourceJSON;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.nitorcreations.nflow.rest.v0;
package com.nitorcreations.nflow.rest.v1;

import static javax.ws.rs.core.MediaType.APPLICATION_JSON;

Expand All @@ -21,12 +21,12 @@
import com.nitorcreations.nflow.engine.service.WorkflowDefinitionService;
import com.nitorcreations.nflow.engine.workflow.definition.WorkflowDefinition;
import com.nitorcreations.nflow.engine.workflow.definition.WorkflowState;
import com.nitorcreations.nflow.rest.v0.converter.ListWorkflowDefinitionConverter;
import com.nitorcreations.nflow.rest.v0.msg.ListWorkflowDefinitionResponse;
import com.nitorcreations.nflow.rest.v1.converter.ListWorkflowDefinitionConverter;
import com.nitorcreations.nflow.rest.v1.msg.ListWorkflowDefinitionResponse;
import com.wordnik.swagger.annotations.Api;
import com.wordnik.swagger.annotations.ApiOperation;

@Path("/v0/workflow-definition")
@Path("/v1/workflow-definition")
@Consumes(APPLICATION_JSON)
@Produces(APPLICATION_JSON)
@Api(value = "/workflow-definition", description = "Query installed workflow definitions")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.nitorcreations.nflow.rest.v0;
package com.nitorcreations.nflow.rest.v1;

import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
import static org.joda.time.DateTime.now;
Expand Down Expand Up @@ -26,17 +26,17 @@
import com.nitorcreations.nflow.engine.workflow.instance.QueryWorkflowInstances;
import com.nitorcreations.nflow.engine.workflow.instance.WorkflowInstance;
import com.nitorcreations.nflow.engine.workflow.instance.WorkflowInstanceAction;
import com.nitorcreations.nflow.rest.v0.converter.CreateWorkflowConverter;
import com.nitorcreations.nflow.rest.v0.converter.ListWorkflowInstanceConverter;
import com.nitorcreations.nflow.rest.v0.msg.CreateWorkflowInstanceRequest;
import com.nitorcreations.nflow.rest.v0.msg.CreateWorkflowInstanceResponse;
import com.nitorcreations.nflow.rest.v0.msg.ListWorkflowInstanceResponse;
import com.nitorcreations.nflow.rest.v0.msg.UpdateWorkflowInstanceRequest;
import com.nitorcreations.nflow.rest.v1.converter.CreateWorkflowConverter;
import com.nitorcreations.nflow.rest.v1.converter.ListWorkflowInstanceConverter;
import com.nitorcreations.nflow.rest.v1.msg.CreateWorkflowInstanceRequest;
import com.nitorcreations.nflow.rest.v1.msg.CreateWorkflowInstanceResponse;
import com.nitorcreations.nflow.rest.v1.msg.ListWorkflowInstanceResponse;
import com.nitorcreations.nflow.rest.v1.msg.UpdateWorkflowInstanceRequest;
import com.wordnik.swagger.annotations.Api;
import com.wordnik.swagger.annotations.ApiOperation;
import com.wordnik.swagger.annotations.ApiParam;

@Path("/v0/workflow-instance")
@Path("/v1/workflow-instance")
@Consumes(APPLICATION_JSON)
@Produces(APPLICATION_JSON)
@Api(value = "/workflow-instance", description = "Manage workflow instances")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.nitorcreations.nflow.rest.v0.converter;
package com.nitorcreations.nflow.rest.v1.converter;

import javax.inject.Inject;

Expand All @@ -7,8 +7,8 @@

import com.nitorcreations.nflow.engine.workflow.instance.WorkflowInstance;
import com.nitorcreations.nflow.engine.workflow.instance.WorkflowInstanceFactory;
import com.nitorcreations.nflow.rest.v0.msg.CreateWorkflowInstanceRequest;
import com.nitorcreations.nflow.rest.v0.msg.CreateWorkflowInstanceResponse;
import com.nitorcreations.nflow.rest.v1.msg.CreateWorkflowInstanceRequest;
import com.nitorcreations.nflow.rest.v1.msg.CreateWorkflowInstanceResponse;

@Component
public class CreateWorkflowConverter {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.nitorcreations.nflow.rest.v0.converter;
package com.nitorcreations.nflow.rest.v1.converter;

import java.util.LinkedHashMap;
import java.util.List;
Expand All @@ -10,10 +10,10 @@
import com.nitorcreations.nflow.engine.workflow.definition.WorkflowDefinition;
import com.nitorcreations.nflow.engine.workflow.definition.WorkflowSettings;
import com.nitorcreations.nflow.engine.workflow.definition.WorkflowState;
import com.nitorcreations.nflow.rest.v0.msg.ListWorkflowDefinitionResponse;
import com.nitorcreations.nflow.rest.v0.msg.ListWorkflowDefinitionResponse.Settings;
import com.nitorcreations.nflow.rest.v0.msg.ListWorkflowDefinitionResponse.TransitionDelays;
import com.nitorcreations.nflow.rest.v0.msg.State;
import com.nitorcreations.nflow.rest.v1.msg.ListWorkflowDefinitionResponse;
import com.nitorcreations.nflow.rest.v1.msg.State;
import com.nitorcreations.nflow.rest.v1.msg.ListWorkflowDefinitionResponse.Settings;
import com.nitorcreations.nflow.rest.v1.msg.ListWorkflowDefinitionResponse.TransitionDelays;

import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.nitorcreations.nflow.rest.v0.converter;
package com.nitorcreations.nflow.rest.v1.converter;

import java.util.ArrayList;

Expand All @@ -7,8 +7,8 @@
import com.nitorcreations.nflow.engine.workflow.instance.QueryWorkflowInstances;
import com.nitorcreations.nflow.engine.workflow.instance.WorkflowInstance;
import com.nitorcreations.nflow.engine.workflow.instance.WorkflowInstanceAction;
import com.nitorcreations.nflow.rest.v0.msg.Action;
import com.nitorcreations.nflow.rest.v0.msg.ListWorkflowInstanceResponse;
import com.nitorcreations.nflow.rest.v1.msg.Action;
import com.nitorcreations.nflow.rest.v1.msg.ListWorkflowInstanceResponse;

@Component
public class ListWorkflowInstanceConverter {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.nitorcreations.nflow.rest.v0.msg;
package com.nitorcreations.nflow.rest.v1.msg;

import org.joda.time.DateTime;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.nitorcreations.nflow.rest.v0.msg;
package com.nitorcreations.nflow.rest.v1.msg;

import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.nitorcreations.nflow.rest.v0.msg;
package com.nitorcreations.nflow.rest.v1.msg;

import javax.validation.constraints.Size;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.nitorcreations.nflow.rest.v0.msg;
package com.nitorcreations.nflow.rest.v1.msg;

import com.wordnik.swagger.annotations.ApiModel;
import com.wordnik.swagger.annotations.ApiModelProperty;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.nitorcreations.nflow.rest.v0.msg;
package com.nitorcreations.nflow.rest.v1.msg;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.nitorcreations.nflow.rest.v0.msg;
package com.nitorcreations.nflow.rest.v1.msg;

import java.util.LinkedHashSet;
import java.util.Set;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.nitorcreations.nflow.rest.v0.msg;
package com.nitorcreations.nflow.rest.v1.msg;

import org.joda.time.DateTime;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.nitorcreations.nflow.rest.v0;
package com.nitorcreations.nflow.rest.v1;

import static com.nitorcreations.nflow.rest.v0.DummyTestWorkflow.State.end;
import static com.nitorcreations.nflow.rest.v0.DummyTestWorkflow.State.error;
import static com.nitorcreations.nflow.rest.v0.DummyTestWorkflow.State.start;
import static com.nitorcreations.nflow.rest.v1.DummyTestWorkflow.State.end;
import static com.nitorcreations.nflow.rest.v1.DummyTestWorkflow.State.error;
import static com.nitorcreations.nflow.rest.v1.DummyTestWorkflow.State.start;

import org.springframework.core.env.Environment;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.nitorcreations.nflow.rest.v0;
package com.nitorcreations.nflow.rest.v1;

import static org.hamcrest.Matchers.equalTo;
import static org.mockito.Mockito.doReturn;
Expand All @@ -18,8 +18,9 @@
import com.nitorcreations.nflow.engine.service.WorkflowDefinitionService;
import com.nitorcreations.nflow.engine.workflow.definition.WorkflowDefinition;
import com.nitorcreations.nflow.engine.workflow.definition.WorkflowState;
import com.nitorcreations.nflow.rest.v0.converter.ListWorkflowDefinitionConverter;
import com.nitorcreations.nflow.rest.v0.msg.ListWorkflowDefinitionResponse;
import com.nitorcreations.nflow.rest.v1.WorkflowDefinitionResource;
import com.nitorcreations.nflow.rest.v1.converter.ListWorkflowDefinitionConverter;
import com.nitorcreations.nflow.rest.v1.msg.ListWorkflowDefinitionResponse;

@RunWith(MockitoJUnitRunner.class)
public class WorkflowDefinitionResourceTest {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.nitorcreations.nflow.rest.v0;
package com.nitorcreations.nflow.rest.v1;

import static com.nitorcreations.Matchers.hasField;
import static org.hamcrest.Matchers.allOf;
Expand All @@ -24,10 +24,11 @@
import com.nitorcreations.nflow.engine.workflow.instance.QueryWorkflowInstances;
import com.nitorcreations.nflow.engine.workflow.instance.WorkflowInstance;
import com.nitorcreations.nflow.engine.workflow.instance.WorkflowInstanceAction;
import com.nitorcreations.nflow.rest.v0.converter.CreateWorkflowConverter;
import com.nitorcreations.nflow.rest.v0.converter.ListWorkflowInstanceConverter;
import com.nitorcreations.nflow.rest.v0.msg.CreateWorkflowInstanceRequest;
import com.nitorcreations.nflow.rest.v0.msg.UpdateWorkflowInstanceRequest;
import com.nitorcreations.nflow.rest.v1.WorkflowInstanceResource;
import com.nitorcreations.nflow.rest.v1.converter.CreateWorkflowConverter;
import com.nitorcreations.nflow.rest.v1.converter.ListWorkflowInstanceConverter;
import com.nitorcreations.nflow.rest.v1.msg.CreateWorkflowInstanceRequest;
import com.nitorcreations.nflow.rest.v1.msg.UpdateWorkflowInstanceRequest;

@RunWith(MockitoJUnitRunner.class)
public class WorkflowInstanceResourceTest {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.nitorcreations.nflow.rest.v0.config;
package com.nitorcreations.nflow.rest.v1.config;

import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.nitorcreations.nflow.rest.v0.converter;
package com.nitorcreations.nflow.rest.v1.converter;

import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.notNullValue;
Expand All @@ -17,8 +17,9 @@
import com.nitorcreations.nflow.engine.internal.workflow.ObjectStringMapper;
import com.nitorcreations.nflow.engine.workflow.instance.WorkflowInstance;
import com.nitorcreations.nflow.engine.workflow.instance.WorkflowInstanceFactory;
import com.nitorcreations.nflow.rest.v0.msg.CreateWorkflowInstanceRequest;
import com.nitorcreations.nflow.rest.v0.msg.CreateWorkflowInstanceResponse;
import com.nitorcreations.nflow.rest.v1.converter.CreateWorkflowConverter;
import com.nitorcreations.nflow.rest.v1.msg.CreateWorkflowInstanceRequest;
import com.nitorcreations.nflow.rest.v1.msg.CreateWorkflowInstanceResponse;

@RunWith(MockitoJUnitRunner.class)
public class CreateWorkflowConverterTest {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.nitorcreations.nflow.rest.v0.converter;
package com.nitorcreations.nflow.rest.v1.converter;

import static com.nitorcreations.Matchers.reflectEquals;
import static com.nitorcreations.nflow.rest.v0.DummyTestWorkflow.State.end;
import static com.nitorcreations.nflow.rest.v0.DummyTestWorkflow.State.error;
import static com.nitorcreations.nflow.rest.v0.DummyTestWorkflow.State.start;
import static com.nitorcreations.nflow.rest.v1.DummyTestWorkflow.State.end;
import static com.nitorcreations.nflow.rest.v1.DummyTestWorkflow.State.error;
import static com.nitorcreations.nflow.rest.v1.DummyTestWorkflow.State.start;
import static java.util.Arrays.asList;
import static org.hamcrest.Matchers.arrayContainingInAnyOrder;
import static org.hamcrest.Matchers.is;
Expand All @@ -17,9 +17,9 @@
import org.junit.runner.RunWith;
import org.mockito.runners.MockitoJUnitRunner;

import com.nitorcreations.nflow.rest.v0.DummyTestWorkflow;
import com.nitorcreations.nflow.rest.v0.msg.ListWorkflowDefinitionResponse;
import com.nitorcreations.nflow.rest.v0.msg.State;
import com.nitorcreations.nflow.rest.v1.DummyTestWorkflow;
import com.nitorcreations.nflow.rest.v1.msg.ListWorkflowDefinitionResponse;
import com.nitorcreations.nflow.rest.v1.msg.State;

@RunWith(MockitoJUnitRunner.class)
public class ListWorkflowDefinitionConverterTest {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.nitorcreations.nflow.rest.v0.converter;
package com.nitorcreations.nflow.rest.v1.converter;

import static com.nitorcreations.Matchers.reflectEquals;
import static org.hamcrest.Matchers.contains;
Expand All @@ -17,8 +17,9 @@
import com.nitorcreations.nflow.engine.workflow.instance.QueryWorkflowInstances;
import com.nitorcreations.nflow.engine.workflow.instance.WorkflowInstance;
import com.nitorcreations.nflow.engine.workflow.instance.WorkflowInstanceAction;
import com.nitorcreations.nflow.rest.v0.msg.Action;
import com.nitorcreations.nflow.rest.v0.msg.ListWorkflowInstanceResponse;
import com.nitorcreations.nflow.rest.v1.converter.ListWorkflowInstanceConverter;
import com.nitorcreations.nflow.rest.v1.msg.Action;
import com.nitorcreations.nflow.rest.v1.msg.ListWorkflowInstanceResponse;

@RunWith(MockitoJUnitRunner.class)
public class ListWorkflowInstanceConverterTest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

import com.nitorcreations.nflow.rest.v0.msg.Action;
import com.nitorcreations.nflow.rest.v0.msg.ListWorkflowInstanceResponse;
import com.nitorcreations.nflow.rest.v1.msg.Action;
import com.nitorcreations.nflow.rest.v1.msg.ListWorkflowInstanceResponse;
import com.nitorcreations.nflow.tests.config.PropertiesConfiguration;
import com.nitorcreations.nflow.tests.config.RestClientConfiguration;
import com.nitorcreations.nflow.tests.runner.NflowServerRule;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
import org.junit.Test;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.nitorcreations.nflow.rest.v0.msg.Action;
import com.nitorcreations.nflow.rest.v0.msg.CreateWorkflowInstanceRequest;
import com.nitorcreations.nflow.rest.v0.msg.CreateWorkflowInstanceResponse;
import com.nitorcreations.nflow.rest.v0.msg.ListWorkflowInstanceResponse;
import com.nitorcreations.nflow.rest.v0.msg.UpdateWorkflowInstanceRequest;
import com.nitorcreations.nflow.rest.v1.msg.Action;
import com.nitorcreations.nflow.rest.v1.msg.CreateWorkflowInstanceRequest;
import com.nitorcreations.nflow.rest.v1.msg.CreateWorkflowInstanceResponse;
import com.nitorcreations.nflow.rest.v1.msg.ListWorkflowInstanceResponse;
import com.nitorcreations.nflow.rest.v1.msg.UpdateWorkflowInstanceRequest;
import com.nitorcreations.nflow.tests.demo.CreditApplicationWorkflow;
import com.nitorcreations.nflow.tests.runner.NflowServerRule;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
import org.junit.FixMethodOrder;
import org.junit.Test;

import com.nitorcreations.nflow.rest.v0.msg.CreateWorkflowInstanceRequest;
import com.nitorcreations.nflow.rest.v0.msg.CreateWorkflowInstanceResponse;
import com.nitorcreations.nflow.rest.v0.msg.ListWorkflowInstanceResponse;
import com.nitorcreations.nflow.rest.v1.msg.CreateWorkflowInstanceRequest;
import com.nitorcreations.nflow.rest.v1.msg.CreateWorkflowInstanceResponse;
import com.nitorcreations.nflow.rest.v1.msg.ListWorkflowInstanceResponse;
import com.nitorcreations.nflow.tests.runner.NflowServerRule;

@FixMethodOrder(NAME_ASCENDING)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public JacksonJsonProvider jsonProvider(ObjectMapper mapper) {

@Bean(name="workflowInstance")
public WebClient workflowInstanceWebService(@Named("baseWebclient") WebClient client) {
return client.path("v0").path("workflow-instance");
return client.path("v1").path("workflow-instance");
}

}

0 comments on commit ea29580

Please sign in to comment.