eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-17 01:31:01 +00:00
Code Activity

moved Pair and Triple from com.sap.sailing.common.Util to com.sap.sse.common.Util and introduced all missing dependencies on com.sap.sse.common

Browse Source
This commit is contained in:
Axel Uhl committed 2014-06-02 23:31:26 +02:00
1 parent c4cea6660d
commit 0c47e86304
334 files changed
+1540 -1692
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/DeviceAndSessionIdentifierWithGPSFixesDeserializer.java
+4 -4
View File
@@ -7,7 +7,6 @@ import java.util.List;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import com.sap.sailing.domain.common.impl.Util.Triple;
import com.sap.sailing.domain.common.racelog.tracking.TransformationException;
import com.sap.sailing.domain.common.racelog.tracking.TypeBasedServiceFinder;
import com.sap.sailing.domain.racelog.tracking.DeviceIdentifier;
@@ -16,9 +15,10 @@ import com.sap.sailing.server.gateway.deserialization.JsonDeserializationExcepti
import com.sap.sailing.server.gateway.deserialization.JsonDeserializer;
import com.sap.sailing.server.gateway.deserialization.TypeBasedJsonDeserializer;
import com.sap.sailing.server.gateway.serialization.racelog.tracking.GPSFixJsonHandler;
import com.sap.sse.common.Util;
public class DeviceAndSessionIdentifierWithGPSFixesDeserializer
implements JsonDeserializer<Triple<DeviceIdentifier, Serializable, List<GPSFix>>> {
implements JsonDeserializer<Util.Triple<DeviceIdentifier, Serializable, List<GPSFix>>> {
public static final String FIELD_DEVICE = "device";
public static final String FIELD_SESSION_UUID = "sessionId";
@@ -35,7 +35,7 @@ implements JsonDeserializer<Triple<DeviceIdentifier, Serializable, List<GPSFix>>
}
@Override
public Triple<DeviceIdentifier, Serializable, List<GPSFix>> deserialize(JSONObject object) throws JsonDeserializationException {
public Util.Triple<DeviceIdentifier, Serializable, List<GPSFix>> deserialize(JSONObject object) throws JsonDeserializationException {
JSONObject deviceIdObject = Helpers.toJSONObjectSafe(object.get(FIELD_DEVICE));
DeviceIdentifier deviceId = deviceDeserializer.deserialize(deviceIdObject);
@@ -56,7 +56,7 @@ implements JsonDeserializer<Triple<DeviceIdentifier, Serializable, List<GPSFix>>
fixes.add(fix);
}
return new Triple<DeviceIdentifier, Serializable, List<GPSFix>>(deviceId, sessionId, fixes);
return new Util.Triple<DeviceIdentifier, Serializable, List<GPSFix>>(deviceId, sessionId, fixes);
}
}
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RRS26ConfigurationJsonDeserializer.java
+5 -5
View File
@@ -1,17 +1,17 @@
package com.sap.sailing.server.gateway.deserialization.impl;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import java.util.ArrayList;
import java.util.List;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import com.sap.sailing.domain.base.configuration.RacingProcedureConfiguration;
import com.sap.sailing.domain.base.configuration.impl.RRS26ConfigurationImpl;
import com.sap.sailing.domain.base.configuration.procedures.RRS26Configuration;
import com.sap.sailing.domain.base.configuration.RacingProcedureConfiguration;
import com.sap.sailing.domain.common.racelog.Flags;
import com.sap.sailing.server.gateway.deserialization.JsonDeserializer;
import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException;
import com.sap.sailing.server.gateway.deserialization.JsonDeserializer;
import com.sap.sailing.server.gateway.serialization.impl.RRS26ConfigurationJsonSerializer;
public class RRS26ConfigurationJsonDeserializer extends RacingProcedureConfigurationJsonDeserializer implements
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/RaceLogFinishPositioningConfirmedEventDeserializer.java
+2 -2
View File
@@ -9,7 +9,6 @@ import org.json.simple.JSONObject;
import com.sap.sailing.domain.base.Competitor;
import com.sap.sailing.domain.common.MaxPointsReason;
import com.sap.sailing.domain.common.TimePoint;
import com.sap.sailing.domain.common.impl.Util.Triple;
import com.sap.sailing.domain.racelog.CompetitorResults;
import com.sap.sailing.domain.racelog.RaceLogEvent;
import com.sap.sailing.domain.racelog.RaceLogEventAuthor;
@@ -18,6 +17,7 @@ import com.sap.sailing.server.gateway.deserialization.JsonDeserializationExcepti
import com.sap.sailing.server.gateway.deserialization.JsonDeserializer;
import com.sap.sailing.server.gateway.deserialization.impl.Helpers;
import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogFinishPositioningConfirmedEventSerializer;
import com.sap.sse.common.Util;
public class RaceLogFinishPositioningConfirmedEventDeserializer extends BaseRaceLogEventDeserializer {
@@ -48,7 +48,7 @@ public class RaceLogFinishPositioningConfirmedEventDeserializer extends BaseRace
String maxPointsReasonName = (String) jsonPositionedCompetitor.get(RaceLogFinishPositioningConfirmedEventSerializer.FIELD_SCORE_CORRECTIONS_MAX_POINTS_REASON);
MaxPointsReason maxPointsReason = MaxPointsReason.valueOf(maxPointsReasonName);
Triple<Serializable, String, MaxPointsReason> positionedCompetitor = new Triple<Serializable, String, MaxPointsReason>(competitorId, competitorName, maxPointsReason);
Util.Triple<Serializable, String, MaxPointsReason> positionedCompetitor = new Util.Triple<Serializable, String, MaxPointsReason>(competitorId, competitorName, maxPointsReason);
positionedCompetitors.add(positionedCompetitor);
}
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/RaceLogFinishPositioningListChangedEventDeserializer.java
+2 -2
View File
@@ -9,7 +9,6 @@ import org.json.simple.JSONObject;
import com.sap.sailing.domain.base.Competitor;
import com.sap.sailing.domain.common.MaxPointsReason;
import com.sap.sailing.domain.common.TimePoint;
import com.sap.sailing.domain.common.impl.Util.Triple;
import com.sap.sailing.domain.racelog.CompetitorResults;
import com.sap.sailing.domain.racelog.RaceLogEvent;
import com.sap.sailing.domain.racelog.RaceLogEventAuthor;
@@ -18,6 +17,7 @@ import com.sap.sailing.server.gateway.deserialization.JsonDeserializationExcepti
import com.sap.sailing.server.gateway.deserialization.JsonDeserializer;
import com.sap.sailing.server.gateway.deserialization.impl.Helpers;
import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogFinishPositioningListChangedEventSerializer;
import com.sap.sse.common.Util;
public class RaceLogFinishPositioningListChangedEventDeserializer extends BaseRaceLogEventDeserializer {
@@ -48,7 +48,7 @@ public class RaceLogFinishPositioningListChangedEventDeserializer extends BaseRa
String maxPointsReasonName = (String) jsonPositionedCompetitor.get(RaceLogFinishPositioningListChangedEventSerializer.FIELD_SCORE_CORRECTIONS_MAX_POINTS_REASON);
MaxPointsReason maxPointsReason = MaxPointsReason.valueOf(maxPointsReasonName);
Triple<Serializable, String, MaxPointsReason> positionedCompetitor = new Triple<Serializable, String, MaxPointsReason>(competitorId, competitorName, maxPointsReason);
Util.Triple<Serializable, String, MaxPointsReason> positionedCompetitor = new Util.Triple<Serializable, String, MaxPointsReason>(competitorId, competitorName, maxPointsReason);
positionedCompetitors.add(positionedCompetitor);
}
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/ColorJsonSerializer.java
+2 -2
View File
@@ -3,8 +3,8 @@ package com.sap.sailing.server.gateway.serialization.impl;
import org.json.simple.JSONObject;
import com.sap.sailing.domain.common.Color;
import com.sap.sailing.domain.common.impl.Util.Triple;
import com.sap.sailing.server.gateway.serialization.JsonSerializer;
import com.sap.sse.common.Util;
public class ColorJsonSerializer implements JsonSerializer<Color> {
public static final String FIELD_RED = "r";
@@ -15,7 +15,7 @@ public class ColorJsonSerializer implements JsonSerializer<Color> {
public JSONObject serialize(Color color) {
JSONObject result = new JSONObject();
Triple<Integer, Integer, Integer> rgb = color.getAsRGB();
Util.Triple<Integer, Integer, Integer> rgb = color.getAsRGB();
result.put(FIELD_RED, rgb.getA());
result.put(FIELD_GREEN, rgb.getB());
result.put(FIELD_BLUE, rgb.getC());
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/DeviceAndSessionIdentifierWithGPSFixesSerializer.java
+3 -3
View File
@@ -6,14 +6,14 @@ import java.util.List;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import com.sap.sailing.domain.common.impl.Util.Triple;
import com.sap.sailing.domain.racelog.tracking.DeviceIdentifier;
import com.sap.sailing.domain.tracking.GPSFix;
import com.sap.sailing.server.gateway.deserialization.impl.DeviceAndSessionIdentifierWithGPSFixesDeserializer;
import com.sap.sailing.server.gateway.serialization.JsonSerializer;
import com.sap.sse.common.Util;
public class DeviceAndSessionIdentifierWithGPSFixesSerializer<D extends DeviceIdentifier, F extends GPSFix> implements
JsonSerializer<Triple<D, Serializable, List<F>>> {
JsonSerializer<Util.Triple<D, Serializable, List<F>>> {
private final JsonSerializer<DeviceIdentifier> deviceSerializer;
private final JsonSerializer<F> fixSerializer;
@@ -25,7 +25,7 @@ public class DeviceAndSessionIdentifierWithGPSFixesSerializer<D extends DeviceId
}
@Override
public JSONObject serialize(Triple<D, Serializable, List<F>> data) {
public JSONObject serialize(Util.Triple<D, Serializable, List<F>> data) {
JSONObject result = new JSONObject();
JSONObject deviceIdJson = deviceSerializer.serialize(data.getA());
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/DeviceIdentifierJsonSerializer.java
+2 -2
View File
@@ -5,7 +5,6 @@ import java.util.logging.Logger;
import org.json.simple.JSONObject;
import com.sap.sailing.domain.common.impl.Util.Pair;
import com.sap.sailing.domain.common.racelog.tracking.SingleTypeBasedServiceFinderImpl;
import com.sap.sailing.domain.common.racelog.tracking.TransformationException;
import com.sap.sailing.domain.common.racelog.tracking.TypeBasedServiceFinder;
@@ -15,6 +14,7 @@ import com.sap.sailing.server.gateway.deserialization.impl.DeviceIdentifierJsonD
import com.sap.sailing.server.gateway.serialization.JsonSerializer;
import com.sap.sailing.server.gateway.serialization.racelog.tracking.DeviceIdentifierJsonHandler;
import com.sap.sailing.server.gateway.serialization.racelog.tracking.impl.PlaceHolderDeviceIdentifierJsonHandler;
import com.sap.sse.common.Util;
public class DeviceIdentifierJsonSerializer implements JsonSerializer<DeviceIdentifier> {
private static final Logger logger = Logger.getLogger(DeviceIdentifierJsonSerializer.class.getName());
@@ -38,7 +38,7 @@ public class DeviceIdentifierJsonSerializer implements JsonSerializer<DeviceIden
public JSONObject serialize(DeviceIdentifier object) {
JSONObject result = new JSONObject();
DeviceIdentifierJsonHandler handler = serviceFinder.findService(object.getIdentifierType());
Pair<String, ? extends Object> pair;
Util.Pair<String, ? extends Object> pair;
try {
pair = handler.serialize(object);
result.put(DeviceIdentifierJsonDeserializer.FIELD_DEVICE_TYPE, pair.getA());
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/PositionedMarkJsonSerializer.java
+3 -3
View File
@@ -5,10 +5,10 @@ import org.json.simple.JSONObject;
import com.sap.sailing.domain.base.ControlPoint;
import com.sap.sailing.domain.base.Mark;
import com.sap.sailing.domain.common.Position;
import com.sap.sailing.domain.common.impl.Util.Pair;
import com.sap.sailing.server.gateway.serialization.JsonSerializer;
import com.sap.sse.common.Util;
public class PositionedMarkJsonSerializer implements JsonSerializer<Pair<Mark, Position>> {
public class PositionedMarkJsonSerializer implements JsonSerializer<Util.Pair<Mark, Position>> {
public static final String FIELD_MARK = "mark";
public static final String FIELD_POSITION = "position";
@@ -21,7 +21,7 @@ public class PositionedMarkJsonSerializer implements JsonSerializer<Pair<Mark, P
}
@Override
public JSONObject serialize(Pair<Mark, Position> positionedMark) {
public JSONObject serialize(Util.Pair<Mark, Position> positionedMark) {
JSONObject result = new JSONObject();
result.put(FIELD_MARK, markSerializer.serialize(positionedMark.getA()));
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogFinishPositioningConfirmedEventSerializer.java
+3 -3
View File
@@ -8,10 +8,10 @@ import org.json.simple.JSONObject;
import com.sap.sailing.domain.base.Competitor;
import com.sap.sailing.domain.common.MaxPointsReason;
import com.sap.sailing.domain.common.impl.Util.Triple;
import com.sap.sailing.domain.racelog.RaceLogEvent;
import com.sap.sailing.domain.racelog.RaceLogFinishPositioningConfirmedEvent;
import com.sap.sailing.server.gateway.serialization.JsonSerializer;
import com.sap.sse.common.Util;
public class RaceLogFinishPositioningConfirmedEventSerializer extends BaseRaceLogEventSerializer {
@@ -42,11 +42,11 @@ public class RaceLogFinishPositioningConfirmedEventSerializer extends BaseRaceLo
return result;
}
private JSONArray serializePositionedCompetitors(List<Triple<Serializable, String, MaxPointsReason>> positionedCompetitors) {
private JSONArray serializePositionedCompetitors(List<Util.Triple<Serializable, String, MaxPointsReason>> positionedCompetitors) {
JSONArray jsonPositionedCompetitors = new JSONArray();
if (positionedCompetitors != null) { // for backwards compatibility reasons
for (Triple<Serializable, String, MaxPointsReason> positionedCompetitor : positionedCompetitors) {
for (Util.Triple<Serializable, String, MaxPointsReason> positionedCompetitor : positionedCompetitors) {
JSONObject jsonPositionedCompetitor = new JSONObject();
jsonPositionedCompetitor.put(FIELD_COMPETITOR_ID, positionedCompetitor.getA().toString());
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogFinishPositioningListChangedEventSerializer.java
+3 -3
View File
@@ -8,10 +8,10 @@ import org.json.simple.JSONObject;
import com.sap.sailing.domain.base.Competitor;
import com.sap.sailing.domain.common.MaxPointsReason;
import com.sap.sailing.domain.common.impl.Util.Triple;
import com.sap.sailing.domain.racelog.RaceLogEvent;
import com.sap.sailing.domain.racelog.RaceLogFinishPositioningListChangedEvent;
import com.sap.sailing.server.gateway.serialization.JsonSerializer;
import com.sap.sse.common.Util;
public class RaceLogFinishPositioningListChangedEventSerializer extends BaseRaceLogEventSerializer {
@@ -41,10 +41,10 @@ public class RaceLogFinishPositioningListChangedEventSerializer extends BaseRace
return result;
}
private JSONArray serializePositionedCompetitors(List<Triple<Serializable, String, MaxPointsReason>> positionedCompetitors) {
private JSONArray serializePositionedCompetitors(List<Util.Triple<Serializable, String, MaxPointsReason>> positionedCompetitors) {
JSONArray jsonPositionedCompetitors = new JSONArray();
for (Triple<Serializable, String, MaxPointsReason> positionedCompetitor : positionedCompetitors) {
for (Util.Triple<Serializable, String, MaxPointsReason> positionedCompetitor : positionedCompetitors) {
JSONObject jsonPositionedCompetitor = new JSONObject();
jsonPositionedCompetitor.put(FIELD_COMPETITOR_ID, positionedCompetitor.getA().toString());