eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-20 04:35:32 +00:00
Code Activity

bug5168: fixed some test issued

Browse Source
This commit is contained in:
Axel Uhl
2020-01-07 23:08:11 +01:00
parent 9169b00ca7
commit 7eb6802b8f
5 changed files with 75 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.shared.server.gateway/src/com/sap/sailing/shared/server/gateway/jaxrs/api/MarkPropertiesResource.java
+16 -10
View File
@@ -43,13 +43,9 @@ import com.sun.jersey.api.client.ClientResponse.Status;
@Path("/v1/markproperties")
public class MarkPropertiesResource extends AbstractSailingServerResource {
private final JsonSerializer<MarkProperties> markPropertiesSerializer;
private JsonSerializer<MarkProperties> markPropertiesSerializer;
public MarkPropertiesResource() {
final TypeBasedServiceFinder<DeviceIdentifierJsonHandler> deviceJsonServiceFinder = getServiceFinderFactory()
.createServiceFinder(DeviceIdentifierJsonHandler.class);
deviceJsonServiceFinder.setFallbackService(new PlaceHolderDeviceIdentifierJsonHandler());
markPropertiesSerializer = new MarkPropertiesJsonSerializer(new DeviceIdentifierJsonSerializer(deviceJsonServiceFinder));
}
private Response getBadMarkPropertiesValidationErrorResponse(String errorText) {
@@ -67,7 +63,7 @@ public class MarkPropertiesResource extends AbstractSailingServerResource {
Iterable<MarkProperties> markPropertiesList = getSharedSailingData().getAllMarkProperties(tags);
JSONArray result = new JSONArray();
for (MarkProperties markProperties : markPropertiesList) {
result.add(markPropertiesSerializer.serialize(markProperties));
result.add(getMarkPropertiesSerializer().serialize(markProperties));
}
final String json = result.toJSONString();
return Response.ok(json).build();
@@ -81,7 +77,7 @@ public class MarkPropertiesResource extends AbstractSailingServerResource {
if (markProperties == null) {
return getMarkPropertiesNotFoundErrorResponse();
}
final JSONObject serializedMarkedProperties = markPropertiesSerializer.serialize(markProperties);
final JSONObject serializedMarkedProperties = getMarkPropertiesSerializer().serialize(markProperties);
final String json = serializedMarkedProperties.toJSONString();
return Response.ok(json).build();
}
@@ -133,7 +129,7 @@ public class MarkPropertiesResource extends AbstractSailingServerResource {
final Position fixedPosition = new DegreePosition(latDeg, lonDeg);
getSharedSailingData().setFixedPositionForMarkProperties(createdMarkProperties, fixedPosition);
}
final JSONObject serializedMarkedProperties = markPropertiesSerializer.serialize(createdMarkProperties);
final JSONObject serializedMarkedProperties = getMarkPropertiesSerializer().serialize(createdMarkProperties);
final String json = serializedMarkedProperties.toJSONString();
return Response.ok(json).build();
}
@@ -156,7 +152,7 @@ public class MarkPropertiesResource extends AbstractSailingServerResource {
final Position fixedPosition = new DegreePosition(latDeg, lonDeg);
getSharedSailingData().setFixedPositionForMarkProperties(markProperties, fixedPosition);
}
final JSONObject serializedMarkedProperties = markPropertiesSerializer.serialize(markProperties);
final JSONObject serializedMarkedProperties = getMarkPropertiesSerializer().serialize(markProperties);
final String json = serializedMarkedProperties.toJSONString();
return Response.ok(json).build();
}
@@ -211,7 +207,7 @@ public class MarkPropertiesResource extends AbstractSailingServerResource {
positioningInformation = null;
}
getSharedSailingData().updateMarkProperties(markPropertiesUUID, markPropertiesBuilder.build(), positioningInformation, tags);
final JSONObject serializedMarkedProperties = markPropertiesSerializer.serialize(markProperties);
final JSONObject serializedMarkedProperties = getMarkPropertiesSerializer().serialize(markProperties);
final String json = serializedMarkedProperties.toJSONString();
return Response.ok(json).build();
}
@@ -226,4 +222,14 @@ public class MarkPropertiesResource extends AbstractSailingServerResource {
getSharedSailingData().deleteMarkProperties(markProperties);
return Response.ok().build();
}
private synchronized JsonSerializer<MarkProperties> getMarkPropertiesSerializer() {
if (markPropertiesSerializer == null) {
final TypeBasedServiceFinder<DeviceIdentifierJsonHandler> deviceJsonServiceFinder = getServiceFinderFactory()
.createServiceFinder(DeviceIdentifierJsonHandler.class);
deviceJsonServiceFinder.setFallbackService(new PlaceHolderDeviceIdentifierJsonHandler());
markPropertiesSerializer = new MarkPropertiesJsonSerializer(new DeviceIdentifierJsonSerializer(deviceJsonServiceFinder));
}
return markPropertiesSerializer;
}
}