Removed the polar data service from HasLeaderboardContext

This commit is contained in:
Lennart Hensler committed 2018-07-26 17:59:39 +02:00
1 parent 4e9744f196
commit e2a67a178e
5 files changed
+4 -15

No files matched your search

@@ -2,7 +2,6 @@ package com.sap.sailing.datamining.data;
import com.sap.sailing.domain.base.BoatClass;
import com.sap.sailing.domain.leaderboard.Leaderboard;
import com.sap.sailing.domain.polars.PolarDataService;
import com.sap.sse.datamining.annotations.Connector;
import com.sap.sse.datamining.annotations.Dimension;
@@ -12,8 +11,6 @@ public interface HasLeaderboardContext {
Leaderboard getLeaderboard();
PolarDataService getPolarDataService();
@Dimension(messageKey="Leaderboard", ordinal=1)
String getName();
@@ -26,7 +26,7 @@ public class CompetitorOfRaceInLeaderboardRetrievalProcessor extends
for (RaceColumn raceColumn : element.getLeaderboard().getRaceColumns()) {
for (Competitor competitor : element.getLeaderboard().getCompetitors()) {
HasRaceResultOfCompetitorContext raceResultOfCompetitorContext = new RaceResultOfCompetitorWithContext(element, raceColumn, competitor,
element.getPolarDataService());
element.getLeaderboardGroupContext().getPolarDataService());
raceResultsOfCompetitor.add(raceResultOfCompetitorContext);
}
}
@@ -48,7 +48,7 @@ public class CompleteManeuverCurveWithEstimationDataRetrievalProcessor extends
Competitor competitor = element.getCompetitor();
ManeuverDetectorWithEstimationDataSupport maneuverDetector = new ManeuverDetectorWithEstimationDataSupportDecoratorImpl(
new ManeuverDetectorImpl(trackedRace, competitor),
element.getTrackedRaceContext().getLeaderboardContext().getPolarDataService());
element.getTrackedRaceContext().getLeaderboardContext().getLeaderboardGroupContext().getPolarDataService());
Iterable<Maneuver> maneuvers = trackedRace.getManeuvers(competitor, false);
Iterable<CompleteManeuverCurve> maneuverCurves = maneuverDetector.getCompleteManeuverCurves(maneuvers);
Iterable<CompleteManeuverCurveWithEstimationData> maneuversWithEstimationData = maneuverDetector
@@ -22,7 +22,7 @@ public class LeaderboardRetrievalProcessor extends AbstractRetrievalProcessor<Ha
protected Iterable<HasLeaderboardContext> retrieveData(HasLeaderboardGroupContext element) {
Collection<HasLeaderboardContext> leaderboardsWithContext = new ArrayList<>();
for (Leaderboard leaderboard : element.getLeaderboardGroup().getLeaderboards()) {
leaderboardsWithContext.add(new LeaderboardWithContext(leaderboard, element, element.getPolarDataService()));
leaderboardsWithContext.add(new LeaderboardWithContext(leaderboard, element));
}
return leaderboardsWithContext;
}
@@ -4,17 +4,14 @@ import com.sap.sailing.datamining.data.HasLeaderboardContext;
import com.sap.sailing.datamining.data.HasLeaderboardGroupContext;
import com.sap.sailing.domain.base.BoatClass;
import com.sap.sailing.domain.leaderboard.Leaderboard;
import com.sap.sailing.domain.polars.PolarDataService;
public class LeaderboardWithContext implements HasLeaderboardContext {
private final Leaderboard leaderboard;
private final HasLeaderboardGroupContext leaderboardGroupContext;
private final PolarDataService polarDataService;
public LeaderboardWithContext(Leaderboard leaderboard, HasLeaderboardGroupContext leaderboardGroupContext, PolarDataService polarDataService) {
public LeaderboardWithContext(Leaderboard leaderboard, HasLeaderboardGroupContext leaderboardGroupContext) {
this.leaderboard = leaderboard;
this.leaderboardGroupContext = leaderboardGroupContext;
this.polarDataService = polarDataService;
}
public HasLeaderboardGroupContext getLeaderboardGroupContext() {
@@ -31,11 +28,6 @@ public class LeaderboardWithContext implements HasLeaderboardContext {
return getLeaderboard().getBoatClass();
}
@Override
public PolarDataService getPolarDataService() {
return polarDataService;
}
@Override
public String getName() {
return getLeaderboard().getName();