help Eclipse 2025-03 to still compile our code with Java 8;

there seem to be some issues with inferring generic type arguments in
Eclipse 2025-03, as compared to 2024-09. Minor changes regarding
explicit mention of type parameters seem to help avoid these errors.
This commit is contained in:
Axel Uhl committed 2025-04-14 14:46:27 +02:00
1 parent 735a54d511
commit 5f18f7d925
4 files changed
+5 -5

No files matched your search

@@ -1398,7 +1398,7 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory {
final RankingMetricConstructor rankingMetricConstructor = loadRankingMetricConstructor(dbRegatta); final RankingMetricConstructor rankingMetricConstructor = loadRankingMetricConstructor(dbRegatta);
String registrationLinkSecret = (String) dbRegatta.get(FieldNames.REGATTA_REGISTRATION_LINK_SECRET.name()); String registrationLinkSecret = (String) dbRegatta.get(FieldNames.REGATTA_REGISTRATION_LINK_SECRET.name());
if (createMigratableRegatta) { if (createMigratableRegatta) {
result = new MigratableRegattaImpl(getRaceLogStore(), getRegattaLogStore(), name, boatClass, result = new <Series> MigratableRegattaImpl(getRaceLogStore(), getRegattaLogStore(), name, boatClass,
canBoatsOfCompetitorsChangePerRace, competitorRegistrationType, startDate, endDate, series, /* persistent */true, canBoatsOfCompetitorsChangePerRace, competitorRegistrationType, startDate, endDate, series, /* persistent */true,
loadScoringScheme(dbRegatta), id, courseAreas, loadScoringScheme(dbRegatta), id, courseAreas,
buoyZoneRadiusInHullLengths == null ? Regatta.DEFAULT_BUOY_ZONE_RADIUS_IN_HULL_LENGTHS buoyZoneRadiusInHullLengths == null ? Regatta.DEFAULT_BUOY_ZONE_RADIUS_IN_HULL_LENGTHS
@@ -1408,7 +1408,7 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory {
autoRestartTrackingUponCompetitorSetChange == null ? false : autoRestartTrackingUponCompetitorSetChange, rankingMetricConstructor, autoRestartTrackingUponCompetitorSetChange == null ? false : autoRestartTrackingUponCompetitorSetChange, rankingMetricConstructor,
new MongoObjectFactoryImpl(database), registrationLinkSecret); new MongoObjectFactoryImpl(database), registrationLinkSecret);
} else { } else {
result = new RegattaImpl(getRaceLogStore(), getRegattaLogStore(), name, boatClass, result = new <Series> RegattaImpl(getRaceLogStore(), getRegattaLogStore(), name, boatClass,
canBoatsOfCompetitorsChangePerRace, competitorRegistrationType, startDate, endDate, series, /* persistent */true, canBoatsOfCompetitorsChangePerRace, competitorRegistrationType, startDate, endDate, series, /* persistent */true,
loadScoringScheme(dbRegatta), id, courseAreas, loadScoringScheme(dbRegatta), id, courseAreas,
buoyZoneRadiusInHullLengths == null ? Regatta.DEFAULT_BUOY_ZONE_RADIUS_IN_HULL_LENGTHS buoyZoneRadiusInHullLengths == null ? Regatta.DEFAULT_BUOY_ZONE_RADIUS_IN_HULL_LENGTHS
@@ -100,7 +100,7 @@ public class WindEstimationEvaluatorImpl<T> implements WindEstimationEvaluator<T
.mapToInt(competitorTrack -> competitorTrack.getElements().size()) .mapToInt(competitorTrack -> competitorTrack.getElements().size())
.sum() >= minManeuversPerRace); .sum() >= minManeuversPerRace);
if (randomClipping) { if (randomClipping) {
RaceWithRandomClippingPreprocessingPipelineImpl<ManeuverForEstimation, ManeuverForEstimation> clippingPipeline = new RaceWithRandomClippingPreprocessingPipelineImpl<>( RaceWithRandomClippingPreprocessingPipelineImpl<ManeuverForEstimation, ManeuverForEstimation> clippingPipeline = new RaceWithRandomClippingPreprocessingPipelineImpl<ManeuverForEstimation, ManeuverForEstimation>(
new DummyRacePreprocessingPipelineImpl<>(), fixedNumberOfManeuvers == null ? 1 : fixedNumberOfManeuvers, new DummyRacePreprocessingPipelineImpl<>(), fixedNumberOfManeuvers == null ? 1 : fixedNumberOfManeuvers,
fixedNumberOfManeuvers == null ? Integer.MAX_VALUE : fixedNumberOfManeuvers, evaluationPerCompetitorTrack); fixedNumberOfManeuvers == null ? Integer.MAX_VALUE : fixedNumberOfManeuvers, evaluationPerCompetitorTrack);
preprocessingStream = preprocessingStream preprocessingStream = preprocessingStream
@@ -29,7 +29,7 @@ public class WindEstimatorEvaluationRunner {
private static final EvaluatableWindEstimationImplementation WIND_ESTIMATION_IMPLEMENTATION = EvaluatableWindEstimationImplementation.MST_HMM; private static final EvaluatableWindEstimationImplementation WIND_ESTIMATION_IMPLEMENTATION = EvaluatableWindEstimationImplementation.MST_HMM;
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
WindEstimationEvaluator<CompleteManeuverCurveWithEstimationData> evaluator = new WindEstimationEvaluatorImpl<>( WindEstimationEvaluator<CompleteManeuverCurveWithEstimationData> evaluator = new WindEstimationEvaluatorImpl<CompleteManeuverCurveWithEstimationData>(
MAX_TWD_DEVIATION_DEG, MAX_TWS_DEVIATION_PERCENT, MIN_CORRECT_ESTIMATIONS_RATIO_FOR_CORRECT_RACE, MAX_TWD_DEVIATION_DEG, MAX_TWS_DEVIATION_PERCENT, MIN_CORRECT_ESTIMATIONS_RATIO_FOR_CORRECT_RACE,
EVALUATE_PER_COMPETITOR_TRACK, FIXED_NUMBER_OF_MANEUVERS == null ? 1 : FIXED_NUMBER_OF_MANEUVERS, EVALUATE_PER_COMPETITOR_TRACK, FIXED_NUMBER_OF_MANEUVERS == null ? 1 : FIXED_NUMBER_OF_MANEUVERS,
RANDOM_CLIPPING_OF_COMPETITOR_TRACKS, FIXED_NUMBER_OF_MANEUVERS); RANDOM_CLIPPING_OF_COMPETITOR_TRACKS, FIXED_NUMBER_OF_MANEUVERS);
@@ -94,7 +94,7 @@ public class ParallelGroupedNumberPairAverageAggregationProcessor
break; break;
} }
GroupKey key = sumAggregationEntry.getKey(); GroupKey key = sumAggregationEntry.getKey();
result.put(key, new PairWithStatsImpl<Number>(new Pair<>(sumAggregationEntry.getValue().getA() != null ? sumAggregationEntry.getValue().getA().doubleValue() / elementAmountPerKey.get(key).get() : null, sumAggregationEntry.getValue().getB() != null ? sumAggregationEntry.getValue().getB().doubleValue() / elementAmountPerKey.get(key).get() : null) , result.put(key, new PairWithStatsImpl<Number>(new Pair<Number, Number>(sumAggregationEntry.getValue().getA() != null ? sumAggregationEntry.getValue().getA().doubleValue() / elementAmountPerKey.get(key).get() : null, sumAggregationEntry.getValue().getB() != null ? sumAggregationEntry.getValue().getB().doubleValue() / elementAmountPerKey.get(key).get() : null) ,
minPerKey.get(key), maxPerKey.get(key), minPerKey.get(key), maxPerKey.get(key),
/* median */ null, /* median */ null,
/* standardDeviation */ null, /* standardDeviation */ null,