From 7323e186fcdbb40e30516d1857c35631b0255f73 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Sat, 7 Apr 2018 19:38:30 +0200 Subject: [PATCH] let gateway bundle require com.sap.sailing.server bundle to let Shiro find bearer token class Change-Id: I67c9c1ba2d94875d02753fbfa7b93dedaf6e3ebf --- .../META-INF/MANIFEST.MF | 6 +++--- .../impl/rc/CompetitorsAndBoatsJsonExportServlet.java | 4 ---- .../gateway/impl/rc/CourseJsonExportServlet.java | 11 ----------- 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF b/java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF index ff36d7653f6..76be8d7f770 100644 --- a/java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF @@ -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, diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/CompetitorsAndBoatsJsonExportServlet.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/CompetitorsAndBoatsJsonExportServlet.java index 83edf1d48ad..9b236d8e990 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/CompetitorsAndBoatsJsonExportServlet.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/CompetitorsAndBoatsJsonExportServlet.java @@ -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)); result.add(serializeCompetitorAndBoat); } - setJsonResponseHeader(response); result.writeJSONString(response.getWriter()); } diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/CourseJsonExportServlet.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/CourseJsonExportServlet.java index f0db237c5a2..1284fdf9ec4 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/CourseJsonExportServlet.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/CourseJsonExportServlet.java @@ -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()); }