Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/java/previewcode/backend/APIModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package previewcode.backend.api.v2;
package previewcode.backend.api.v1;

import com.google.inject.Inject;
import io.atlassian.fugue.Unit;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package previewcode.backend.api.v2;
package previewcode.backend.api.v1;

import com.google.inject.Inject;
import io.atlassian.fugue.Unit;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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();

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand All @@ -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<>()));

Expand All @@ -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("{}"));

Expand All @@ -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();

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down