diff --git a/pom.xml b/pom.xml index bfc26bc..57d4b5b 100644 --- a/pom.xml +++ b/pom.xml @@ -20,18 +20,8 @@ com.poststats - poststats-api - 1.0-SNAPSHOT - - - com.poststats.golf - golf-core - 1.0-SNAPSHOT - - - org.apache.commons - commons-csv - 1.5 + poststats-rs-api + 2.0-SNAPSHOT diff --git a/src/main/java/com/poststats/golf/api/BaseApi.java b/src/main/java/com/poststats/golf/rs/api/BaseApi.java similarity index 95% rename from src/main/java/com/poststats/golf/api/BaseApi.java rename to src/main/java/com/poststats/golf/rs/api/BaseApi.java index 3b16271..cf3a686 100644 --- a/src/main/java/com/poststats/golf/api/BaseApi.java +++ b/src/main/java/com/poststats/golf/rs/api/BaseApi.java @@ -1,4 +1,4 @@ -package com.poststats.golf.api; +package com.poststats.golf.rs.api; import io.swagger.v3.oas.annotations.OpenAPIDefinition; import io.swagger.v3.oas.annotations.enums.SecuritySchemeType; diff --git a/src/main/java/com/poststats/golf/api/Constants.java b/src/main/java/com/poststats/golf/rs/api/Constants.java similarity index 86% rename from src/main/java/com/poststats/golf/api/Constants.java rename to src/main/java/com/poststats/golf/rs/api/Constants.java index 603f82f..53e2962 100644 --- a/src/main/java/com/poststats/golf/api/Constants.java +++ b/src/main/java/com/poststats/golf/rs/api/Constants.java @@ -1,6 +1,6 @@ -package com.poststats.golf.api; +package com.poststats.golf.rs.api; -public class Constants extends com.poststats.api.Constants { +public class Constants extends com.poststats.rs.api.Constants { public static final String BUDDY_ROLE = "buddy"; public static final String EVENT_ROLE = "event"; diff --git a/src/main/java/com/poststats/golf/api/CourseApi.java b/src/main/java/com/poststats/golf/rs/api/CourseApi.java similarity index 93% rename from src/main/java/com/poststats/golf/api/CourseApi.java rename to src/main/java/com/poststats/golf/rs/api/CourseApi.java index afb58cc..b7c207f 100644 --- a/src/main/java/com/poststats/golf/api/CourseApi.java +++ b/src/main/java/com/poststats/golf/rs/api/CourseApi.java @@ -1,7 +1,7 @@ -package com.poststats.golf.api; +package com.poststats.golf.rs.api; -import com.poststats.golf.api.model.Course; -import com.poststats.golf.api.model.CourseNine; +import com.poststats.golf.rs.api.model.Course; +import com.poststats.golf.rs.api.model.CourseNine; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/src/main/java/com/poststats/golf/api/CoursesApi.java b/src/main/java/com/poststats/golf/rs/api/CoursesApi.java similarity index 95% rename from src/main/java/com/poststats/golf/api/CoursesApi.java rename to src/main/java/com/poststats/golf/rs/api/CoursesApi.java index 2b5f167..98ab155 100644 --- a/src/main/java/com/poststats/golf/api/CoursesApi.java +++ b/src/main/java/com/poststats/golf/rs/api/CoursesApi.java @@ -1,10 +1,10 @@ -package com.poststats.golf.api; +package com.poststats.golf.rs.api; import java.util.List; -import com.poststats.api.model.PagedCollection; -import com.poststats.api.model.Pagination; -import com.poststats.golf.api.model.Course; +import com.poststats.golf.rs.api.model.Course; +import com.poststats.rs.api.model.PagedCollection; +import com.poststats.rs.api.model.Pagination; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/src/main/java/com/poststats/golf/api/EventApi.java b/src/main/java/com/poststats/golf/rs/api/EventApi.java similarity index 97% rename from src/main/java/com/poststats/golf/api/EventApi.java rename to src/main/java/com/poststats/golf/rs/api/EventApi.java index 4543a2b..2671dcd 100644 --- a/src/main/java/com/poststats/golf/api/EventApi.java +++ b/src/main/java/com/poststats/golf/rs/api/EventApi.java @@ -1,6 +1,6 @@ -package com.poststats.golf.api; +package com.poststats.golf.rs.api; -import com.poststats.golf.api.model.Event; +import com.poststats.golf.rs.api.model.Event; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/src/main/java/com/poststats/golf/api/EventFinanceApi.java b/src/main/java/com/poststats/golf/rs/api/EventFinanceApi.java similarity index 99% rename from src/main/java/com/poststats/golf/api/EventFinanceApi.java rename to src/main/java/com/poststats/golf/rs/api/EventFinanceApi.java index 1f71694..748e059 100644 --- a/src/main/java/com/poststats/golf/api/EventFinanceApi.java +++ b/src/main/java/com/poststats/golf/rs/api/EventFinanceApi.java @@ -1,4 +1,4 @@ -package com.poststats.golf.api; +package com.poststats.golf.rs.api; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/poststats/golf/api/EventPersonApi.java b/src/main/java/com/poststats/golf/rs/api/EventPersonApi.java similarity index 98% rename from src/main/java/com/poststats/golf/api/EventPersonApi.java rename to src/main/java/com/poststats/golf/rs/api/EventPersonApi.java index 0acce48..18cadaa 100644 --- a/src/main/java/com/poststats/golf/api/EventPersonApi.java +++ b/src/main/java/com/poststats/golf/rs/api/EventPersonApi.java @@ -1,9 +1,9 @@ -package com.poststats.golf.api; +package com.poststats.golf.rs.api; import java.util.List; import java.util.Set; -import com.poststats.golf.api.model.EventPerson; +import com.poststats.golf.rs.api.model.EventPerson; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/src/main/java/com/poststats/golf/api/EventRoundApi.java b/src/main/java/com/poststats/golf/rs/api/EventRoundApi.java similarity index 95% rename from src/main/java/com/poststats/golf/api/EventRoundApi.java rename to src/main/java/com/poststats/golf/rs/api/EventRoundApi.java index b92818f..14cd618 100644 --- a/src/main/java/com/poststats/golf/api/EventRoundApi.java +++ b/src/main/java/com/poststats/golf/rs/api/EventRoundApi.java @@ -1,12 +1,11 @@ -package com.poststats.golf.api; +package com.poststats.golf.rs.api; import java.math.BigInteger; import java.util.List; -import com.poststats.api.Constants; -import com.poststats.golf.api.model.EventRound; -import com.poststats.golf.api.model.EventRoundPairing; -import com.poststats.golf.api.model.EventRoundPairingOrder; +import com.poststats.golf.rs.api.model.EventRound; +import com.poststats.golf.rs.api.model.EventRoundPairing; +import com.poststats.golf.rs.api.model.EventRoundPairingOrder; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/src/main/java/com/poststats/golf/api/GolferApi.java b/src/main/java/com/poststats/golf/rs/api/GolferApi.java similarity index 90% rename from src/main/java/com/poststats/golf/api/GolferApi.java rename to src/main/java/com/poststats/golf/rs/api/GolferApi.java index fbb2bf5..6bc7bf8 100644 --- a/src/main/java/com/poststats/golf/api/GolferApi.java +++ b/src/main/java/com/poststats/golf/rs/api/GolferApi.java @@ -1,7 +1,6 @@ -package com.poststats.golf.api; +package com.poststats.golf.rs.api; -import com.poststats.api.Constants; -import com.poststats.golf.api.model.Golfer; +import com.poststats.golf.rs.api.model.Golfer; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; diff --git a/src/main/java/com/poststats/golf/api/SeriesApi.java b/src/main/java/com/poststats/golf/rs/api/SeriesApi.java similarity index 91% rename from src/main/java/com/poststats/golf/api/SeriesApi.java rename to src/main/java/com/poststats/golf/rs/api/SeriesApi.java index baa911e..be8b556 100644 --- a/src/main/java/com/poststats/golf/api/SeriesApi.java +++ b/src/main/java/com/poststats/golf/rs/api/SeriesApi.java @@ -1,10 +1,9 @@ -package com.poststats.golf.api; +package com.poststats.golf.rs.api; import java.util.List; -import com.poststats.api.Constants; -import com.poststats.golf.api.model.Event; -import com.poststats.golf.api.model.Series; +import com.poststats.golf.rs.api.model.Event; +import com.poststats.golf.rs.api.model.Series; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; diff --git a/src/main/java/com/poststats/golf/api/model/BaseCourse.java b/src/main/java/com/poststats/golf/rs/api/model/BaseCourse.java similarity index 93% rename from src/main/java/com/poststats/golf/api/model/BaseCourse.java rename to src/main/java/com/poststats/golf/rs/api/model/BaseCourse.java index 0f1dd7b..dcb4459 100644 --- a/src/main/java/com/poststats/golf/api/model/BaseCourse.java +++ b/src/main/java/com/poststats/golf/rs/api/model/BaseCourse.java @@ -1,11 +1,11 @@ -package com.poststats.golf.api.model; +package com.poststats.golf.rs.api.model; import java.time.Year; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.poststats.api.model.BaseModel; -import com.poststats.transformer.MapEntry; +import com.poststats.rs.api.annotation.MapEntry; +import com.poststats.rs.api.model.BaseModel; @JsonIgnoreProperties(ignoreUnknown = true) public abstract class BaseCourse> extends BaseModel { diff --git a/src/main/java/com/poststats/golf/api/model/BaseCourseNine.java b/src/main/java/com/poststats/golf/rs/api/model/BaseCourseNine.java similarity index 79% rename from src/main/java/com/poststats/golf/api/model/BaseCourseNine.java rename to src/main/java/com/poststats/golf/rs/api/model/BaseCourseNine.java index c04158a..1ad3bff 100644 --- a/src/main/java/com/poststats/golf/api/model/BaseCourseNine.java +++ b/src/main/java/com/poststats/golf/rs/api/model/BaseCourseNine.java @@ -1,9 +1,9 @@ -package com.poststats.golf.api.model; +package com.poststats.golf.rs.api.model; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.poststats.api.model.BaseModel; -import com.poststats.transformer.MapEntry; +import com.poststats.rs.api.annotation.MapEntry; +import com.poststats.rs.api.model.BaseModel; @JsonIgnoreProperties(ignoreUnknown = true) public abstract class BaseCourseNine> extends BaseModel { diff --git a/src/main/java/com/poststats/golf/api/model/BaseEvent.java b/src/main/java/com/poststats/golf/rs/api/model/BaseEvent.java similarity index 92% rename from src/main/java/com/poststats/golf/api/model/BaseEvent.java rename to src/main/java/com/poststats/golf/rs/api/model/BaseEvent.java index 1185eba..0421ff8 100644 --- a/src/main/java/com/poststats/golf/api/model/BaseEvent.java +++ b/src/main/java/com/poststats/golf/rs/api/model/BaseEvent.java @@ -1,9 +1,9 @@ -package com.poststats.golf.api.model; +package com.poststats.golf.rs.api.model; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.poststats.api.model.BaseModel; -import com.poststats.transformer.MapEntry; +import com.poststats.rs.api.annotation.MapEntry; +import com.poststats.rs.api.model.BaseModel; /** * @author brian.long@poststats.com diff --git a/src/main/java/com/poststats/golf/api/model/BaseEventRound.java b/src/main/java/com/poststats/golf/rs/api/model/BaseEventRound.java similarity index 92% rename from src/main/java/com/poststats/golf/api/model/BaseEventRound.java rename to src/main/java/com/poststats/golf/rs/api/model/BaseEventRound.java index 9ff4d39..532407d 100644 --- a/src/main/java/com/poststats/golf/api/model/BaseEventRound.java +++ b/src/main/java/com/poststats/golf/rs/api/model/BaseEventRound.java @@ -1,11 +1,11 @@ -package com.poststats.golf.api.model; +package com.poststats.golf.rs.api.model; import java.time.LocalDate; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.poststats.api.model.BaseModel; -import com.poststats.transformer.MapEntry; +import com.poststats.rs.api.annotation.MapEntry; +import com.poststats.rs.api.model.BaseModel; /** * @author brian.long@poststats.com diff --git a/src/main/java/com/poststats/golf/api/model/BaseEventRoundPairing.java b/src/main/java/com/poststats/golf/rs/api/model/BaseEventRoundPairing.java similarity index 87% rename from src/main/java/com/poststats/golf/api/model/BaseEventRoundPairing.java rename to src/main/java/com/poststats/golf/rs/api/model/BaseEventRoundPairing.java index 833ca3a..4af4cdc 100644 --- a/src/main/java/com/poststats/golf/api/model/BaseEventRoundPairing.java +++ b/src/main/java/com/poststats/golf/rs/api/model/BaseEventRoundPairing.java @@ -1,11 +1,11 @@ -package com.poststats.golf.api.model; +package com.poststats.golf.rs.api.model; import java.time.LocalTime; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.poststats.api.model.BaseModel; -import com.poststats.transformer.MapEntry; +import com.poststats.rs.api.annotation.MapEntry; +import com.poststats.rs.api.model.BaseModel; /** * @author brian.long@poststats.com diff --git a/src/main/java/com/poststats/golf/api/model/BaseGolfer.java b/src/main/java/com/poststats/golf/rs/api/model/BaseGolfer.java similarity index 87% rename from src/main/java/com/poststats/golf/api/model/BaseGolfer.java rename to src/main/java/com/poststats/golf/rs/api/model/BaseGolfer.java index ab9036c..7a74aa9 100644 --- a/src/main/java/com/poststats/golf/api/model/BaseGolfer.java +++ b/src/main/java/com/poststats/golf/rs/api/model/BaseGolfer.java @@ -1,11 +1,11 @@ -package com.poststats.golf.api.model; +package com.poststats.golf.rs.api.model; import java.time.Year; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.poststats.api.model.BaseModel; -import com.poststats.transformer.MapEntry; +import com.poststats.rs.api.annotation.MapEntry; +import com.poststats.rs.api.model.BaseModel; @JsonIgnoreProperties(ignoreUnknown = true) public abstract class BaseGolfer> extends BaseModel { diff --git a/src/main/java/com/poststats/golf/api/model/BasePhoto.java b/src/main/java/com/poststats/golf/rs/api/model/BasePhoto.java similarity index 93% rename from src/main/java/com/poststats/golf/api/model/BasePhoto.java rename to src/main/java/com/poststats/golf/rs/api/model/BasePhoto.java index e874fe5..415e703 100644 --- a/src/main/java/com/poststats/golf/api/model/BasePhoto.java +++ b/src/main/java/com/poststats/golf/rs/api/model/BasePhoto.java @@ -1,4 +1,4 @@ -package com.poststats.golf.api.model; +package com.poststats.golf.rs.api.model; import java.util.LinkedList; import java.util.List; @@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @author brian.long@poststats.com */ public abstract class BasePhoto> - extends com.poststats.api.model.BasePhoto { + extends com.poststats.rs.api.model.BasePhoto { @JsonProperty private List courseIds; diff --git a/src/main/java/com/poststats/golf/api/model/BaseSeries.java b/src/main/java/com/poststats/golf/rs/api/model/BaseSeries.java similarity index 81% rename from src/main/java/com/poststats/golf/api/model/BaseSeries.java rename to src/main/java/com/poststats/golf/rs/api/model/BaseSeries.java index 9d2645d..0dc08e0 100644 --- a/src/main/java/com/poststats/golf/api/model/BaseSeries.java +++ b/src/main/java/com/poststats/golf/rs/api/model/BaseSeries.java @@ -1,9 +1,9 @@ -package com.poststats.golf.api.model; +package com.poststats.golf.rs.api.model; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.poststats.api.model.BaseModel; -import com.poststats.transformer.MapEntry; +import com.poststats.rs.api.annotation.MapEntry; +import com.poststats.rs.api.model.BaseModel; /** * @author brian.long@poststats.com diff --git a/src/main/java/com/poststats/golf/api/model/Course.java b/src/main/java/com/poststats/golf/rs/api/model/Course.java similarity index 89% rename from src/main/java/com/poststats/golf/api/model/Course.java rename to src/main/java/com/poststats/golf/rs/api/model/Course.java index a1761dd..c4bbcb4 100644 --- a/src/main/java/com/poststats/golf/api/model/Course.java +++ b/src/main/java/com/poststats/golf/rs/api/model/Course.java @@ -1,15 +1,15 @@ -package com.poststats.golf.api.model; +package com.poststats.golf.rs.api.model; import java.time.LocalDate; import java.time.OffsetDateTime; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.poststats.api.Constants; -import com.poststats.api.model.Facility; -import com.poststats.api.model.PeriodConstrainable; -import com.poststats.transformer.MapCondition; -import com.poststats.transformer.MapEntry; +import com.poststats.Constants; +import com.poststats.rs.api.annotation.MapCondition; +import com.poststats.rs.api.annotation.MapEntry; +import com.poststats.rs.api.model.Facility; +import com.poststats.rs.api.model.PeriodConstrainable; @JsonIgnoreProperties(ignoreUnknown = true) public class Course extends BaseCourse implements ReferenceableCourse, PeriodConstrainable { diff --git a/src/main/java/com/poststats/golf/api/model/CourseNine.java b/src/main/java/com/poststats/golf/rs/api/model/CourseNine.java similarity index 89% rename from src/main/java/com/poststats/golf/api/model/CourseNine.java rename to src/main/java/com/poststats/golf/rs/api/model/CourseNine.java index 83473ea..857fd80 100644 --- a/src/main/java/com/poststats/golf/api/model/CourseNine.java +++ b/src/main/java/com/poststats/golf/rs/api/model/CourseNine.java @@ -1,13 +1,13 @@ -package com.poststats.golf.api.model; +package com.poststats.golf.rs.api.model; import java.time.LocalDate; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.poststats.api.Constants; -import com.poststats.api.model.PeriodConstrainable; -import com.poststats.transformer.MapCondition; -import com.poststats.transformer.MapEntry; +import com.poststats.golf.rs.api.Constants; +import com.poststats.rs.api.annotation.MapCondition; +import com.poststats.rs.api.annotation.MapEntry; +import com.poststats.rs.api.model.PeriodConstrainable; @JsonIgnoreProperties(ignoreUnknown = true) public class CourseNine extends BaseCourseNine diff --git a/src/main/java/com/poststats/golf/api/model/Event.java b/src/main/java/com/poststats/golf/rs/api/model/Event.java similarity index 93% rename from src/main/java/com/poststats/golf/api/model/Event.java rename to src/main/java/com/poststats/golf/rs/api/model/Event.java index f768f38..e444804 100644 --- a/src/main/java/com/poststats/golf/api/model/Event.java +++ b/src/main/java/com/poststats/golf/rs/api/model/Event.java @@ -1,17 +1,16 @@ -package com.poststats.golf.api.model; +package com.poststats.golf.rs.api.model; import java.time.LocalDate; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty.Access; -import com.poststats.golf.api.Constants; -import com.poststats.service.impl.DefaultFormattingService; -import com.poststats.transformer.GeocodeSource; -import com.poststats.transformer.GeocodeTarget; -import com.poststats.transformer.GeocodeTarget.GeocodeField; -import com.poststats.transformer.MapCondition; -import com.poststats.transformer.MapEntry; +import com.poststats.golf.rs.api.Constants; +import com.poststats.rs.api.annotation.GeocodeSource; +import com.poststats.rs.api.annotation.GeocodeTarget; +import com.poststats.rs.api.annotation.GeocodeTarget.GeocodeField; +import com.poststats.rs.api.annotation.MapCondition; +import com.poststats.rs.api.annotation.MapEntry; /** * @author brian.long@poststats.com @@ -43,6 +42,10 @@ public class Event extends BaseEvent implements ReferenceableEvent { @GeocodeTarget(GeocodeField.Country) private String addrcountry; + @MapEntry + @GeocodeTarget(GeocodeField.FuzzyPostalAddress) + private String addrfuzzy; + @JsonProperty @MapEntry private Series series; @@ -200,18 +203,10 @@ public class Event extends BaseEvent implements ReferenceableEvent { this.deadline = deadline; } - @Override + @JsonProperty(access = Access.READ_ONLY) @GeocodeSource public String getFuzzyLocation() { - synchronized (this) { - if (super.getFuzzyLocation() == null) { - String address = new DefaultFormattingService().formatFuzzyPostalAddress(null, this.addrcity, - this.addrstate, this.addrcountry, null); - super.setFuzzyLocation(address); - } - } - - return super.getFuzzyLocation(); + return this.addrfuzzy; } public Series getSeries() { diff --git a/src/main/java/com/poststats/golf/api/model/EventPerson.java b/src/main/java/com/poststats/golf/rs/api/model/EventPerson.java similarity index 90% rename from src/main/java/com/poststats/golf/api/model/EventPerson.java rename to src/main/java/com/poststats/golf/rs/api/model/EventPerson.java index 50af69f..04fca5e 100644 --- a/src/main/java/com/poststats/golf/api/model/EventPerson.java +++ b/src/main/java/com/poststats/golf/rs/api/model/EventPerson.java @@ -1,12 +1,12 @@ -package com.poststats.golf.api.model; +package com.poststats.golf.rs.api.model; import java.math.BigInteger; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty.Access; -import com.poststats.api.model.BaseModel; -import com.poststats.transformer.MapEntry; +import com.poststats.rs.api.annotation.MapEntry; +import com.poststats.rs.api.model.BaseModel; /** * @author brian.long@poststats.com diff --git a/src/main/java/com/poststats/golf/api/model/EventRound.java b/src/main/java/com/poststats/golf/rs/api/model/EventRound.java similarity index 93% rename from src/main/java/com/poststats/golf/api/model/EventRound.java rename to src/main/java/com/poststats/golf/rs/api/model/EventRound.java index 0f6add7..958491a 100644 --- a/src/main/java/com/poststats/golf/api/model/EventRound.java +++ b/src/main/java/com/poststats/golf/rs/api/model/EventRound.java @@ -1,9 +1,9 @@ -package com.poststats.golf.api.model; +package com.poststats.golf.rs.api.model; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty.Access; -import com.poststats.transformer.MapEntry; +import com.poststats.rs.api.annotation.MapEntry; /** * @author brian.long@poststats.com diff --git a/src/main/java/com/poststats/golf/api/model/EventRoundPairing.java b/src/main/java/com/poststats/golf/rs/api/model/EventRoundPairing.java similarity index 96% rename from src/main/java/com/poststats/golf/api/model/EventRoundPairing.java rename to src/main/java/com/poststats/golf/rs/api/model/EventRoundPairing.java index c2030f5..bd87710 100644 --- a/src/main/java/com/poststats/golf/api/model/EventRoundPairing.java +++ b/src/main/java/com/poststats/golf/rs/api/model/EventRoundPairing.java @@ -1,9 +1,9 @@ -package com.poststats.golf.api.model; +package com.poststats.golf.rs.api.model; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty.Access; -import com.poststats.transformer.MapEntry; +import com.poststats.rs.api.annotation.MapEntry; /** * @author brian.long@poststats.com diff --git a/src/main/java/com/poststats/golf/api/model/EventRoundPairingOrder.java b/src/main/java/com/poststats/golf/rs/api/model/EventRoundPairingOrder.java similarity index 91% rename from src/main/java/com/poststats/golf/api/model/EventRoundPairingOrder.java rename to src/main/java/com/poststats/golf/rs/api/model/EventRoundPairingOrder.java index 452cb25..71013af 100644 --- a/src/main/java/com/poststats/golf/api/model/EventRoundPairingOrder.java +++ b/src/main/java/com/poststats/golf/rs/api/model/EventRoundPairingOrder.java @@ -1,4 +1,4 @@ -package com.poststats.golf.api.model; +package com.poststats.golf.rs.api.model; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/poststats/golf/api/model/Golfer.java b/src/main/java/com/poststats/golf/rs/api/model/Golfer.java similarity index 90% rename from src/main/java/com/poststats/golf/api/model/Golfer.java rename to src/main/java/com/poststats/golf/rs/api/model/Golfer.java index e0d8510..3b430db 100644 --- a/src/main/java/com/poststats/golf/api/model/Golfer.java +++ b/src/main/java/com/poststats/golf/rs/api/model/Golfer.java @@ -1,11 +1,11 @@ -package com.poststats.golf.api.model; +package com.poststats.golf.rs.api.model; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty.Access; -import com.poststats.api.model.Person; -import com.poststats.api.model.ReferenceablePerson; -import com.poststats.transformer.MapEntry; +import com.poststats.rs.api.annotation.MapEntry; +import com.poststats.rs.api.model.Person; +import com.poststats.rs.api.model.ReferenceablePerson; @JsonIgnoreProperties(ignoreUnknown = true) public class Golfer extends BaseGolfer implements ReferenceablePerson { diff --git a/src/main/java/com/poststats/golf/api/model/ReferenceableCourse.java b/src/main/java/com/poststats/golf/rs/api/model/ReferenceableCourse.java similarity index 58% rename from src/main/java/com/poststats/golf/api/model/ReferenceableCourse.java rename to src/main/java/com/poststats/golf/rs/api/model/ReferenceableCourse.java index c671260..9a89813 100644 --- a/src/main/java/com/poststats/golf/api/model/ReferenceableCourse.java +++ b/src/main/java/com/poststats/golf/rs/api/model/ReferenceableCourse.java @@ -1,4 +1,4 @@ -package com.poststats.golf.api.model; +package com.poststats.golf.rs.api.model; public interface ReferenceableCourse { diff --git a/src/main/java/com/poststats/golf/api/model/ReferenceableCourseNine.java b/src/main/java/com/poststats/golf/rs/api/model/ReferenceableCourseNine.java similarity index 60% rename from src/main/java/com/poststats/golf/api/model/ReferenceableCourseNine.java rename to src/main/java/com/poststats/golf/rs/api/model/ReferenceableCourseNine.java index 70bc4eb..65ac1f6 100644 --- a/src/main/java/com/poststats/golf/api/model/ReferenceableCourseNine.java +++ b/src/main/java/com/poststats/golf/rs/api/model/ReferenceableCourseNine.java @@ -1,4 +1,4 @@ -package com.poststats.golf.api.model; +package com.poststats.golf.rs.api.model; public interface ReferenceableCourseNine { diff --git a/src/main/java/com/poststats/golf/api/model/ReferenceableEvent.java b/src/main/java/com/poststats/golf/rs/api/model/ReferenceableEvent.java similarity index 58% rename from src/main/java/com/poststats/golf/api/model/ReferenceableEvent.java rename to src/main/java/com/poststats/golf/rs/api/model/ReferenceableEvent.java index 0902c3b..4b716e6 100644 --- a/src/main/java/com/poststats/golf/api/model/ReferenceableEvent.java +++ b/src/main/java/com/poststats/golf/rs/api/model/ReferenceableEvent.java @@ -1,4 +1,4 @@ -package com.poststats.golf.api.model; +package com.poststats.golf.rs.api.model; public interface ReferenceableEvent { diff --git a/src/main/java/com/poststats/golf/api/model/ReferenceableEventRound.java b/src/main/java/com/poststats/golf/rs/api/model/ReferenceableEventRound.java similarity index 60% rename from src/main/java/com/poststats/golf/api/model/ReferenceableEventRound.java rename to src/main/java/com/poststats/golf/rs/api/model/ReferenceableEventRound.java index 61bb0e0..ba5adab 100644 --- a/src/main/java/com/poststats/golf/api/model/ReferenceableEventRound.java +++ b/src/main/java/com/poststats/golf/rs/api/model/ReferenceableEventRound.java @@ -1,4 +1,4 @@ -package com.poststats.golf.api.model; +package com.poststats.golf.rs.api.model; public interface ReferenceableEventRound { diff --git a/src/main/java/com/poststats/golf/api/model/ReferenceableEventRoundPairing.java b/src/main/java/com/poststats/golf/rs/api/model/ReferenceableEventRoundPairing.java similarity index 72% rename from src/main/java/com/poststats/golf/api/model/ReferenceableEventRoundPairing.java rename to src/main/java/com/poststats/golf/rs/api/model/ReferenceableEventRoundPairing.java index 6c46b2c..cf76c6e 100644 --- a/src/main/java/com/poststats/golf/api/model/ReferenceableEventRoundPairing.java +++ b/src/main/java/com/poststats/golf/rs/api/model/ReferenceableEventRoundPairing.java @@ -1,4 +1,4 @@ -package com.poststats.golf.api.model; +package com.poststats.golf.rs.api.model; import java.math.BigInteger; diff --git a/src/main/java/com/poststats/golf/api/model/ReferenceableSeries.java b/src/main/java/com/poststats/golf/rs/api/model/ReferenceableSeries.java similarity index 58% rename from src/main/java/com/poststats/golf/api/model/ReferenceableSeries.java rename to src/main/java/com/poststats/golf/rs/api/model/ReferenceableSeries.java index ccd0643..2531dc7 100644 --- a/src/main/java/com/poststats/golf/api/model/ReferenceableSeries.java +++ b/src/main/java/com/poststats/golf/rs/api/model/ReferenceableSeries.java @@ -1,4 +1,4 @@ -package com.poststats.golf.api.model; +package com.poststats.golf.rs.api.model; public interface ReferenceableSeries { diff --git a/src/main/java/com/poststats/golf/api/model/ReferencedCourse.java b/src/main/java/com/poststats/golf/rs/api/model/ReferencedCourse.java similarity index 86% rename from src/main/java/com/poststats/golf/api/model/ReferencedCourse.java rename to src/main/java/com/poststats/golf/rs/api/model/ReferencedCourse.java index 5d4929c..d5814a5 100644 --- a/src/main/java/com/poststats/golf/api/model/ReferencedCourse.java +++ b/src/main/java/com/poststats/golf/rs/api/model/ReferencedCourse.java @@ -1,9 +1,9 @@ -package com.poststats.golf.api.model; +package com.poststats.golf.rs.api.model; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty.Access; -import com.poststats.transformer.MapEntry; +import com.poststats.rs.api.annotation.MapEntry; @JsonIgnoreProperties(ignoreUnknown = true) public class ReferencedCourse implements ReferenceableCourse { diff --git a/src/main/java/com/poststats/golf/api/model/ReferencedCourseNine.java b/src/main/java/com/poststats/golf/rs/api/model/ReferencedCourseNine.java similarity index 86% rename from src/main/java/com/poststats/golf/api/model/ReferencedCourseNine.java rename to src/main/java/com/poststats/golf/rs/api/model/ReferencedCourseNine.java index 7d41857..71fcb89 100644 --- a/src/main/java/com/poststats/golf/api/model/ReferencedCourseNine.java +++ b/src/main/java/com/poststats/golf/rs/api/model/ReferencedCourseNine.java @@ -1,9 +1,9 @@ -package com.poststats.golf.api.model; +package com.poststats.golf.rs.api.model; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty.Access; -import com.poststats.transformer.MapEntry; +import com.poststats.rs.api.annotation.MapEntry; @JsonIgnoreProperties(ignoreUnknown = true) public class ReferencedCourseNine implements ReferenceableCourseNine { diff --git a/src/main/java/com/poststats/golf/api/model/ReferencedEvent.java b/src/main/java/com/poststats/golf/rs/api/model/ReferencedEvent.java similarity index 87% rename from src/main/java/com/poststats/golf/api/model/ReferencedEvent.java rename to src/main/java/com/poststats/golf/rs/api/model/ReferencedEvent.java index f0411c1..7bd1c7d 100644 --- a/src/main/java/com/poststats/golf/api/model/ReferencedEvent.java +++ b/src/main/java/com/poststats/golf/rs/api/model/ReferencedEvent.java @@ -1,9 +1,9 @@ -package com.poststats.golf.api.model; +package com.poststats.golf.rs.api.model; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty.Access; -import com.poststats.transformer.MapEntry; +import com.poststats.rs.api.annotation.MapEntry; /** * @author brian.long@poststats.com diff --git a/src/main/java/com/poststats/golf/api/model/ReferencedEventRound.java b/src/main/java/com/poststats/golf/rs/api/model/ReferencedEventRound.java similarity index 87% rename from src/main/java/com/poststats/golf/api/model/ReferencedEventRound.java rename to src/main/java/com/poststats/golf/rs/api/model/ReferencedEventRound.java index 326a03a..7af6848 100644 --- a/src/main/java/com/poststats/golf/api/model/ReferencedEventRound.java +++ b/src/main/java/com/poststats/golf/rs/api/model/ReferencedEventRound.java @@ -1,9 +1,9 @@ -package com.poststats.golf.api.model; +package com.poststats.golf.rs.api.model; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty.Access; -import com.poststats.transformer.MapEntry; +import com.poststats.rs.api.annotation.MapEntry; /** * @author brian.long@poststats.com diff --git a/src/main/java/com/poststats/golf/api/model/ReferencedEventRoundPairing.java b/src/main/java/com/poststats/golf/rs/api/model/ReferencedEventRoundPairing.java similarity index 88% rename from src/main/java/com/poststats/golf/api/model/ReferencedEventRoundPairing.java rename to src/main/java/com/poststats/golf/rs/api/model/ReferencedEventRoundPairing.java index e9324d2..398f9e0 100644 --- a/src/main/java/com/poststats/golf/api/model/ReferencedEventRoundPairing.java +++ b/src/main/java/com/poststats/golf/rs/api/model/ReferencedEventRoundPairing.java @@ -1,11 +1,11 @@ -package com.poststats.golf.api.model; +package com.poststats.golf.rs.api.model; import java.math.BigInteger; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty.Access; -import com.poststats.transformer.MapEntry; +import com.poststats.rs.api.annotation.MapEntry; /** * @author brian.long@poststats.com diff --git a/src/main/java/com/poststats/golf/api/model/ReferencedSeries.java b/src/main/java/com/poststats/golf/rs/api/model/ReferencedSeries.java similarity index 83% rename from src/main/java/com/poststats/golf/api/model/ReferencedSeries.java rename to src/main/java/com/poststats/golf/rs/api/model/ReferencedSeries.java index 63dfd42..f9c31c1 100644 --- a/src/main/java/com/poststats/golf/api/model/ReferencedSeries.java +++ b/src/main/java/com/poststats/golf/rs/api/model/ReferencedSeries.java @@ -1,8 +1,8 @@ -package com.poststats.golf.api.model; +package com.poststats.golf.rs.api.model; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty.Access; -import com.poststats.transformer.MapEntry; +import com.poststats.rs.api.annotation.MapEntry; public class ReferencedSeries implements ReferenceableSeries { diff --git a/src/main/java/com/poststats/golf/api/model/Series.java b/src/main/java/com/poststats/golf/rs/api/model/Series.java similarity index 87% rename from src/main/java/com/poststats/golf/api/model/Series.java rename to src/main/java/com/poststats/golf/rs/api/model/Series.java index 3140906..f47cd07 100644 --- a/src/main/java/com/poststats/golf/api/model/Series.java +++ b/src/main/java/com/poststats/golf/rs/api/model/Series.java @@ -1,9 +1,9 @@ -package com.poststats.golf.api.model; +package com.poststats.golf.rs.api.model; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty.Access; -import com.poststats.transformer.MapEntry; +import com.poststats.rs.api.annotation.MapEntry; /** * @author brian.long@poststats.com diff --git a/src/main/java/com/poststats/golf/api/model/TransientCourse.java b/src/main/java/com/poststats/golf/rs/api/model/TransientCourse.java similarity index 79% rename from src/main/java/com/poststats/golf/api/model/TransientCourse.java rename to src/main/java/com/poststats/golf/rs/api/model/TransientCourse.java index a65ad35..0d490ab 100644 --- a/src/main/java/com/poststats/golf/api/model/TransientCourse.java +++ b/src/main/java/com/poststats/golf/rs/api/model/TransientCourse.java @@ -1,9 +1,9 @@ -package com.poststats.golf.api.model; +package com.poststats.golf.rs.api.model; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.poststats.api.model.ReferenceableFacility; -import com.poststats.transformer.MapEntry; +import com.poststats.rs.api.annotation.MapEntry; +import com.poststats.rs.api.model.ReferenceableFacility; @JsonIgnoreProperties(ignoreUnknown = true) public class TransientCourse extends BaseCourse { diff --git a/src/main/java/com/poststats/golf/api/model/TransientCourseNine.java b/src/main/java/com/poststats/golf/rs/api/model/TransientCourseNine.java similarity index 86% rename from src/main/java/com/poststats/golf/api/model/TransientCourseNine.java rename to src/main/java/com/poststats/golf/rs/api/model/TransientCourseNine.java index 845d6d1..db9baf9 100644 --- a/src/main/java/com/poststats/golf/api/model/TransientCourseNine.java +++ b/src/main/java/com/poststats/golf/rs/api/model/TransientCourseNine.java @@ -1,8 +1,8 @@ -package com.poststats.golf.api.model; +package com.poststats.golf.rs.api.model; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.poststats.transformer.MapEntry; +import com.poststats.rs.api.annotation.MapEntry; @JsonIgnoreProperties(ignoreUnknown = true) public class TransientCourseNine extends BaseCourseNine { diff --git a/src/main/java/com/poststats/golf/api/model/TransientEvent.java b/src/main/java/com/poststats/golf/rs/api/model/TransientEvent.java similarity index 86% rename from src/main/java/com/poststats/golf/api/model/TransientEvent.java rename to src/main/java/com/poststats/golf/rs/api/model/TransientEvent.java index b5fdbbf..706aced 100644 --- a/src/main/java/com/poststats/golf/api/model/TransientEvent.java +++ b/src/main/java/com/poststats/golf/rs/api/model/TransientEvent.java @@ -1,8 +1,8 @@ -package com.poststats.golf.api.model; +package com.poststats.golf.rs.api.model; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.poststats.transformer.MapEntry; +import com.poststats.rs.api.annotation.MapEntry; /** * @author brian.long@poststats.com diff --git a/src/main/java/com/poststats/golf/api/model/TransientEventRound.java b/src/main/java/com/poststats/golf/rs/api/model/TransientEventRound.java similarity index 87% rename from src/main/java/com/poststats/golf/api/model/TransientEventRound.java rename to src/main/java/com/poststats/golf/rs/api/model/TransientEventRound.java index 2ec4338..840181d 100644 --- a/src/main/java/com/poststats/golf/api/model/TransientEventRound.java +++ b/src/main/java/com/poststats/golf/rs/api/model/TransientEventRound.java @@ -1,8 +1,8 @@ -package com.poststats.golf.api.model; +package com.poststats.golf.rs.api.model; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.poststats.transformer.MapEntry; +import com.poststats.rs.api.annotation.MapEntry; /** * @author brian.long@poststats.com diff --git a/src/main/java/com/poststats/golf/api/model/TransientEventRoundPairing.java b/src/main/java/com/poststats/golf/rs/api/model/TransientEventRoundPairing.java similarity index 91% rename from src/main/java/com/poststats/golf/api/model/TransientEventRoundPairing.java rename to src/main/java/com/poststats/golf/rs/api/model/TransientEventRoundPairing.java index bfe406e..2a5ae29 100644 --- a/src/main/java/com/poststats/golf/api/model/TransientEventRoundPairing.java +++ b/src/main/java/com/poststats/golf/rs/api/model/TransientEventRoundPairing.java @@ -1,8 +1,8 @@ -package com.poststats.golf.api.model; +package com.poststats.golf.rs.api.model; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.poststats.transformer.MapEntry; +import com.poststats.rs.api.annotation.MapEntry; /** * @author brian.long@poststats.com diff --git a/src/main/java/com/poststats/golf/api/model/TransientGolfer.java b/src/main/java/com/poststats/golf/rs/api/model/TransientGolfer.java similarity index 79% rename from src/main/java/com/poststats/golf/api/model/TransientGolfer.java rename to src/main/java/com/poststats/golf/rs/api/model/TransientGolfer.java index 5fc4769..08cb691 100644 --- a/src/main/java/com/poststats/golf/api/model/TransientGolfer.java +++ b/src/main/java/com/poststats/golf/rs/api/model/TransientGolfer.java @@ -1,9 +1,9 @@ -package com.poststats.golf.api.model; +package com.poststats.golf.rs.api.model; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.poststats.api.model.ReferenceablePerson; -import com.poststats.transformer.MapEntry; +import com.poststats.rs.api.annotation.MapEntry; +import com.poststats.rs.api.model.ReferenceablePerson; @JsonIgnoreProperties(ignoreUnknown = true) public class TransientGolfer extends BaseGolfer { diff --git a/src/main/java/com/poststats/golf/api/model/TransientSeries.java b/src/main/java/com/poststats/golf/rs/api/model/TransientSeries.java similarity index 84% rename from src/main/java/com/poststats/golf/api/model/TransientSeries.java rename to src/main/java/com/poststats/golf/rs/api/model/TransientSeries.java index 9f89821..1d3b09c 100644 --- a/src/main/java/com/poststats/golf/api/model/TransientSeries.java +++ b/src/main/java/com/poststats/golf/rs/api/model/TransientSeries.java @@ -1,4 +1,4 @@ -package com.poststats.golf.api.model; +package com.poststats.golf.rs.api.model; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;