eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-03 17:49:40 +00:00
Code Activity

fixed test error in deserializing device identifiers by reworking logic of placeholder device id

Browse Source
This commit is contained in:
Fredrik Teschke committed 2014-05-08 18:24:16 +02:00
1 parent 9c3524bddc
commit 329c4556b4
13 files changed
+54 -21
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
+9 -2
View File
@@ -138,6 +138,7 @@ import com.sap.sailing.domain.racelog.tracking.DeviceIdentifier;
import com.sap.sailing.domain.racelog.tracking.DeviceMarkMappingEvent;
import com.sap.sailing.domain.racelog.tracking.RegisterCompetitorEvent;
import com.sap.sailing.domain.racelog.tracking.StartTrackingEvent;
import com.sap.sailing.domain.racelog.tracking.impl.PlaceHolderDeviceIdentifierSerializationHandler;
import com.sap.sailing.domain.tracking.TrackedRegattaRegistry;
import com.sap.sailing.domain.tracking.Wind;
import com.sap.sailing.domain.tracking.WindTrack;
@@ -1615,8 +1616,14 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory {
TypeBasedServiceFinder<DeviceIdentifierMongoHandler> deviceIdentifierServiceFinder, DBObject deviceId)
throws TransformationException, NoCorrespondingServiceRegisteredException {
String deviceType = (String) deviceId.get(FieldNames.DEVICE_TYPE.name());
Object deviceTypeId = deviceId.get(FieldNames.DEVICE_TYPE_ID.name());
Object deviceTypeId = deviceId.get(FieldNames.DEVICE_TYPE_SPECIFIC_ID.name());
String stringRepresentation = (String) deviceId.get(FieldNames.DEVICE_STRING_REPRESENTATION.name());
return deviceIdentifierServiceFinder.findService(deviceType).deserialize(deviceTypeId, deviceType, stringRepresentation);
try {
return deviceIdentifierServiceFinder.findService(deviceType).deserialize(deviceTypeId, deviceType, stringRepresentation);
} catch (TransformationException e) {
return new PlaceHolderDeviceIdentifierSerializationHandler().deserialize(
stringRepresentation, deviceType, stringRepresentation);
}
}
}
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/FieldNames.java
+1 -1
View File
@@ -92,5 +92,5 @@ public enum FieldNames {
CONFIGURATION_CONFIG_PROCEDURES,
// GPSFixes
DEVICE_TYPE_ID, DEVICE_ID, DEVICE_TYPE, GPSFIX_TYPE, GPSFIX, DEVICE_STRING_REPRESENTATION,
DEVICE_TYPE_SPECIFIC_ID, DEVICE_ID, DEVICE_TYPE, GPSFIX_TYPE, GPSFIX, DEVICE_STRING_REPRESENTATION,
}
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java
+2 -2
View File
@@ -1140,10 +1140,10 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory {
DeviceIdentifierMongoHandler handler = deviceIdentifierServiceFinder.findService(type);
Pair<String, ? extends Object> pair = handler.serialize(device);
type = pair.getA();
Object deviceTypeId = pair.getB();
Object deviceTypeSpecificId = pair.getB();
return new BasicDBObjectBuilder()
.add(FieldNames.DEVICE_TYPE.name(), type)
.add(FieldNames.DEVICE_TYPE_ID.name(), deviceTypeId)
.add(FieldNames.DEVICE_TYPE_SPECIFIC_ID.name(), deviceTypeSpecificId)
.add(FieldNames.DEVICE_STRING_REPRESENTATION.name(), device.getStringRepresentation()).get();
}