aftermath for commit 05d574d94d: registering DataMiningServer tracker again in servlet context

This commit is contained in:
Axel Uhl
2022-06-20 17:20:32 +02:00
parent 4468550c98
commit ead857666e
3 changed files with 9 additions and 1 deletions
@@ -9,6 +9,8 @@
<li>Bug fix: in the REST API's leaderboard-related end points the leaderboard object was not properly
used for premium permission checks. Therefore, a premium role qualified, e.g., with a user group
did not properly grant its permissions to requests.</li>
<li>Fixed a regression regarding the availability of <tt>/sailingserver/api/v1/regattas/{regatta-name}/datamining/...</tt>
requests; a refactoring attempt accidentally introduced this problem which has now been resolved.</li>
</ul>
<h5 class="articleSubheadline">May 2022</h5>
<ul class="bulletList">
@@ -52,7 +52,8 @@ Require-Bundle: com.sap.sailing.domain,
org.mongodb.driver-core;bundle-version="4.3.1",
org.mongodb.driver-sync;bundle-version="4.3.1",
com.sap.sailing.domain.racelogtrackingadapter,
com.sap.sailing.server.gateway.interfaces
com.sap.sailing.server.gateway.interfaces,
com.sap.sse.datamining
Bundle-ClassPath: .
Web-ContextPath: /sharedsailingserver
Automatic-Module-Name: com.sap.sailing.shared.server.gateway
@@ -9,6 +9,7 @@ import org.osgi.util.tracker.ServiceTracker;
import com.sap.sailing.server.gateway.interfaces.SailingServerFactory;
import com.sap.sailing.server.interfaces.RacingEventService;
import com.sap.sailing.shared.server.SharedSailingData;
import com.sap.sse.datamining.DataMiningServer;
import com.sap.sse.replication.ReplicationService;
import com.sap.sse.security.SecurityService;
import com.sap.sse.util.ServiceTrackerFactory;
@@ -41,6 +42,8 @@ public class RestServletContainer extends ServletContainer {
private ServiceTracker<SailingServerFactory, SailingServerFactory> sailingServerFactoryTracker;
private ServiceTracker<DataMiningServer, DataMiningServer> dataMiningServerTracker;
public RestServletContainer() {
super();
}
@@ -62,10 +65,12 @@ public class RestServletContainer extends ServletContainer {
replicationServiceTracker = ServiceTrackerFactory.createAndOpen(context, ReplicationService.class);
securityServiceTracker = ServiceTrackerFactory.createAndOpen(context, SecurityService.class);
sailingServerFactoryTracker = ServiceTrackerFactory.createAndOpen(context, SailingServerFactory.class);
dataMiningServerTracker = ServiceTrackerFactory.createAndOpen(context, DataMiningServer.class);
config.getServletContext().setAttribute(RACING_EVENT_SERVICE_TRACKER_NAME, racingEventServiceTracker);
config.getServletContext().setAttribute(SHARED_SAILING_DATA_TRACKER_NAME, sharedSailingDataTracker);
config.getServletContext().setAttribute(REPLICATION_SERVICE_TRACKER_NAME, replicationServiceTracker);
config.getServletContext().setAttribute(SECURITY_SERVICE_TRACKER_NAME, securityServiceTracker);
config.getServletContext().setAttribute(SAILING_SERVER_FACTORY_TRACKER_NAME, sailingServerFactoryTracker);
config.getServletContext().setAttribute(DATA_MINING_SERVER_TRACKER_NAME, dataMiningServerTracker);
}
}