refactored packages

pom.xml

@@ -20,18 +20,8 @@
 	<dependencies>
 		<dependency>
 			<groupId>com.poststats</groupId>
-			<artifactId>poststats-api</artifactId>
+			<artifactId>poststats-rs-api</artifactId>
-			<version>1.0-SNAPSHOT</version>
+			<version>2.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>com.poststats.golf</groupId>
-			<artifactId>golf-core</artifactId>
-			<version>1.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-csv</artifactId>
-			<version>1.5</version>
 		</dependency>
 		
 		<dependency>

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;

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";

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.rs.api.model.Course;
-import com.poststats.golf.api.model.CourseNine;
+import com.poststats.golf.rs.api.model.CourseNine;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

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.golf.rs.api.model.Course;
-import com.poststats.api.model.Pagination;
+import com.poststats.rs.api.model.PagedCollection;
-import com.poststats.golf.api.model.Course;
+import com.poststats.rs.api.model.Pagination;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

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;

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;

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;

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.rs.api.model.EventRound;
-import com.poststats.golf.api.model.EventRound;
+import com.poststats.golf.rs.api.model.EventRoundPairing;
-import com.poststats.golf.api.model.EventRoundPairing;
+import com.poststats.golf.rs.api.model.EventRoundPairingOrder;
-import com.poststats.golf.api.model.EventRoundPairingOrder;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

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.rs.api.model.Golfer;
-import com.poststats.golf.api.model.Golfer;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;

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.rs.api.model.Event;
-import com.poststats.golf.api.model.Event;
+import com.poststats.golf.rs.api.model.Series;
-import com.poststats.golf.api.model.Series;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;

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.rs.api.annotation.MapEntry;
-import com.poststats.transformer.MapEntry;
+import com.poststats.rs.api.model.BaseModel;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public abstract class BaseCourse<ConcreteT extends BaseCourse<ConcreteT>> extends BaseModel<ConcreteT> {

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.rs.api.annotation.MapEntry;
-import com.poststats.transformer.MapEntry;
+import com.poststats.rs.api.model.BaseModel;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public abstract class BaseCourseNine<ConcreteT extends BaseCourseNine<ConcreteT>> extends BaseModel<ConcreteT> {

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.rs.api.annotation.MapEntry;
-import com.poststats.transformer.MapEntry;
+import com.poststats.rs.api.model.BaseModel;
 
 /**
  * @author brian.long@poststats.com

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.rs.api.annotation.MapEntry;
-import com.poststats.transformer.MapEntry;
+import com.poststats.rs.api.model.BaseModel;
 
 /**
  * @author brian.long@poststats.com

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.rs.api.annotation.MapEntry;
-import com.poststats.transformer.MapEntry;
+import com.poststats.rs.api.model.BaseModel;
 
 /**
  * @author brian.long@poststats.com

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.rs.api.annotation.MapEntry;
-import com.poststats.transformer.MapEntry;
+import com.poststats.rs.api.model.BaseModel;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public abstract class BaseGolfer<ConcreteT extends BaseGolfer<ConcreteT>> extends BaseModel<ConcreteT> {

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<ConcreteT extends BasePhoto<ConcreteT>>
-		extends com.poststats.api.model.BasePhoto<ConcreteT> {
+		extends com.poststats.rs.api.model.BasePhoto<ConcreteT> {
 
 	@JsonProperty
 	private List<Integer> courseIds;

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.rs.api.annotation.MapEntry;
-import com.poststats.transformer.MapEntry;
+import com.poststats.rs.api.model.BaseModel;
 
 /**
  * @author brian.long@poststats.com

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.Constants;
-import com.poststats.api.model.Facility;
+import com.poststats.rs.api.annotation.MapCondition;
-import com.poststats.api.model.PeriodConstrainable;
+import com.poststats.rs.api.annotation.MapEntry;
-import com.poststats.transformer.MapCondition;
+import com.poststats.rs.api.model.Facility;
-import com.poststats.transformer.MapEntry;
+import com.poststats.rs.api.model.PeriodConstrainable;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Course extends BaseCourse<Course> implements ReferenceableCourse, PeriodConstrainable<LocalDate> {

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.golf.rs.api.Constants;
-import com.poststats.api.model.PeriodConstrainable;
+import com.poststats.rs.api.annotation.MapCondition;
-import com.poststats.transformer.MapCondition;
+import com.poststats.rs.api.annotation.MapEntry;
-import com.poststats.transformer.MapEntry;
+import com.poststats.rs.api.model.PeriodConstrainable;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class CourseNine extends BaseCourseNine<CourseNine>

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.golf.rs.api.Constants;
-import com.poststats.service.impl.DefaultFormattingService;
+import com.poststats.rs.api.annotation.GeocodeSource;
-import com.poststats.transformer.GeocodeSource;
+import com.poststats.rs.api.annotation.GeocodeTarget;
-import com.poststats.transformer.GeocodeTarget;
+import com.poststats.rs.api.annotation.GeocodeTarget.GeocodeField;
-import com.poststats.transformer.GeocodeTarget.GeocodeField;
+import com.poststats.rs.api.annotation.MapCondition;
-import com.poststats.transformer.MapCondition;
+import com.poststats.rs.api.annotation.MapEntry;
-import com.poststats.transformer.MapEntry;
 
 /**
  * @author brian.long@poststats.com
@@ -43,6 +42,10 @@ public class Event extends BaseEvent<Event> 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<Event> implements ReferenceableEvent {
 		this.deadline = deadline;
 	}
 
-	@Override
+	@JsonProperty(access = Access.READ_ONLY)
 	@GeocodeSource
 	public String getFuzzyLocation() {
-		synchronized (this) {
+		return this.addrfuzzy;
-			if (super.getFuzzyLocation() == null) {
-				String address = new DefaultFormattingService().formatFuzzyPostalAddress(null, this.addrcity,
-						this.addrstate, this.addrcountry, null);
-				super.setFuzzyLocation(address);
-			}
-		}
-
-		return super.getFuzzyLocation();
 	}
 
 	public Series getSeries() {

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.rs.api.annotation.MapEntry;
-import com.poststats.transformer.MapEntry;
+import com.poststats.rs.api.model.BaseModel;
 
 /**
  * @author brian.long@poststats.com

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

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

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;
 

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.rs.api.annotation.MapEntry;
-import com.poststats.api.model.ReferenceablePerson;
+import com.poststats.rs.api.model.Person;
-import com.poststats.transformer.MapEntry;
+import com.poststats.rs.api.model.ReferenceablePerson;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Golfer extends BaseGolfer<Golfer> implements ReferenceablePerson {

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 {
 

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 {
 

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 {
 

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 {
 

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;
 

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 {
 

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 {

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 {

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

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

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

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 {
 

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

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.rs.api.annotation.MapEntry;
-import com.poststats.transformer.MapEntry;
+import com.poststats.rs.api.model.ReferenceableFacility;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class TransientCourse extends BaseCourse<TransientCourse> {

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<TransientCourseNine> {

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

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

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

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.rs.api.annotation.MapEntry;
-import com.poststats.transformer.MapEntry;
+import com.poststats.rs.api.model.ReferenceablePerson;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class TransientGolfer extends BaseGolfer<TransientGolfer> {

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;