Removed unneeded GPSFixStore usage

This commit is contained in:
Papick Garcia Taboada committed 2016-06-09 18:35:16 +02:00
1 parent affa598f1a
commit 9416f5deed
42 files changed
+130 -186

No files matched your search

@@ -16,7 +16,6 @@ import org.json.simple.JSONObject;
import org.json.simple.JSONValue;
import org.json.simple.parser.ParseException;
import com.sap.sailing.domain.common.racelog.tracking.TransformationException;
import com.sap.sailing.domain.common.tracking.GPSFixMoving;
import com.sap.sailing.domain.racelogtracking.DeviceIdentifier;
import com.sap.sailing.domain.racelogtracking.impl.SmartphoneUUIDIdentifierImpl;
@@ -54,10 +53,10 @@ public class GPSFixesResource extends AbstractSailingServerResource {
try {
for (GPSFixMoving fix : fixes) {
getService().getGPSFixStore().storeFix(device, fix);
getService().getSensorFixStore().storeFix(device, fix);
}
logger.log(Level.INFO, "Added " + fixes.size() + " fixes for device " + device.toString() + " to store");
} catch (TransformationException | NoCorrespondingServiceRegisteredException e) {
} catch (NoCorrespondingServiceRegisteredException e) {
logger.log(Level.WARNING, "Could not store fix for device " + device);
}
@@ -87,7 +87,8 @@ public class MasterDataResource extends AbstractSailingServerResource {
}
final TopLevelMasterData masterData = new TopLevelMasterData(groupsToExport,
getService().getAllEvents(), getService().getPersistentRegattasForRaceIDs(), getService()
.getAllMediaTracks(), getService().getGPSFixStore(), exportWind, deviceConfigurations);
.getAllMediaTracks(),
getService().getSensorFixStore(), exportWind, deviceConfigurations);
final StreamingOutput streamingOutput;
if (compress) {
streamingOutput= new CompressingStreamingOutput(masterData, competitorIds, startTime);
@@ -23,7 +23,6 @@ import org.osgi.framework.Filter;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
import com.sap.sailing.domain.common.racelog.tracking.TransformationException;
import com.sap.sailing.domain.common.tracking.GPSFix;
import com.sap.sailing.domain.racelogtracking.DeviceIdentifier;
import com.sap.sailing.domain.trackfiles.TrackFileImportDeviceIdentifier;
@@ -61,8 +60,8 @@ public class TrackFilesImportServlet extends AbstractFileUploadServlet {
public void storeFix(GPSFix fix, DeviceIdentifier deviceIdentifier) {
try {
getService().getGPSFixStore().storeFix(deviceIdentifier, fix);
} catch (TransformationException | NoCorrespondingServiceRegisteredException e) {
getService().getSensorFixStore().storeFix(deviceIdentifier, fix);
} catch (NoCorrespondingServiceRegisteredException e) {
logger.log(Level.WARNING, "Could not store fix for " + deviceIdentifier);
}
}