From db4aad79ecc1c2dab2a1b1539d88d8ae0266f5d9 Mon Sep 17 00:00:00 2001
From: Thomas Wiese <mail@thomaswiese.de>
Date: Thu, 19 Sep 2019 10:21:20 +0200
Subject: [PATCH] Bug 5085: move CourseConfigurationBuilder to
 gateway.serialization

---
 .../deserialization/impl}/CourseConfigurationBuilder.java  | 2 +-
 .../impl/CourseConfigurationJsonDeserializer.java          | 7 +++----
 java/com.sap.sailing.server.interface/META-INF/MANIFEST.MF | 1 -
 3 files changed, 4 insertions(+), 6 deletions(-)
 rename java/{com.sap.sailing.server.interface/src/com/sap/sailing/server/interfaces/coursetemplate => com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl}/CourseConfigurationBuilder.java (99%)

diff --git a/java/com.sap.sailing.server.interface/src/com/sap/sailing/server/interfaces/coursetemplate/CourseConfigurationBuilder.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/CourseConfigurationBuilder.java
similarity index 99%
rename from java/com.sap.sailing.server.interface/src/com/sap/sailing/server/interfaces/coursetemplate/CourseConfigurationBuilder.java
rename to java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/CourseConfigurationBuilder.java
index 95e488a0235..6d4b0facdfa 100644
--- a/java/com.sap.sailing.server.interface/src/com/sap/sailing/server/interfaces/coursetemplate/CourseConfigurationBuilder.java
+++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/CourseConfigurationBuilder.java
@@ -1,4 +1,4 @@
-package com.sap.sailing.server.interfaces.coursetemplate;
+package com.sap.sailing.server.gateway.deserialization.impl;
 
 import java.util.List;
 import java.util.Map;
diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/CourseConfigurationJsonDeserializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/CourseConfigurationJsonDeserializer.java
index f8db5f1f39c..19da3336329 100644
--- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/CourseConfigurationJsonDeserializer.java
+++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/CourseConfigurationJsonDeserializer.java
@@ -14,7 +14,6 @@ import com.sap.sailing.domain.sharedsailingdata.SharedSailingData;
 import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException;
 import com.sap.sailing.server.gateway.deserialization.JsonDeserializer;
 import com.sap.sailing.server.gateway.serialization.impl.CourseConfigurationJsonSerializer;
-//import com.sap.sailing.server.interfaces.coursetemplate.CourseConfigurationBuilder;
 
 public class CourseConfigurationJsonDeserializer implements JsonDeserializer<CourseConfiguration> {
 
@@ -31,7 +30,7 @@ public class CourseConfigurationJsonDeserializer implements JsonDeserializer<Cou
         final String courseConfigurationName = (String) json.get(CourseConfigurationJsonSerializer.FIELD_NAME);
         
         // TODO: how to get CourseConfigurationBuilder from com.sap.sailing.server.interfaces.coursetemplate (import leads in cyclic references???
-        //CourseConfigurationBuilder builder = new CourseConfigurationBuilder(sharedSailingData, null, null);
+        CourseConfigurationBuilder builder = new CourseConfigurationBuilder(sharedSailingData, null, null);
         
         final Map<Integer, MarkConfiguration> markConfigurations = new HashMap<Integer, MarkConfiguration>();
         final JSONArray allMarkConfigurationsJSON = (JSONArray) json.get(CourseConfigurationJsonSerializer.FIELD_MARK_CONFIGURATIONS);
@@ -43,10 +42,10 @@ public class CourseConfigurationJsonDeserializer implements JsonDeserializer<Cou
             CommonMarkProperties commonMarkProperties = commonMarkPropertiesJsonDeserializer.deserialize(json);
             // TODO add optionalPositioning
             
-            //builder.addMarkConfiguration(UUID.fromString(markTemplateID), UUID.fromString(markPropertiesID), UUID.fromString(markID), commonMarkProperties, null);
+            builder.addMarkConfiguration(UUID.fromString(markTemplateID), UUID.fromString(markPropertiesID), UUID.fromString(markID), commonMarkProperties, null);
         }
         
-        return null; //builder.build();
+        return builder.build();
     }
 
 }
diff --git a/java/com.sap.sailing.server.interface/META-INF/MANIFEST.MF b/java/com.sap.sailing.server.interface/META-INF/MANIFEST.MF
index 51983dc0b4f..2ec1223591a 100755
--- a/java/com.sap.sailing.server.interface/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.server.interface/META-INF/MANIFEST.MF
@@ -21,5 +21,4 @@ Require-Bundle: com.sap.sailing.domain;bundle-version="1.0.0",
  com.sap.sse.security,
  com.sap.sse.security.common;bundle-version="1.0.0"
 Export-Package: com.sap.sailing.server.interfaces,
- com.sap.sailing.server.interfaces.coursetemplate,
  com.sap.sailing.server.operationaltransformation