eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-07 11:32:16 +00:00
Code Activity

Bug 5085: move CourseConfigurationBuilder to gateway.serialization

Browse Source
This commit is contained in:
Thomas Wiese committed 2019-09-19 10:21:20 +02:00
1 parent 577aeb9308
commit db4aad79ec
3 files changed
+4 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.server.interface/src/com/sap/sailing/server/interfaces/coursetemplate/CourseConfigurationBuilder.java → java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/CourseConfigurationBuilder.java
+1 -1
View File
@@ -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;
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/CourseConfigurationJsonDeserializer.java
+3 -4
View File
@@ -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();
}
}
java/com.sap.sailing.server.interface/META-INF/MANIFEST.MF
-1
View File
@@ -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