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

let gateway bundle require com.sap.sailing.server bundle to let Shiro find bearer token class

Browse Source 
Change-Id: I67c9c1ba2d94875d02753fbfa7b93dedaf6e3ebf
This commit is contained in:
Axel Uhl committed 2018-04-07 19:38:30 +02:00
1 parent d387b35201
commit 7323e186fc
3 files changed
+3 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF
+3 -3
View File
@@ -5,8 +5,7 @@ Bundle-SymbolicName: com.sap.sailing.server.gateway
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: SAP
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: com.sap.sailing.server,
com.sap.sailing.server.operationaltransformation,
Import-Package: com.sap.sailing.server.operationaltransformation,
javax.ws.rs;version="1.1.1",
javax.ws.rs.core;version="1.1.1",
javax.ws.rs.ext;version="1.1.1",
@@ -15,7 +14,8 @@ Import-Package: com.sap.sailing.server,
org.json.simple.parser,
org.osgi.framework;version="1.3.0",
org.osgi.util.tracker;version="1.3.1"
Require-Bundle: com.sap.sailing.domain,
Require-Bundle: com.sap.sailing.server,
com.sap.sailing.domain,
com.sap.sailing.expeditionconnector,
com.sap.sailing.declination,
com.sap.sailing.domain.tractracadapter,
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/CompetitorsAndBoatsJsonExportServlet.java
-4
View File
@@ -59,17 +59,13 @@ public class CompetitorsAndBoatsJsonExportServlet extends AbstractJsonHttpServle
response.sendError(HttpServletResponse.SC_NOT_FOUND, "No such fleet found.");
return;
}
CompetitorAndBoatJsonSerializer competitorsAndBoatsSerializer = CompetitorAndBoatJsonSerializer.create();
JSONArray result = new JSONArray();
for (Competitor competitor : leaderboard.getCompetitors(raceColumn, fleet)) {
Boat boat = leaderboard.getBoatOfCompetitor(competitor, raceColumn, fleet);
JSONObject serializeCompetitorAndBoat = competitorsAndBoatsSerializer.serialize(new Pair<Competitor, Boat>(competitor, boat));
result.add(serializeCompetitorAndBoat);
}
setJsonResponseHeader(response);
result.writeJSONString(response.getWriter());
}
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/CourseJsonExportServlet.java
-11
View File
@@ -28,52 +28,42 @@ public class CourseJsonExportServlet extends AbstractJsonHttpServlet {
@Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
String leaderboardName = request.getParameter(RaceLogServletConstants.PARAMS_LEADERBOARD_NAME);
if (leaderboardName == null) {
response.sendError(HttpServletResponse.SC_BAD_REQUEST,
String.format("Missing parameter '%s'.", RaceLogServletConstants.PARAMS_LEADERBOARD_NAME));
return;
}
String raceColumnName = request.getParameter(RaceLogServletConstants.PARAMS_RACE_COLUMN_NAME);
if (raceColumnName == null) {
response.sendError(HttpServletResponse.SC_BAD_REQUEST,
String.format("Missing parameter '%s'.", RaceLogServletConstants.PARAMS_RACE_COLUMN_NAME));
return;
}
String fleetName = request.getParameter(RaceLogServletConstants.PARAMS_RACE_FLEET_NAME);
if (fleetName == null) {
response.sendError(HttpServletResponse.SC_BAD_REQUEST,
String.format("Missing parameter '%s'.", RaceLogServletConstants.PARAMS_RACE_FLEET_NAME));
return;
}
RacingEventService service = getService();
Leaderboard leaderboard = service.getLeaderboardByName(leaderboardName);
if (leaderboard == null) {
response.sendError(HttpServletResponse.SC_NOT_FOUND, "No such leaderboard found.");
return;
}
RaceColumn raceColumn = leaderboard.getRaceColumnByName(raceColumnName);
if (raceColumn == null) {
response.sendError(HttpServletResponse.SC_NOT_FOUND, "No such race column found.");
return;
}
Fleet fleet = raceColumn.getFleetByName(fleetName);
if (fleet == null) {
response.sendError(HttpServletResponse.SC_NOT_FOUND, "No such fleet found.");
return;
}
TrackedRace trackedRace = raceColumn.getTrackedRace(fleet);
JSONObject result;
if (trackedRace != null) {
Course course = raceColumn.getRaceDefinition(fleet).getCourse();
CourseBaseJsonSerializer serializer = new CourseBaseJsonSerializer(
@@ -86,7 +76,6 @@ public class CourseJsonExportServlet extends AbstractJsonHttpServlet {
} else {
result = new JSONObject();
}
setJsonResponseHeader(response);
result.writeJSONString(response.getWriter());
}