From ebf4cc5fed325ab3e52bf5be6a8ccbf3b65b92a3 Mon Sep 17 00:00:00 2001 From: Fredrik Teschke Date: Sun, 16 Nov 2014 20:10:50 +0100 Subject: [PATCH] remove gpsfixes servlet from racelogtrackingadapter --- .../test/impl/RecordFixesTest.java | 64 ----------------- .../META-INF/MANIFEST.MF | 4 +- .../WEB-INF/web.xml | 37 ---------- .../RecordFixesFlatJsonPostServlet.java | 51 -------------- .../servlet/RecordFixesPostServlet.java | 70 ------------------- 5 files changed, 1 insertion(+), 225 deletions(-) delete mode 100644 java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/RecordFixesTest.java delete mode 100644 java/com.sap.sailing.domain.racelogtrackingadapter/WEB-INF/web.xml delete mode 100644 java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/servlet/RecordFixesFlatJsonPostServlet.java delete mode 100755 java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/servlet/RecordFixesPostServlet.java diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/RecordFixesTest.java b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/RecordFixesTest.java deleted file mode 100644 index ee723302e75..00000000000 --- a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/RecordFixesTest.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.sap.sailing.domain.racelogtracking.test.impl; - -import static com.sap.sse.common.Util.size; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertTrue; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.when; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -import org.junit.Before; -import org.junit.Test; - -import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.common.racelog.tracking.NoCorrespondingServiceRegisteredException; -import com.sap.sailing.domain.common.racelog.tracking.TransformationException; -import com.sap.sailing.domain.racelog.tracking.DeviceIdentifier; -import com.sap.sailing.domain.racelog.tracking.test.mock.MockDeviceAndSessioinIdentifierWithGPSFixesDeserializer; -import com.sap.sailing.domain.racelog.tracking.test.mock.SmartphoneImeiIdentifier; -import com.sap.sailing.domain.racelogtracking.servlet.RecordFixesPostServlet; -import com.sap.sailing.domain.racelogtracking.test.AbstractGPSFixStoreTest; -import com.sap.sailing.domain.tracking.GPSFix; -import com.sap.sailing.domain.tracking.GPSFixMoving; -import com.sap.sailing.domain.tracking.impl.DynamicGPSFixMovingTrackImpl; -import com.sap.sailing.server.gateway.deserialization.impl.DeviceAndSessionIdentifierWithGPSFixesDeserializer; -import com.sap.sse.common.Util; - -public class RecordFixesTest extends AbstractGPSFixStoreTest { - private RecordFixesPostServlet servlet; - private final DeviceAndSessionIdentifierWithGPSFixesDeserializer deserializer = - new MockDeviceAndSessioinIdentifierWithGPSFixesDeserializer(); - private final DeviceIdentifier device = new SmartphoneImeiIdentifier("a"); - - @Before - public void setupServlet() { - servlet = new RecordFixesPostServlet(); - servlet = spy(servlet); - when(servlet.getRequestDeserializer()).thenReturn(deserializer); - doReturn(service).when(servlet).getService(); - } - - @Test - public void areFixesStoredInDb() throws TransformationException, NoCorrespondingServiceRegisteredException { - map(comp, device, 0, 600); - - int timepoint = 343; - List fixes = new ArrayList<>(); - fixes.add(createFix(timepoint, 0, 0, 0, 0)); - fixes.add(createFix(timepoint+1, 0, 0, 0, 0)); - Util.Triple> data = new Util.Triple<>(device, null, fixes); - servlet.process(null, data); - - DynamicGPSFixMovingTrackImpl track = new DynamicGPSFixMovingTrackImpl<>(comp, 0); - store.loadCompetitorTrack(track, raceLog, comp); - track.lockForRead(); - assertEquals(2, size(track.getRawFixes())); - assertEquals(timepoint, track.getFirstRawFix().getTimePoint().asMillis()); - assertTrue(track.getFirstRawFix() instanceof GPSFixMoving); - track.unlockAfterRead(); - } -} diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.racelogtrackingadapter/META-INF/MANIFEST.MF index 8f4cf27d35e..0d46e725365 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.domain.racelogtrackingadapter/META-INF/MANIFEST.MF @@ -22,7 +22,5 @@ Import-Package: com.mongodb, org.json.simple.parser, org.osgi.framework;version="1.6.0" Export-Package: com.sap.sailing.domain.racelogtracking, - com.sap.sailing.domain.racelogtracking.impl;x-friends:="com.sap.sailing.domain.racelogtrackingadapter.testsupport,com.sap.sailing.gwt.ui.test", - com.sap.sailing.domain.racelogtracking.servlet;x-friends:="com.sap.sailing.domain.racelogtrackingadapter.test" -Web-ContextPath: /tracking + com.sap.sailing.domain.racelogtracking.impl;x-friends:="com.sap.sailing.domain.racelogtrackingadapter.testsupport,com.sap.sailing.gwt.ui.test" Bundle-Activator: com.sap.sailing.domain.racelogtracking.impl.Activator diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter/WEB-INF/web.xml b/java/com.sap.sailing.domain.racelogtrackingadapter/WEB-INF/web.xml deleted file mode 100644 index d592b424ad2..00000000000 --- a/java/com.sap.sailing.domain.racelogtrackingadapter/WEB-INF/web.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - default - org.eclipse.jetty.servlet.DefaultServlet - - - dirAllowed - false - - - - - RecordFixesPostServlet - com.sap.sailing.domain.racelogtracking.servlet.RecordFixesPostServlet - - - RecordFixesPostServlet - /recordFixes - - - - RecordFixesFlatJsonPostServlet - com.sap.sailing.domain.racelogtracking.servlet.RecordFixesFlatJsonPostServlet - - - RecordFixesFlatJsonPostServlet - /recordFixesFlatJson - - - diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/servlet/RecordFixesFlatJsonPostServlet.java b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/servlet/RecordFixesFlatJsonPostServlet.java deleted file mode 100644 index acfebbfe227..00000000000 --- a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/servlet/RecordFixesFlatJsonPostServlet.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.sap.sailing.domain.racelogtracking.servlet; - -import java.util.Map; -import java.util.UUID; -import java.util.logging.Level; - -import com.sap.sailing.domain.common.racelog.tracking.NoCorrespondingServiceRegisteredException; -import com.sap.sailing.domain.common.racelog.tracking.TransformationException; -import com.sap.sailing.domain.racelog.tracking.DeviceIdentifier; -import com.sap.sailing.domain.racelog.tracking.impl.SmartphoneUUIDIdentifierImpl; -import com.sap.sailing.domain.tracking.GPSFixMoving; -import com.sap.sailing.server.gateway.AbstractJsonPostServlet; -import com.sap.sailing.server.gateway.HttpExceptionWithMessage; -import com.sap.sailing.server.gateway.deserialization.JsonDeserializer; -import com.sap.sailing.server.gateway.deserialization.impl.FlatSmartphoneUuidAndGPSFixMovingJsonDeserializer; -import com.sap.sailing.server.gateway.serialization.JsonSerializer; -import com.sap.sse.common.Util.Pair; - -public class RecordFixesFlatJsonPostServlet extends AbstractJsonPostServlet, Void> { - private static final long serialVersionUID = -4618399862031700634L; - - private final JsonDeserializer> deserializer = - new FlatSmartphoneUuidAndGPSFixMovingJsonDeserializer(); - - @Override - public JsonDeserializer> getRequestDeserializer() { - return deserializer; - } - - @Override - public JsonSerializer getResponseSerializer() { - return null; - } - - @Override - public Void process(Map parameterValues, Pair domainObject) - throws HttpExceptionWithMessage { - DeviceIdentifier device = new SmartphoneUUIDIdentifierImpl(domainObject.getA()); - GPSFixMoving fix = domainObject.getB(); - - try { - getService().getGPSFixStore().storeFix(device, fix); - logger.log(Level.INFO, "Added fix for device " + device.toString() + " to store"); - } catch (TransformationException | NoCorrespondingServiceRegisteredException e) { - logger.log(Level.WARNING, "Could not load store fix from device " + device); - } - - return null; - } - -} diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/servlet/RecordFixesPostServlet.java b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/servlet/RecordFixesPostServlet.java deleted file mode 100755 index ea666d68a2a..00000000000 --- a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/servlet/RecordFixesPostServlet.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.sap.sailing.domain.racelogtracking.servlet; - -import java.io.Serializable; -import java.util.List; -import java.util.Map; -import java.util.logging.Level; - -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; - -import com.sap.sailing.domain.common.racelog.tracking.NoCorrespondingServiceRegisteredException; -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; -import com.sap.sailing.domain.tracking.GPSFix; -import com.sap.sailing.server.gateway.AbstractJsonPostServlet; -import com.sap.sailing.server.gateway.HttpExceptionWithMessage; -import com.sap.sailing.server.gateway.deserialization.JsonDeserializer; -import com.sap.sailing.server.gateway.deserialization.impl.DeviceAndSessionIdentifierWithGPSFixesDeserializer; -import com.sap.sailing.server.gateway.deserialization.impl.DeviceIdentifierJsonDeserializer; -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.GPSFixJsonHandler; -import com.sap.sse.common.Util; - -public class RecordFixesPostServlet extends - AbstractJsonPostServlet>, Void> { - private static final long serialVersionUID = 2778739335260621119L; - private DeviceAndSessionIdentifierWithGPSFixesDeserializer deserializer; - - @Override - public void init(ServletConfig config) throws ServletException { - super.init(config); - TypeBasedServiceFinder fixServiceFinder = getServiceFinderFactory().createServiceFinder( - GPSFixJsonHandler.class); - TypeBasedServiceFinder deviceServiceFinder = getServiceFinderFactory() - .createServiceFinder(DeviceIdentifierJsonHandler.class); - deserializer = new DeviceAndSessionIdentifierWithGPSFixesDeserializer(fixServiceFinder, - new DeviceIdentifierJsonDeserializer(deviceServiceFinder)); - } - - @Override - public JsonDeserializer>> getRequestDeserializer() { - return deserializer; - } - - @Override - public JsonSerializer getResponseSerializer() { - return null; - } - - @Override - public Void process(Map parameterValues, - Util.Triple> domainObject) throws HttpExceptionWithMessage { - DeviceIdentifier device = domainObject.getA(); - // might use the session id in the future - // Serializable sessionId = domainObject.getB(); - List fixes = domainObject.getC(); - - for (GPSFix fix : fixes) { - try { - getService().getGPSFixStore().storeFix(device, fix); - } catch (TransformationException | NoCorrespondingServiceRegisteredException e) { - logger.log(Level.WARNING, "Could not load store fix from device " + device); - } - } - - return null; - } -}