eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-02 09:09:37 +00:00
Code Activity

removed all RaceLog methods from TrackedRace and TrackedRaceImpl and

Browse Source 
DynamicTrackedRace
changed TrackedRaceImpl constructor again, all calling methods are
changed appropriately
This commit is contained in:
Armin Zamani committed 2013-02-09 01:10:39 +01:00
1 parent 43ff1dc7fe
commit 7d6d72785e
47 files changed
+195 -461
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/AdminApp.java
+2 -26
View File
@@ -38,10 +38,7 @@ import com.sap.sailing.domain.common.impl.DegreePosition;
import com.sap.sailing.domain.common.impl.Util.Triple;
import com.sap.sailing.domain.common.impl.WindSourceImpl;
import com.sap.sailing.domain.persistence.MongoFactory;
import com.sap.sailing.domain.persistence.MongoRaceLogStoreFactory;
import com.sap.sailing.domain.persistence.MongoWindStoreFactory;
import com.sap.sailing.domain.racelog.RaceLogStore;
import com.sap.sailing.domain.racelog.impl.EmptyRaceLogStore;
import com.sap.sailing.domain.tracking.DynamicTrackedRace;
import com.sap.sailing.domain.tracking.TrackedRace;
import com.sap.sailing.domain.tracking.Wind;
@@ -122,8 +119,6 @@ public class AdminApp extends SailingServerHttpServlet {
private static final String STORE_MONGO = "mongo";
private static final String PARAM_NAME_RACELOGSTORE = "racelogstore";
public AdminApp() {
}
@@ -471,7 +466,7 @@ public class AdminApp extends SailingServerHttpServlet {
URL jsonURL = new URL(req.getParameter(PARAM_NAME_EVENT_JSON_URL));
URI liveURI = new URI(req.getParameter(PARAM_NAME_LIVE_URI));
URI storedURI = new URI(req.getParameter(PARAM_NAME_STORED_URI));
getService().addRegatta(jsonURL, liveURI, storedURI, getWindStore(req), /* timeoutInMilliseconds */ 60000, getRaceLogStore(req));
getService().addRegatta(jsonURL, liveURI, storedURI, getWindStore(req), /* timeoutInMilliseconds */ 60000);
}
private WindStore getWindStore(HttpServletRequest req) throws UnknownHostException, MongoException {
@@ -495,8 +490,7 @@ public class AdminApp extends SailingServerHttpServlet {
URL paramURL = new URL(req.getParameter(PARAM_NAME_PARAM_URL));
URI liveURI = new URI(req.getParameter(PARAM_NAME_LIVE_URI));
URI storedURI = new URI(req.getParameter(PARAM_NAME_STORED_URI));
getService().addTracTracRace(paramURL, liveURI, storedURI, getWindStore(req), /* timeoutInMilliseconds */ 60000,
getRaceLogStore(req));
getService().addTracTracRace(paramURL, liveURI, storedURI, getWindStore(req), /* timeoutInMilliseconds */ 60000);
}
private void stopRace(HttpServletRequest req, HttpServletResponse resp) throws MalformedURLException, IOException, InterruptedException {
@@ -512,22 +506,4 @@ public class AdminApp extends SailingServerHttpServlet {
resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Regatta not found");
}
}
private RaceLogStore getRaceLogStore(HttpServletRequest req) throws UnknownHostException, MongoException {
String raceCommitteStore = req.getParameter(PARAM_NAME_RACELOGSTORE);
if (raceCommitteStore != null) {
if (raceCommitteStore.equals(STORE_EMPTY)) {
return EmptyRaceLogStore.INSTANCE;
} else if (raceCommitteStore.equals(STORE_MONGO)) {
return MongoRaceLogStoreFactory.INSTANCE.getMongoRaceLogStore(
MongoFactory.INSTANCE.getDefaultMongoObjectFactory(),
MongoFactory.INSTANCE.getDefaultDomainObjectFactory());
} else {
log("Couldn't find race log store " + raceCommitteStore + ". Using EmptyRaceLogStore instead.");
return EmptyRaceLogStore.INSTANCE;
}
}
return EmptyRaceLogStore.INSTANCE;
}
}
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/ModifyRaceLogJsonExportServlet.java
+1 -1
View File
@@ -76,7 +76,7 @@ public class ModifyRaceLogJsonExportServlet extends JsonExportServlet {
return;
}
dynamicTrackedRace.recordRaceLogEvent(raceLogEvent);
//TODO dynamicTrackedRace.recordRaceLogEvent(raceLogEvent);
} catch (ParseException e) {
throw new JsonDeserializationException("Invalid JSON in request body.", e);
}