diff --git a/src/main/java/previewcode/backend/APIModule.java b/src/main/java/previewcode/backend/APIModule.java index 85c2f12..f19f50f 100644 --- a/src/main/java/previewcode/backend/APIModule.java +++ b/src/main/java/previewcode/backend/APIModule.java @@ -10,9 +10,9 @@ import io.vavr.jackson.datatype.VavrModule; import org.jboss.resteasy.plugins.guice.ext.JaxrsModule; import previewcode.backend.api.exceptionmapper.*; -import previewcode.backend.api.v2.ApprovalsAPI; -import previewcode.backend.api.v2.OrderingAPI; -import previewcode.backend.api.v2.TestAPI; +import previewcode.backend.api.v1.ApprovalsAPI; +import previewcode.backend.api.v1.OrderingAPI; +import previewcode.backend.api.v1.TestAPI; import javax.ws.rs.ext.ContextResolver; import javax.ws.rs.ext.Provider; diff --git a/src/main/java/previewcode/backend/api/v2/ApprovalsAPI.java b/src/main/java/previewcode/backend/api/v1/ApprovalsAPI.java similarity index 97% rename from src/main/java/previewcode/backend/api/v2/ApprovalsAPI.java rename to src/main/java/previewcode/backend/api/v1/ApprovalsAPI.java index 9c262cb..f50225b 100644 --- a/src/main/java/previewcode/backend/api/v2/ApprovalsAPI.java +++ b/src/main/java/previewcode/backend/api/v1/ApprovalsAPI.java @@ -1,4 +1,4 @@ -package previewcode.backend.api.v2; +package previewcode.backend.api.v1; import com.google.inject.Inject; import io.atlassian.fugue.Unit; @@ -18,7 +18,7 @@ /** * API for getting and setting the approvals on a pullrequest */ -@Path("v2/{owner}/{name}/pulls/{number}/") +@Path("v1/{owner}/{name}/pulls/{number}/") public class ApprovalsAPI { private Interpreter interpreter; diff --git a/src/main/java/previewcode/backend/api/v2/OrderingAPI.java b/src/main/java/previewcode/backend/api/v1/OrderingAPI.java similarity index 95% rename from src/main/java/previewcode/backend/api/v2/OrderingAPI.java rename to src/main/java/previewcode/backend/api/v1/OrderingAPI.java index 23b149a..752fdac 100644 --- a/src/main/java/previewcode/backend/api/v2/OrderingAPI.java +++ b/src/main/java/previewcode/backend/api/v1/OrderingAPI.java @@ -1,4 +1,4 @@ -package previewcode.backend.api.v2; +package previewcode.backend.api.v1; import com.google.inject.Inject; import io.atlassian.fugue.Unit; @@ -18,7 +18,7 @@ import javax.ws.rs.PathParam; import javax.ws.rs.core.Response; -@Path("v2/{owner}/{name}/pulls/{number}/ordering") +@Path("v1/{owner}/{name}/pulls/{number}/ordering") public class OrderingAPI { private final Interpreter interpreter; diff --git a/src/main/java/previewcode/backend/api/v2/TestAPI.java b/src/main/java/previewcode/backend/api/v1/TestAPI.java similarity index 88% rename from src/main/java/previewcode/backend/api/v2/TestAPI.java rename to src/main/java/previewcode/backend/api/v1/TestAPI.java index 7a37768..635f61e 100644 --- a/src/main/java/previewcode/backend/api/v2/TestAPI.java +++ b/src/main/java/previewcode/backend/api/v1/TestAPI.java @@ -1,4 +1,4 @@ -package previewcode.backend.api.v2; +package previewcode.backend.api.v1; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -8,12 +8,12 @@ import javax.ws.rs.Produces; import java.util.Date; -@Path("v2/test") +@Path("v1/test") public class TestAPI { static class Response { @JsonProperty("version") - public String apiVersion = "v2"; + public String apiVersion = "v1"; @JsonProperty("time") public String serverTime = new Date().toString(); diff --git a/src/test/java/previewcode/backend/api/v2/EndPointTest.java b/src/test/java/previewcode/backend/api/v1/EndPointTest.java similarity index 92% rename from src/test/java/previewcode/backend/api/v2/EndPointTest.java rename to src/test/java/previewcode/backend/api/v1/EndPointTest.java index a189199..70cb783 100644 --- a/src/test/java/previewcode/backend/api/v2/EndPointTest.java +++ b/src/test/java/previewcode/backend/api/v1/EndPointTest.java @@ -1,4 +1,4 @@ -package previewcode.backend.api.v2; +package previewcode.backend.api.v1; import com.google.inject.name.Names; import io.atlassian.fugue.Try; @@ -9,7 +9,6 @@ import previewcode.backend.APIModule; import previewcode.backend.DTO.*; import previewcode.backend.services.IGithubService; -import previewcode.backend.services.actiondsl.ActionDSL; import previewcode.backend.services.actiondsl.Interpreter; import previewcode.backend.test.helpers.ApiEndPointTest; import previewcode.backend.database.PullRequestGroup; @@ -31,20 +30,20 @@ public class EndPointTest { @Test public void testApiIsReachable(WebTarget target) { Response response = target - .path("/v2/test") + .path("/v1/test") .request("application/json") .get(); assertThat(response.getStatus()).isEqualTo(200); TestAPI.Response apiResponse = response.readEntity(TestAPI.Response.class); - assertThat(apiResponse.apiVersion).isEqualTo("v2"); + assertThat(apiResponse.apiVersion).isEqualTo("v1"); } @Test public void orderingApiIsReachable(WebTarget target) { Response response = target - .path("/v2/preview-code/backend/pulls/42/ordering") + .path("/v1/preview-code/backend/pulls/42/ordering") .request("application/json") .post(Entity.json(new ArrayList<>())); @@ -55,7 +54,7 @@ public void orderingApiIsReachable(WebTarget target) { @Test public void setApprovedApiIsReachable(WebTarget target) { Response response = target - .path("/v2/preview-code/backend/pulls/42/setApprove") + .path("/v1/preview-code/backend/pulls/42/setApprove") .request("application/json") .post(Entity.json("{}")); @@ -66,7 +65,7 @@ public void setApprovedApiIsReachable(WebTarget target) { @Test public void getApprovalsApiIsReachable(WebTarget target) { Response response = target - .path("/v2/preview-code/backend/pulls/42/getApprovals") + .path("/v1/preview-code/backend/pulls/42/getApprovals") .request("application/json") .get(); diff --git a/src/test/java/previewcode/backend/api/v2/RequestContextActionInterpreterTest.java b/src/test/java/previewcode/backend/api/v1/RequestContextActionInterpreterTest.java similarity index 99% rename from src/test/java/previewcode/backend/api/v2/RequestContextActionInterpreterTest.java rename to src/test/java/previewcode/backend/api/v1/RequestContextActionInterpreterTest.java index b0d30c9..4d99305 100644 --- a/src/test/java/previewcode/backend/api/v2/RequestContextActionInterpreterTest.java +++ b/src/test/java/previewcode/backend/api/v1/RequestContextActionInterpreterTest.java @@ -1,4 +1,4 @@ -package previewcode.backend.api.v2; +package previewcode.backend.api.v1; import com.fasterxml.jackson.databind.JsonNode; import io.vavr.control.Option; diff --git a/src/test/java/previewcode/backend/api/v2/WrapppedTypeDeserializingTest.java b/src/test/java/previewcode/backend/api/v1/WrapppedTypeDeserializingTest.java similarity index 95% rename from src/test/java/previewcode/backend/api/v2/WrapppedTypeDeserializingTest.java rename to src/test/java/previewcode/backend/api/v1/WrapppedTypeDeserializingTest.java index 77fc73f..24afb13 100644 --- a/src/test/java/previewcode/backend/api/v2/WrapppedTypeDeserializingTest.java +++ b/src/test/java/previewcode/backend/api/v1/WrapppedTypeDeserializingTest.java @@ -1,4 +1,4 @@ -package previewcode.backend.api.v2; +package previewcode.backend.api.v1; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test;