bug5409: Renaming FreeStyleMarkPropertiesJsonDe- / -Serializer

java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/CourseConfigurationJsonDeserializer.java

@@ -30,7 +30,7 @@ import com.sap.sailing.shared.server.SharedSailingData;
 public class CourseConfigurationJsonDeserializer implements JsonDeserializer<CourseConfiguration<MarkConfigurationRequestAnnotation>> {
 
     private final SharedSailingData sharedSailingData;
-    private final CommonMarkPropertiesWithTagsJsonDeserializer commonMarkPropertiesJsonDeserializer;
+    private final FreestyleMarkPropertiesJsonDeserializer commonMarkPropertiesJsonDeserializer;
     private final JsonDeserializer<RepeatablePart> repeatablePartJsonDeserializer;
     private final Regatta regatta;
     private final PositioningJsonDeserializer positioningJsonDeserializer;
@@ -38,7 +38,7 @@ public class CourseConfigurationJsonDeserializer implements JsonDeserializer<Cou
     public CourseConfigurationJsonDeserializer(final SharedSailingData sharedSailingData,
             DeviceIdentifierJsonDeserializer deviceIdentifierDeserializer, final Regatta regatta) {
         this.sharedSailingData = sharedSailingData;
-        commonMarkPropertiesJsonDeserializer = new CommonMarkPropertiesWithTagsJsonDeserializer();
+        commonMarkPropertiesJsonDeserializer = new FreestyleMarkPropertiesJsonDeserializer();
         repeatablePartJsonDeserializer = new RepeatablePartJsonDeserializer();
         positioningJsonDeserializer = new PositioningJsonDeserializer(deviceIdentifierDeserializer);
         this.regatta = regatta;

java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/FreestyleMarkPropertiesJsonDeserializer.java

@@ -11,19 +11,19 @@ import com.sap.sailing.domain.coursetemplate.FreestyleMarkProperties;
 import com.sap.sailing.domain.coursetemplate.impl.FreestyleMarkPropertiesImpl;
 import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException;
 import com.sap.sailing.server.gateway.deserialization.JsonDeserializer;
-import com.sap.sailing.server.gateway.serialization.impl.CommonMarkPropertiesWithTagsJsonSerializer;
+import com.sap.sailing.server.gateway.serialization.impl.FreestyleMarkPropertiesJsonSerializer;
 
-public class CommonMarkPropertiesWithTagsJsonDeserializer
+public class FreestyleMarkPropertiesJsonDeserializer
         implements JsonDeserializer<FreestyleMarkProperties> {
     private final CommonMarkPropertiesJsonDeserializer commonMarkPropertiesJsonDeserializer;
     
-    public CommonMarkPropertiesWithTagsJsonDeserializer() {
+    public FreestyleMarkPropertiesJsonDeserializer() {
         this.commonMarkPropertiesJsonDeserializer = new CommonMarkPropertiesJsonDeserializer();
     }
 
     @Override
     public FreestyleMarkProperties deserialize(JSONObject json) throws JsonDeserializationException {
-        JSONArray tagsArray = Helpers.getNestedArraySafe(json, CommonMarkPropertiesWithTagsJsonSerializer.FIELD_TAGS);
+        JSONArray tagsArray = Helpers.getNestedArraySafe(json, FreestyleMarkPropertiesJsonSerializer.FIELD_TAGS);
         final Set<String> tags = new HashSet<>();
         for(Object tag:tagsArray) {
             tags.add(tag.toString());

java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/CourseConfigurationJsonSerializer.java

@@ -69,7 +69,7 @@ public class CourseConfigurationJsonSerializer implements JsonSerializer<CourseC
     public CourseConfigurationJsonSerializer() {
         this.repeatablePartJsonSerializer = new RepeatablePartJsonSerializer();
         this.commonMarkPropertiesJsonSerializer = new CommonMarkPropertiesJsonSerializer();
-        this.commonMarkPropertiesWithTagsJsonSerializer = new CommonMarkPropertiesWithTagsJsonSerializer();
+        this.commonMarkPropertiesWithTagsJsonSerializer = new FreestyleMarkPropertiesJsonSerializer();
         this.gpsFixJsonSerializer = new GPSFixJsonSerializer();
     }
 

java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/FreestyleMarkPropertiesJsonSerializer.java

@@ -5,13 +5,13 @@ import org.json.simple.JSONObject;
 import com.sap.sailing.domain.coursetemplate.FreestyleMarkProperties;
 import com.sap.sailing.server.gateway.serialization.JsonSerializer;
 
-public class CommonMarkPropertiesWithTagsJsonSerializer implements JsonSerializer<FreestyleMarkProperties> {
+public class FreestyleMarkPropertiesJsonSerializer implements JsonSerializer<FreestyleMarkProperties> {
 
     public static final String FIELD_TAGS = "tags";
     
     private final CommonMarkPropertiesJsonSerializer commonMarkPropertiesJsonSerializer;
 
-    public CommonMarkPropertiesWithTagsJsonSerializer() {
+    public FreestyleMarkPropertiesJsonSerializer() {
         commonMarkPropertiesJsonSerializer = new CommonMarkPropertiesJsonSerializer();
     }
 

java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/MarkPropertiesJsonSerializer.java

@@ -10,11 +10,11 @@ public class MarkPropertiesJsonSerializer implements JsonSerializer<MarkProperti
     private static final String FIELD_ID = "id";
     private static final String FIELD_POSITIONING = "positioning";
 
-    private final CommonMarkPropertiesWithTagsJsonSerializer commonMarkPropertiesWithTagsJsonSerializer;
+    private final FreestyleMarkPropertiesJsonSerializer commonMarkPropertiesWithTagsJsonSerializer;
     private final PositioningJsonSerializer positioningJsonSerializer;
 
     public MarkPropertiesJsonSerializer(DeviceIdentifierJsonSerializer deviceIdentifierSerializer) {
-        this.commonMarkPropertiesWithTagsJsonSerializer = new CommonMarkPropertiesWithTagsJsonSerializer();
+        this.commonMarkPropertiesWithTagsJsonSerializer = new FreestyleMarkPropertiesJsonSerializer();
         this.positioningJsonSerializer = new PositioningJsonSerializer(deviceIdentifierSerializer);
     }