changed structure of device identifier handlers, and added string serialization handler

java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/PingDeviceIdentifierImpl.java

@@ -2,9 +2,6 @@ package com.sap.sailing.domain.racelogtracking;
 
 import java.util.UUID;
 
-import com.sap.sailing.domain.base.IsManagedBySharedDomainFactory;
-import com.sap.sailing.domain.base.SharedDomainFactory;
-
 public class PingDeviceIdentifierImpl implements PingDeviceIdentifier {
     private static final long serialVersionUID = -4049961972156611640L;
 
@@ -24,12 +21,6 @@ public class PingDeviceIdentifierImpl implements PingDeviceIdentifier {
         return TYPE;
     }
 
-    @Override
-    public IsManagedBySharedDomainFactory resolve(SharedDomainFactory domainFactory) {
-        //No resolving necessary, only relevant on the creating server
-        return this;
-    }
-
     @Override
     public UUID getId() {
         return id;

java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/Activator.java

@@ -1,76 +1,78 @@
-package com.sap.sailing.domain.racelogtracking.impl;
-
-import java.util.Dictionary;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-
-import com.sap.sailing.domain.common.racelog.tracking.TypeBasedServiceFinder;
-import com.sap.sailing.domain.persistence.racelog.tracking.DeviceIdentifierMongoHandler;
-import com.sap.sailing.domain.racelog.tracking.SmartphoneImeiIdentifier;
-import com.sap.sailing.domain.racelogtracking.PingDeviceIdentifierImpl;
-import com.sap.sailing.domain.racelogtracking.RaceLogTrackingAdapterFactory;
-import com.sap.sailing.domain.tracking.GPSFix;
-import com.sap.sailing.server.gateway.deserialization.JsonDeserializer;
-import com.sap.sailing.server.gateway.deserialization.impl.GPSFixJsonDeserializer;
-import com.sap.sailing.server.gateway.deserialization.impl.GPSFixMovingJsonDeserializer;
-import com.sap.sailing.server.gateway.deserialization.impl.GPSFixMovingNmeaDTOJsonDeserializer;
-import com.sap.sailing.server.gateway.deserialization.impl.GPSFixNmeaDTOJsonDeserializer;
-import com.sap.sailing.server.gateway.serialization.JsonSerializer;
-import com.sap.sailing.server.gateway.serialization.impl.GPSFixJsonSerializer;
-import com.sap.sailing.server.gateway.serialization.impl.GPSFixMovingJsonSerializer;
-import com.sap.sailing.server.gateway.serialization.impl.GPSFixMovingNmeaDTOJsonSerializer;
-import com.sap.sailing.server.gateway.serialization.impl.GPSFixNmeaDTOJsonSerializer;
-import com.sap.sailing.server.gateway.serialization.racelog.tracking.DeviceIdentifierJsonHandler;
-import com.sap.sailing.server.gateway.serialization.racelog.tracking.GPSFixJsonHandler;
-import com.sap.sailing.server.gateway.serialization.racelog.tracking.impl.GPSFixJsonHandlerImpl;
-import com.sap.sailing.server.gateway.serialization.racelog.tracking.impl.SmartphoneImeiJsonHandler;
-
-public class Activator implements BundleActivator {
-	private static final Logger logger = Logger.getLogger(Activator.class.getName());
-	
-    private Set<ServiceRegistration<?>> registrations = new HashSet<>();
-
-    private Dictionary<String, String> getDict(String type) {
-        Dictionary<String, String> properties = new Hashtable<String, String>();
-        properties.put(TypeBasedServiceFinder.TYPE, type);
-        return properties;
-    }
-
-    private <T extends GPSFix> void registerGPSFixJsonService(BundleContext context, JsonDeserializer<T> deserializer,
-            JsonSerializer<T> serializer, String type) {
-        registrations.add(context.registerService(GPSFixJsonHandler.class,
-                new GPSFixJsonHandlerImpl<T>(deserializer, serializer), getDict(type)));
-    }
-    
-    @Override
-    public void start(BundleContext context) throws Exception {
-        registrations.add(context.registerService(DeviceIdentifierMongoHandler.class, new SmartphoneImeiMongoHandler(), getDict(SmartphoneImeiIdentifier.TYPE)));
-        registrations.add(context.registerService(DeviceIdentifierJsonHandler.class, new SmartphoneImeiJsonHandler(), getDict(SmartphoneImeiIdentifier.TYPE)));
-        
-        registrations.add(context.registerService(DeviceIdentifierMongoHandler.class, new PingDeviceIdentifierMongoHandler(), getDict(PingDeviceIdentifierImpl.TYPE)));
-        registrations.add(context.registerService(DeviceIdentifierJsonHandler.class, new PingDeviceIdentifierJsonHandler(), getDict(PingDeviceIdentifierImpl.TYPE)));
-        
-        registerGPSFixJsonService(context, new GPSFixJsonDeserializer(), new GPSFixJsonSerializer(), GPSFixJsonDeserializer.TYPE);
-        registerGPSFixJsonService(context, new GPSFixMovingJsonDeserializer(), new GPSFixMovingJsonSerializer(), GPSFixMovingJsonDeserializer.TYPE);
-        registerGPSFixJsonService(context, new GPSFixNmeaDTOJsonDeserializer(), new GPSFixNmeaDTOJsonSerializer(), GPSFixNmeaDTOJsonDeserializer.TYPE);
-        registerGPSFixJsonService(context, new GPSFixMovingNmeaDTOJsonDeserializer(), new GPSFixMovingNmeaDTOJsonSerializer(), GPSFixMovingNmeaDTOJsonDeserializer.TYPE);
-        
-        registrations.add(context.registerService(RaceLogTrackingAdapterFactory.class, RaceLogTrackingAdapterFactoryImpl.INSTANCE, null));
-        logger.log(Level.INFO, "Started "+context.getBundle().getSymbolicName());
-    }
-
-    @Override
-    public void stop(BundleContext context) throws Exception {
-        for (ServiceRegistration<?> reg : registrations) {
-            reg.unregister();
-        }
-        registrations.clear();
-    }
-}
+package com.sap.sailing.domain.racelogtracking.impl;
+
+import java.util.Dictionary;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
+
+import com.sap.sailing.domain.common.racelog.tracking.TypeBasedServiceFinder;
+import com.sap.sailing.domain.persistence.racelog.tracking.DeviceIdentifierMongoHandler;
+import com.sap.sailing.domain.racelog.tracking.DeviceIdentifierStringSerializationHandler;
+import com.sap.sailing.domain.racelog.tracking.SmartphoneImeiIdentifier;
+import com.sap.sailing.domain.racelogtracking.PingDeviceIdentifierImpl;
+import com.sap.sailing.domain.racelogtracking.RaceLogTrackingAdapterFactory;
+import com.sap.sailing.domain.tracking.GPSFix;
+import com.sap.sailing.server.gateway.deserialization.JsonDeserializer;
+import com.sap.sailing.server.gateway.deserialization.impl.GPSFixJsonDeserializer;
+import com.sap.sailing.server.gateway.deserialization.impl.GPSFixMovingJsonDeserializer;
+import com.sap.sailing.server.gateway.deserialization.impl.GPSFixMovingNmeaDTOJsonDeserializer;
+import com.sap.sailing.server.gateway.deserialization.impl.GPSFixNmeaDTOJsonDeserializer;
+import com.sap.sailing.server.gateway.serialization.JsonSerializer;
+import com.sap.sailing.server.gateway.serialization.impl.GPSFixJsonSerializer;
+import com.sap.sailing.server.gateway.serialization.impl.GPSFixMovingJsonSerializer;
+import com.sap.sailing.server.gateway.serialization.impl.GPSFixMovingNmeaDTOJsonSerializer;
+import com.sap.sailing.server.gateway.serialization.impl.GPSFixNmeaDTOJsonSerializer;
+import com.sap.sailing.server.gateway.serialization.racelog.tracking.DeviceIdentifierJsonHandler;
+import com.sap.sailing.server.gateway.serialization.racelog.tracking.GPSFixJsonHandler;
+import com.sap.sailing.server.gateway.serialization.racelog.tracking.impl.GPSFixJsonHandlerImpl;
+import com.sap.sailing.server.gateway.serialization.racelog.tracking.impl.SmartphoneImeiJsonHandler;
+
+public class Activator implements BundleActivator {
+	private static final Logger logger = Logger.getLogger(Activator.class.getName());
+	
+    private Set<ServiceRegistration<?>> registrations = new HashSet<>();
+
+    private Dictionary<String, String> getDict(String type) {
+        Dictionary<String, String> properties = new Hashtable<String, String>();
+        properties.put(TypeBasedServiceFinder.TYPE, type);
+        return properties;
+    }
+
+    private <T extends GPSFix> void registerGPSFixJsonService(BundleContext context, JsonDeserializer<T> deserializer,
+            JsonSerializer<T> serializer, String type) {
+        registrations.add(context.registerService(GPSFixJsonHandler.class,
+                new GPSFixJsonHandlerImpl<T>(deserializer, serializer), getDict(type)));
+    }
+    
+    @Override
+    public void start(BundleContext context) throws Exception {
+        registrations.add(context.registerService(DeviceIdentifierMongoHandler.class, new SmartphoneImeiMongoHandler(), getDict(SmartphoneImeiIdentifier.TYPE)));
+        registrations.add(context.registerService(DeviceIdentifierJsonHandler.class, new SmartphoneImeiJsonHandler(), getDict(SmartphoneImeiIdentifier.TYPE)));
+        registrations.add(context.registerService(DeviceIdentifierStringSerializationHandler.class, new SmartphoneImeiStringSerializationHandler(), getDict(SmartphoneImeiIdentifier.TYPE)));
+        
+        registrations.add(context.registerService(DeviceIdentifierMongoHandler.class, new PingDeviceIdentifierMongoHandler(), getDict(PingDeviceIdentifierImpl.TYPE)));
+        registrations.add(context.registerService(DeviceIdentifierJsonHandler.class, new PingDeviceIdentifierJsonHandler(), getDict(PingDeviceIdentifierImpl.TYPE)));
+        
+        registerGPSFixJsonService(context, new GPSFixJsonDeserializer(), new GPSFixJsonSerializer(), GPSFixJsonDeserializer.TYPE);
+        registerGPSFixJsonService(context, new GPSFixMovingJsonDeserializer(), new GPSFixMovingJsonSerializer(), GPSFixMovingJsonDeserializer.TYPE);
+        registerGPSFixJsonService(context, new GPSFixNmeaDTOJsonDeserializer(), new GPSFixNmeaDTOJsonSerializer(), GPSFixNmeaDTOJsonDeserializer.TYPE);
+        registerGPSFixJsonService(context, new GPSFixMovingNmeaDTOJsonDeserializer(), new GPSFixMovingNmeaDTOJsonSerializer(), GPSFixMovingNmeaDTOJsonDeserializer.TYPE);
+        
+        registrations.add(context.registerService(RaceLogTrackingAdapterFactory.class, RaceLogTrackingAdapterFactoryImpl.INSTANCE, null));
+        logger.log(Level.INFO, "Started "+context.getBundle().getSymbolicName());
+    }
+
+    @Override
+    public void stop(BundleContext context) throws Exception {
+        for (ServiceRegistration<?> reg : registrations) {
+            reg.unregister();
+        }
+        registrations.clear();
+    }
+}

java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/PingDeviceIdentifierJsonHandler.java

@@ -1,8 +1,16 @@
 package com.sap.sailing.domain.racelogtracking.impl;
 
+import com.sap.sailing.domain.common.racelog.tracking.TransformationException;
+import com.sap.sailing.domain.racelog.tracking.DeviceIdentifier;
 import com.sap.sailing.server.gateway.serialization.racelog.tracking.DeviceIdentifierJsonHandler;
 
 public class PingDeviceIdentifierJsonHandler extends PingDeviceIdentifierSerializationHandler 
 implements DeviceIdentifierJsonHandler {
 
+    @Override
+    public DeviceIdentifier deserialize(Object serialized, String type, String stringRepresentation)
+            throws TransformationException {
+        return deserialize((String) serialized, type, stringRepresentation);
+    }
+
 }

java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/PingDeviceIdentifierMongoHandler.java

@@ -1,8 +1,16 @@
 package com.sap.sailing.domain.racelogtracking.impl;
 
+import com.sap.sailing.domain.common.racelog.tracking.TransformationException;
 import com.sap.sailing.domain.persistence.racelog.tracking.DeviceIdentifierMongoHandler;
+import com.sap.sailing.domain.racelog.tracking.DeviceIdentifier;
 
 public class PingDeviceIdentifierMongoHandler extends PingDeviceIdentifierSerializationHandler
 implements DeviceIdentifierMongoHandler {
 
+    @Override
+    public DeviceIdentifier deserialize(Object serialized, String type, String stringRepresentation)
+            throws TransformationException {
+        return deserialize((String) serialized, type, stringRepresentation);
+    }
+
 }

java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/PingDeviceIdentifierSerializationHandler.java

@@ -5,24 +5,21 @@ import java.util.UUID;
 import com.sap.sailing.domain.common.impl.Util.Pair;
 import com.sap.sailing.domain.common.racelog.tracking.TransformationException;
 import com.sap.sailing.domain.racelog.tracking.DeviceIdentifier;
-import com.sap.sailing.domain.racelog.tracking.DeviceIdentifierSerializationHandler;
 import com.sap.sailing.domain.racelogtracking.PingDeviceIdentifier;
 import com.sap.sailing.domain.racelogtracking.PingDeviceIdentifierImpl;
 
-public class PingDeviceIdentifierSerializationHandler implements DeviceIdentifierSerializationHandler<Object> {
+public class PingDeviceIdentifierSerializationHandler {
     private PingDeviceIdentifier castIdentifier(DeviceIdentifier identifier) throws TransformationException {
         if (!(identifier instanceof PingDeviceIdentifier))
             throw new TransformationException("Expected a PingDeviceIdentifier, got instead: " + identifier);
         return (PingDeviceIdentifier) identifier;
     }
 
-    @Override
     public Pair<String, String> serialize(DeviceIdentifier deviceIdentifier) throws TransformationException {
         return new Pair<String, String>(castIdentifier(deviceIdentifier).getId().toString(), PingDeviceIdentifier.TYPE);
     }
 
-    @Override
-    public DeviceIdentifier deserialize(Object input, String type, String stringRep) {
-        return new PingDeviceIdentifierImpl(UUID.fromString((String) input));
+    public DeviceIdentifier deserialize(String input, String type, String stringRep) {
+        return new PingDeviceIdentifierImpl(UUID.fromString(input));
     }
 }

java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/PingDeviceIdentifierStringSerializationHandler.java

@@ -0,0 +1,8 @@
+package com.sap.sailing.domain.racelogtracking.impl;
+
+import com.sap.sailing.domain.racelog.tracking.DeviceIdentifierStringSerializationHandler;
+
+public class PingDeviceIdentifierStringSerializationHandler extends PingDeviceIdentifierSerializationHandler
+implements DeviceIdentifierStringSerializationHandler {
+
+}

java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/SmartphoneImeiMongoHandler.java

@@ -1,9 +1,17 @@
 package com.sap.sailing.domain.racelogtracking.impl;
 
+import com.sap.sailing.domain.common.racelog.tracking.TransformationException;
 import com.sap.sailing.domain.persistence.racelog.tracking.DeviceIdentifierMongoHandler;
+import com.sap.sailing.domain.racelog.tracking.DeviceIdentifier;
 import com.sap.sailing.domain.racelog.tracking.impl.SmartphoneImeiSerializationHandler;
 
 public class SmartphoneImeiMongoHandler extends SmartphoneImeiSerializationHandler
 implements DeviceIdentifierMongoHandler {
 
+    @Override
+    public DeviceIdentifier deserialize(Object serialized, String type, String stringRepresentation)
+            throws TransformationException {
+        return deserialize((String) serialized, type, stringRepresentation);
+    }
+    
 }

java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/SmartphoneImeiStringSerializationHandler.java

@@ -0,0 +1,9 @@
+package com.sap.sailing.domain.racelogtracking.impl;
+
+import com.sap.sailing.domain.racelog.tracking.DeviceIdentifierStringSerializationHandler;
+import com.sap.sailing.domain.racelog.tracking.impl.SmartphoneImeiSerializationHandler;
+
+public class SmartphoneImeiStringSerializationHandler extends SmartphoneImeiSerializationHandler
+implements DeviceIdentifierStringSerializationHandler {
+
+}