eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-21 21:25:38 +00:00
Code Activity

bug5867/bug5866: made center/radius final fields in CourseArea

Browse Source
This commit is contained in:
Axel Uhl
2023-08-02 15:57:58 +02:00
parent 24a6b159ee
commit 8d3c5c81d1
49 changed files with 142 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.server.test/src/com/sap/sailing/server/impl/MediaMasterDataExportTest.java
+1 -1
View File
@@ -57,7 +57,7 @@ public class MediaMasterDataExportTest {
private static final ThresholdBasedResultDiscardingRule resultDiscardingRule = new ThresholdBasedResultDiscardingRuleImpl(new int[0]);
private static final boolean isMedal = false;
private static final ScoringScheme scoringScheme = new LowPoint();
private static final CourseArea courseArea = new CourseAreaImpl("Course Area", UUID.randomUUID());
private static final CourseArea courseArea = new CourseAreaImpl("Course Area", UUID.randomUUID(), /* centerPosition */ null, /* radius */ null);
@Test
public void testTrackWithAssignedRaceButEmptyLeaderboardGroup() {
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/AutomaticRetrackUponCompetitorSetChangeTest.java
+1 -1
View File
@@ -132,7 +132,7 @@ public class AutomaticRetrackUponCompetitorSetChangeTest {
/* start with no series */ Collections.emptySet(),
/* persistent */ true, new LowPoint(),
/* defaultCourseAreaId */ service.getBaseDomainFactory()
.getOrCreateCourseArea(UUID.randomUUID(), "Course Area").getId(),
.getOrCreateCourseArea(UUID.randomUUID(), "Course Area", /* centerPosition */ null, /* radius */ null).getId(),
/* buoyZoneRadiusInHullLengths */ 2., /* useStartTimeInference */ false, /* controlTrackingFromStartAndFinishTimes */ false,
/* autoRestartTrackingUponCompetitorSetChange */ true, /* rankingMetricConstructor */ OneDesignRankingMetric::new);
regattaIdentifier = new RegattaName(regatta.getName());
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/LeaderboardStorageTest.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class LeaderboardStorageTest extends TestCase {
RacingEventService service = new RacingEventServiceImpl();
int[] dicardingThresholds = {};
Leaderboard leaderboard = service.addFlexibleLeaderboard(LEADERBOARD_NAME, "testIt", dicardingThresholds,
new LowPoint(), Collections.singleton(service.getBaseDomainFactory().getOrCreateCourseArea(UUID.randomUUID(), "maaap").getId()));
new LowPoint(), Collections.singleton(service.getBaseDomainFactory().getOrCreateCourseArea(UUID.randomUUID(), "maaap", /* centerPosition */ null, /* radius */ null).getId()));
List<DynamicPerson> sailorList = new ArrayList<DynamicPerson>();
sailorList.add(new PersonImpl("sailor", new NationalityImpl("GER"), null, ""));
DynamicTeam team = new TeamImpl("team", sailorList, null);
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/LeaderboardWithEliminationTransitiveRemovalTest.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class LeaderboardWithEliminationTransitiveRemovalTest {
/* competitorRegistrationType */ CompetitorRegistrationType.CLOSED, /* registrationLinkSecret */ null,
/* startDate */ null, /* endDate */ null, /* id */ UUID.randomUUID(),
regattaStructure, /* persistent */ true, new LowPoint(),
/* courseAreaIds */ Collections.singleton(server.getBaseDomainFactory().getOrCreateCourseArea(UUID.randomUUID(), "Default").getId()),
/* courseAreaIds */ Collections.singleton(server.getBaseDomainFactory().getOrCreateCourseArea(UUID.randomUUID(), "Default", /* centerPosition */ null, /* radius */ null).getId()),
/* buoyZoneRadiusInHullLengths */ null, /* useStartTimeInference */ false,
/* controlTrackingFromStartAndFinishTimes */ true, /* autoRestartTrackingUponCompetitorSetChange */ false,
RankingMetrics.ONE_DESIGN));
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/LeagueEventHierarchyOwnershipChangeTest.java
+2 -2
View File
@@ -70,7 +70,7 @@ public class LeagueEventHierarchyOwnershipChangeTest {
public void setUp() throws Exception {
event = service.addEvent("Test", "Test Event", TimePoint.now(), TimePoint.now().plus(Duration.ONE_WEEK), "Here",
/* isPublic */ true, UUID.randomUUID());
defaultCourseArea = new CourseAreaImpl("Default", UUID.randomUUID());
defaultCourseArea = new CourseAreaImpl("Default", UUID.randomUUID(), /* centerPosition */ null, /* radius */ null);
event.getVenue().addCourseArea(defaultCourseArea);
leaderboardGroup = new LeaderboardGroupImpl("LG", "LGDesc", "The LG", /* displayGroupsInReverseOrder */ false,
Collections.emptyList());
@@ -112,7 +112,7 @@ public class LeagueEventHierarchyOwnershipChangeTest {
new ThresholdBasedResultDiscardingRuleImpl(new int[0]));
leaderboardGroup2.setOverallLeaderboard(overallLeaderboard2);
leaderboardGroup2.addLeaderboard(new FlexibleLeaderboardImpl("FlexibleLeaderboard",
new ThresholdBasedResultDiscardingRuleImpl(new int[0]), new LowPoint(), new CourseAreaImpl("CA", UUID.randomUUID())));
new ThresholdBasedResultDiscardingRuleImpl(new int[0]), new LowPoint(), new CourseAreaImpl("CA", UUID.randomUUID(), /* centerPosition */ null, /* radius */ null)));
event.addLeaderboardGroup(leaderboardGroup2);
SailingHierarchyOwnershipUpdater.createOwnershipUpdater(/* createNewGroup */ true , /* existingGroupIdOrNull */ null,
THE_NEW_OWNING_GROUP_NAME,
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
+11 -11
View File
@@ -270,7 +270,7 @@ public class MasterDataImportTest {
Event event = sourceService.addEvent(TEST_EVENT_NAME, /* eventDescription */null, eventStartDate, eventEndDate,
"testVenue", false, eventUUID);
UUID courseAreaUUID = UUID.randomUUID();
CourseArea courseArea = sourceService.getBaseDomainFactory().getOrCreateCourseArea(courseAreaUUID, "testArea");
CourseArea courseArea = sourceService.getBaseDomainFactory().getOrCreateCourseArea(courseAreaUUID, "testArea", /* centerPosition */ null, /* radius */ null);
event.getVenue().addCourseArea(courseArea);
List<String> raceColumnNames = new ArrayList<>();
String raceColumnName = "T1";
@@ -555,7 +555,7 @@ public class MasterDataImportTest {
Event event = sourceService.addEvent(TEST_EVENT_NAME, /* eventDescription */null, eventStartDate, eventEndDate,
"testVenue", false, eventUUID);
final UUID courseAreaUUID = UUID.randomUUID();
final CourseArea courseArea = sourceService.getBaseDomainFactory().getOrCreateCourseArea(courseAreaUUID, "testArea");
final CourseArea courseArea = sourceService.getBaseDomainFactory().getOrCreateCourseArea(courseAreaUUID, "testArea", /* centerPosition */ null, /* radius */ null);
event.getVenue().addCourseArea(courseArea);
List<String> raceColumnNames = new ArrayList<>();
String raceColumnName = "T1";
@@ -735,7 +735,7 @@ public class MasterDataImportTest {
Event event = sourceService.addEvent(TEST_EVENT_NAME, /* eventDescription */null, eventStartDate, eventEndDate,
"testVenue", false, eventUUID);
UUID courseAreaUUID = UUID.randomUUID();
CourseArea courseArea = sourceService.getBaseDomainFactory().getOrCreateCourseArea(courseAreaUUID, "testArea");
CourseArea courseArea = sourceService.getBaseDomainFactory().getOrCreateCourseArea(courseAreaUUID, "testArea", /* centerPosition */ null, /* radius */ null);
event.getVenue().addCourseArea(courseArea);
List<String> raceColumnNames = new ArrayList<>();
String raceColumnName = "T1";
@@ -882,7 +882,7 @@ public class MasterDataImportTest {
InterruptedException, ClassNotFoundException {
Event event = sourceService.addEvent(TEST_EVENT_NAME, /* eventDescription */null, eventStartDate, eventEndDate,
"testVenue", false, eventUUID);
final CourseArea courseArea = sourceService.getBaseDomainFactory().getOrCreateCourseArea(UUID.randomUUID(), "testArea");
final CourseArea courseArea = sourceService.getBaseDomainFactory().getOrCreateCourseArea(UUID.randomUUID(), "testArea", /* centerPosition */ null, /* radius */ null);
event.getVenue().addCourseArea(courseArea);
List<String> raceColumnNames = new ArrayList<>();
String raceColumnName = "T1";
@@ -1027,7 +1027,7 @@ public class MasterDataImportTest {
Event event = sourceService.addEvent(TEST_EVENT_NAME, /* eventDescription */null, eventStartDate, eventEndDate,
"testVenue", false, eventUUID);
final UUID courseAreaUUID = UUID.randomUUID();
final CourseArea courseArea = sourceService.getBaseDomainFactory().getOrCreateCourseArea(courseAreaUUID, "testArea");
final CourseArea courseArea = sourceService.getBaseDomainFactory().getOrCreateCourseArea(courseAreaUUID, "testArea", /* centerPosition */ null, /* radius */ null);
event.getVenue().addCourseArea(courseArea);
List<String> raceColumnNames = new ArrayList<>();
String raceColumnName = "T1";
@@ -1128,7 +1128,7 @@ public class MasterDataImportTest {
venueNameNotToOverride = "doNotOverride";
Event eventNotToOverride = destService.addEvent(TEST_EVENT_NAME, /* eventDescription */null,
eventStartDate, eventEndDate, venueNameNotToOverride, false, eventUUID);
courseAreaNotToOverride = destService.getBaseDomainFactory().getOrCreateCourseArea(courseAreaUUID, "testAreaNotToOverride");
courseAreaNotToOverride = destService.getBaseDomainFactory().getOrCreateCourseArea(courseAreaUUID, "testAreaNotToOverride", /* centerPosition */ null, /* radius */ null);
eventNotToOverride.getVenue().addCourseArea(courseAreaNotToOverride);
List<String> raceColumnNamesNotToOverride = new ArrayList<>();
raceColumnNameNotToOveride = "T1nottooverride";
@@ -1209,7 +1209,7 @@ public class MasterDataImportTest {
InterruptedException, ClassNotFoundException {
Event event = sourceService.addEvent(TEST_EVENT_NAME, /* eventDescription */null, eventStartDate, eventEndDate, "testVenue", false, eventUUID);
final UUID courseAreaUUID = UUID.randomUUID();
final CourseArea courseArea = sourceService.getBaseDomainFactory().getOrCreateCourseArea(courseAreaUUID, "testArea");
final CourseArea courseArea = sourceService.getBaseDomainFactory().getOrCreateCourseArea(courseAreaUUID, "testArea", /* centerPosition */ null, /* radius */ null);
event.getVenue().addCourseArea(courseArea);
List<String> raceColumnNames = new ArrayList<>();
String raceColumnName = "T1";
@@ -1306,7 +1306,7 @@ public class MasterDataImportTest {
String venueNameToOverride = "Override";
Event eventToOverride = destService.addEvent(TEST_EVENT_NAME, /* eventDescription */null, eventStartDate,
eventEndDate, venueNameToOverride, false, eventUUID);
courseAreaNotToOverride = destService.getBaseDomainFactory().getOrCreateCourseArea(courseAreaUUID, "testAreaNotToOverride");
courseAreaNotToOverride = destService.getBaseDomainFactory().getOrCreateCourseArea(courseAreaUUID, "testAreaNotToOverride", /* centerPosition */ null, /* radius */ null);
eventToOverride.getVenue().addCourseArea(courseAreaNotToOverride);
List<String> raceColumnNamesToOverride = new ArrayList<>();
String raceColumnNameToOveride = raceColumnName;
@@ -1605,7 +1605,7 @@ public class MasterDataImportTest {
Event event = sourceService.addEvent(TEST_EVENT_NAME, /* eventDescription */null, eventStartDate, eventEndDate,
"testVenue", false, eventUUID);
final UUID courseAreaUUID = UUID.randomUUID();
final CourseArea courseArea = sourceService.getBaseDomainFactory().getOrCreateCourseArea(courseAreaUUID, "testArea");
final CourseArea courseArea = sourceService.getBaseDomainFactory().getOrCreateCourseArea(courseAreaUUID, "testArea", /* centerPosition */ null, /* radius */ null);
event.getVenue().addCourseArea(courseArea);
List<String> raceColumnNames = new ArrayList<>();
String raceColumnName = "T1";
@@ -1850,7 +1850,7 @@ public class MasterDataImportTest {
Event event = sourceService.addEvent(TEST_EVENT_NAME, /* eventDescription */null, eventStartDate, eventEndDate,
"testVenue", false, eventUUID);
final UUID courseAreaUUID = UUID.randomUUID();
final CourseArea courseArea = sourceService.getBaseDomainFactory().getOrCreateCourseArea(courseAreaUUID, "testArea");
final CourseArea courseArea = sourceService.getBaseDomainFactory().getOrCreateCourseArea(courseAreaUUID, "testArea", /* centerPosition */ null, /* radius */ null);
event.getVenue().addCourseArea(courseArea);
List<String> raceColumnNames = new ArrayList<>();
String raceColumnName = "T1";
@@ -2067,7 +2067,7 @@ public class MasterDataImportTest {
public void testMasterDataImportWithFlexibleLeaderboard() throws MalformedURLException, IOException,
InterruptedException, ClassNotFoundException {
final UUID courseAreaUUID = UUID.randomUUID();
sourceService.getBaseDomainFactory().getOrCreateCourseArea(courseAreaUUID, "testArea");
sourceService.getBaseDomainFactory().getOrCreateCourseArea(courseAreaUUID, "testArea", /* centerPosition */ null, /* radius */ null);
List<String> raceColumnNames = new ArrayList<>();
String raceColumnName = "T1";
raceColumnNames.add(raceColumnName);
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/SearchServiceTest.java
+3 -3
View File
@@ -159,9 +159,9 @@ public class SearchServiceTest {
"Kiel", /* isPublic */ true, UUID.randomUUID(), /* officialWebsiteURLAsString */ null, /*baseURL*/null,
/* sailorsInfoWebsiteURLAsString */ null, /* images */Collections.<ImageDescriptor> emptyList(), /* videos */Collections.<VideoDescriptor> emptyList(), /* leaderboardGroupIds */ Collections.<UUID> emptyList()));
kiel = pfingstbusch.getVenue();
final CourseArea kielAlpha = server.getBaseDomainFactory().getOrCreateCourseArea(UUID.randomUUID(), "Alpha");
final CourseArea kielAlpha = server.getBaseDomainFactory().getOrCreateCourseArea(UUID.randomUUID(), "Alpha", /* centerPosition */ null, /* radius */ null);
kiel.addCourseArea(kielAlpha);
final CourseArea kielBravo = server.getBaseDomainFactory().getOrCreateCourseArea(UUID.randomUUID(), "Bravo");
final CourseArea kielBravo = server.getBaseDomainFactory().getOrCreateCourseArea(UUID.randomUUID(), "Bravo", /* centerPosition */ null, /* radius */ null);
kiel.addCourseArea(kielBravo);
final LinkedHashMap<String, SeriesCreationParametersDTO> seriesCreationParams = new LinkedHashMap<String, SeriesCreationParametersDTO>();
seriesCreationParams.put("Default",
@@ -208,7 +208,7 @@ public class SearchServiceTest {
"Flensburg", /* isPublic */ true, UUID.randomUUID(), /* officialWebsiteURLAsString */ null, /*baseURL*/null,
/*sailorsInfoWebsiteURLAsString */ null, /* images */Collections.<ImageDescriptor> emptyList(), /* videos */Collections.<VideoDescriptor> emptyList(), /* leaderboardGroupIds */ Collections.<UUID> emptyList()));
flensburg = aalEvent.getVenue();
final CourseArea flensburgStandard = server.getBaseDomainFactory().getOrCreateCourseArea(UUID.randomUUID(), "Standard");
final CourseArea flensburgStandard = server.getBaseDomainFactory().getOrCreateCourseArea(UUID.randomUUID(), "Standard", /* centerPosition */ null, /* radius */ null);
flensburg.addCourseArea(flensburgStandard);
aalRegatta = server.apply(new AddSpecificRegatta(RegattaImpl.getDefaultName("Aalregatta", "ORC"), "ORC",
/* canBoatsOfCompetitorsChangePerRace */ true, CompetitorRegistrationType.CLOSED,