diff --git a/src/main/java/com/poststats/golf/api/EventApi.java b/src/main/java/com/poststats/golf/api/EventApi.java index dae01ea..78301ec 100644 --- a/src/main/java/com/poststats/golf/api/EventApi.java +++ b/src/main/java/com/poststats/golf/api/EventApi.java @@ -2,6 +2,7 @@ package com.poststats.golf.api; import com.brianlong.sql.DataSet; import com.fasterxml.jackson.core.JsonProcessingException; +import com.poststats.api.BaseApi; import com.poststats.golf.api.model.Event; import com.poststats.golf.api.model.EventDetail; import com.poststats.golf.service.EventService; @@ -25,8 +26,8 @@ import org.slf4j.LoggerFactory; * @author brian.long@poststats.com */ @RequestScoped -@Path("/event/{eventId}") -public class EventApi { +@Path(BaseApi.BASE_PATH + "/golf/event/{eventId}") +public class EventApi extends BaseApi { private final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/src/main/java/com/poststats/golf/api/EventFinanceApi.java b/src/main/java/com/poststats/golf/api/EventFinanceApi.java index aa9c5f5..69da446 100644 --- a/src/main/java/com/poststats/golf/api/EventFinanceApi.java +++ b/src/main/java/com/poststats/golf/api/EventFinanceApi.java @@ -3,6 +3,7 @@ package com.poststats.golf.api; import com.brianlong.sql.DataSet; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import com.poststats.api.BaseApi; import com.poststats.golf.service.EventFinanceService; import jakarta.annotation.security.RolesAllowed; import jakarta.enterprise.context.RequestScoped; @@ -23,8 +24,8 @@ import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVPrinter; @RequestScoped -@Path("/event/{eventId}/finance") -public class EventFinanceApi { +@Path(BaseApi.BASE_PATH + "/golf/event/{eventId}/finance") +public class EventFinanceApi extends BaseApi { private final ObjectMapper mapper = new ObjectMapper(); diff --git a/src/main/java/com/poststats/golf/api/EventPersonApi.java b/src/main/java/com/poststats/golf/api/EventPersonApi.java index d319167..58056cd 100644 --- a/src/main/java/com/poststats/golf/api/EventPersonApi.java +++ b/src/main/java/com/poststats/golf/api/EventPersonApi.java @@ -3,6 +3,7 @@ package com.poststats.golf.api; import com.brianlong.sql.DataSet; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import com.poststats.api.BaseApi; import com.poststats.golf.service.EventPersonService; import com.poststats.golf.service.EventService; import com.poststats.security.Person; @@ -29,8 +30,8 @@ import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVPrinter; @RequestScoped -@Path("/event/{eventId}") -public class EventPersonApi { +@Path(BaseApi.BASE_PATH + "/golf/event/{eventId}") +public class EventPersonApi extends BaseApi { private final ObjectMapper mapper = new ObjectMapper(); diff --git a/src/main/java/com/poststats/golf/api/GolferApi.java b/src/main/java/com/poststats/golf/api/GolferApi.java index 2924a03..b547bb8 100644 --- a/src/main/java/com/poststats/golf/api/GolferApi.java +++ b/src/main/java/com/poststats/golf/api/GolferApi.java @@ -2,6 +2,7 @@ package com.poststats.golf.api; import com.brianlong.sql.DataSet; import com.fasterxml.jackson.core.JsonProcessingException; +import com.poststats.api.BaseApi; import com.poststats.api.model.Person; import com.poststats.golf.transformer.GolferTransformer; import com.poststats.service.PersonService; @@ -24,8 +25,8 @@ import org.slf4j.LoggerFactory; * @author brian.long@poststats.com */ @RequestScoped -@Path("/golfer/{personId}") -public class GolferApi { +@Path(BaseApi.BASE_PATH + "/golfer/{personId}") +public class GolferApi extends BaseApi { private final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/src/main/java/com/poststats/golf/api/SeriesApi.java b/src/main/java/com/poststats/golf/api/SeriesApi.java index 3e48e73..fdb941a 100644 --- a/src/main/java/com/poststats/golf/api/SeriesApi.java +++ b/src/main/java/com/poststats/golf/api/SeriesApi.java @@ -2,6 +2,7 @@ package com.poststats.golf.api; import com.brianlong.sql.DataSet; import com.fasterxml.jackson.core.JsonProcessingException; +import com.poststats.api.BaseApi; import com.poststats.golf.api.model.Event; import com.poststats.golf.api.model.Series; import com.poststats.golf.service.EventService; @@ -33,8 +34,8 @@ import org.slf4j.LoggerFactory; * @author brian.long@poststats.com */ @RequestScoped -@Path("/series/{seriesId}") -public class SeriesApi { +@Path(BaseApi.BASE_PATH + "/golf/series/{seriesId}") +public class SeriesApi extends BaseApi { private final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/src/test/java/com/poststats/golf/api/VersionApiUnitTest.java b/src/test/java/com/poststats/golf/api/VersionApiUnitTest.java deleted file mode 100644 index 2bab357..0000000 --- a/src/test/java/com/poststats/golf/api/VersionApiUnitTest.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.poststats.golf.api; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.poststats.api.VersionApi; -import java.io.IOException; -import java.util.regex.Pattern; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; - -public class VersionApiUnitTest { - - private static ObjectMapper om = new ObjectMapper(); - private static VersionApi api; - - @BeforeClass - public static void init() { - api = new VersionApi(); - } - - @Test - public void get() throws IOException { - String current = api.get(); - Assert.assertNotNull(current); - Assert.assertTrue(current.length() > 0); - } - - @Test - public void getPattern() throws IOException { - String pattern = api.getRegexPattern(); - Assert.assertNotNull(pattern); - Assert.assertTrue(pattern.length() > 0); - - Pattern.compile(om.readValue(pattern, String.class)); - } - - @Test - public void isValidFormat() throws IOException { - String pattern = om.readValue(api.getRegexPattern(), String.class); - String current = om.readValue(api.get(), String.class); - Assert.assertTrue(Pattern.compile(pattern) - .matcher(current) - .matches()); - } - -}