From bbc369d007fb01e73a460141c7f7526697f3c2fb Mon Sep 17 00:00:00 2001 From: Frederik Petersen Date: Fri, 17 Jul 2015 18:28:05 +0200 Subject: [PATCH 01/31] Preparing polar service for replications since replicas need to receive initial polars during initialLoad First step: Make polar miner replicable --- .../polars/clusters/SpeedClusterGroup.java | 2 ++ .../polars/mining/AngleAndSpeedRegression.java | 4 +++- .../polars/mining/AverageAngleContainer.java | 5 ++++- .../polars/mining/BearingClusterGroup.java | 2 ++ .../mining/CubicRegressionPerCourseProcessor.java | 15 +++++++++++---- .../polars/mining/MovingAverageProcessor.java | 3 ++- .../polars/mining/MovingAverageProcessorImpl.java | 4 ++-- .../sap/sailing/polars/mining/PolarDataMiner.java | 14 ++++++++------ .../SpeedRegressionPerAngleClusterProcessor.java | 13 ++++++++++--- .../regression/IncrementalLeastSquares.java | 4 +++- .../impl/IncrementalAnyOrderLeastSquaresImpl.java | 6 ++++-- .../datamining/test/util/components/Number.java | 5 ++++- .../com/sap/sse/datamining/data/ClusterGroup.java | 3 ++- .../datamining/data/ClusterGroupRepository.java | 3 ++- .../impl/data/CompoundClusterGroupRepository.java | 3 ++- .../sse/datamining/impl/data/FixClusterGroup.java | 4 +++- .../impl/data/SimpleClusterGroupRepository.java | 3 ++- 17 files changed, 66 insertions(+), 27 deletions(-) diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/clusters/SpeedClusterGroup.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/clusters/SpeedClusterGroup.java index 24a11b90a92..e91da829a9b 100644 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/clusters/SpeedClusterGroup.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/clusters/SpeedClusterGroup.java @@ -13,6 +13,8 @@ import com.sap.sse.datamining.impl.data.ComparisonStrategy; import com.sap.sse.datamining.impl.data.FixClusterGroup; public class SpeedClusterGroup extends FixClusterGroup { + + private static final long serialVersionUID = -3428022721991223921L; /** * A {@link SpeedClusterGroup} lets the user set the level mids for all its clusters. The Boundaries will diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/AngleAndSpeedRegression.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/AngleAndSpeedRegression.java index d21684e62de..e7a1ddd884d 100644 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/AngleAndSpeedRegression.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/AngleAndSpeedRegression.java @@ -1,5 +1,6 @@ package com.sap.sailing.polars.mining; +import java.io.Serializable; import java.util.HashSet; import java.util.Set; @@ -24,8 +25,9 @@ import com.sap.sailing.polars.regression.impl.IncrementalAnyOrderLeastSquaresImp import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util.Pair; -public class AngleAndSpeedRegression { +public class AngleAndSpeedRegression implements Serializable { + private static final long serialVersionUID = 6343595388753945979L; private final IncrementalLeastSquares speedRegression = new IncrementalAnyOrderLeastSquaresImpl(3, false); private final IncrementalLeastSquares angleRegression = new IncrementalAnyOrderLeastSquaresImpl(3); diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/AverageAngleContainer.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/AverageAngleContainer.java index eef7022d7d5..5b6e73031e9 100644 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/AverageAngleContainer.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/AverageAngleContainer.java @@ -1,7 +1,10 @@ package com.sap.sailing.polars.mining; +import java.io.Serializable; -public class AverageAngleContainer { + +public class AverageAngleContainer implements Serializable { + private static final long serialVersionUID = -6370647955050312847L; private int dataCount = 0; private double angleSumDeg = 0.0; private double averageAngleDeg = 0.0; diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/BearingClusterGroup.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/BearingClusterGroup.java index f7c05c42c24..27256360014 100644 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/BearingClusterGroup.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/BearingClusterGroup.java @@ -18,6 +18,8 @@ import com.sap.sse.i18n.ResourceBundleStringMessages; public class BearingClusterGroup extends FixClusterGroup{ + private static final long serialVersionUID = -3810975212669767738L; + public BearingClusterGroup(int startAngle, int endAngle, int clusterSize) { super("", createClusters(startAngle, endAngle, clusterSize)); } diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/CubicRegressionPerCourseProcessor.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/CubicRegressionPerCourseProcessor.java index c3134cfbc1b..0f27592874b 100644 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/CubicRegressionPerCourseProcessor.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/CubicRegressionPerCourseProcessor.java @@ -1,5 +1,6 @@ package com.sap.sailing.polars.mining; +import java.io.Serializable; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -22,13 +23,19 @@ import com.sap.sse.datamining.factories.GroupKeyFactory; import com.sap.sse.datamining.impl.components.GroupedDataEntry; import com.sap.sse.datamining.shared.GroupKey; -public class CubicRegressionPerCourseProcessor implements Processor, Void> { - +public class CubicRegressionPerCourseProcessor implements + Processor, Void>, Serializable { + + private static final long serialVersionUID = 3059764273262382648L; + private static final Logger logger = Logger.getLogger(CubicRegressionPerCourseProcessor.class.getName()); - + private final Map regressions = new HashMap<>(); - private ConcurrentHashMap> listeners; + /** + * FIXME Make sure replication and listeners interact correctly + */ + private transient ConcurrentHashMap> listeners; public CubicRegressionPerCourseProcessor(ConcurrentHashMap> listeners) { this.listeners = listeners; diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/MovingAverageProcessor.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/MovingAverageProcessor.java index b424d18a2dd..b354092b62b 100755 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/MovingAverageProcessor.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/MovingAverageProcessor.java @@ -1,5 +1,6 @@ package com.sap.sailing.polars.mining; +import java.io.Serializable; import java.util.Set; import com.sap.sailing.domain.base.BoatClass; @@ -10,7 +11,7 @@ import com.sap.sailing.domain.polars.NotEnoughDataHasBeenAddedException; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.impl.components.GroupedDataEntry; -public interface MovingAverageProcessor extends Processor, Void>{ +public interface MovingAverageProcessor extends Processor, Void>, Serializable { SpeedWithBearingWithConfidence getAverageSpeedAndCourseOverGround(BoatClass boatClass, Speed windSpeed, LegType legType) throws NotEnoughDataHasBeenAddedException; diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/MovingAverageProcessorImpl.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/MovingAverageProcessorImpl.java index ea352b76270..da045353576 100755 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/MovingAverageProcessorImpl.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/MovingAverageProcessorImpl.java @@ -33,6 +33,8 @@ import com.sap.sse.datamining.shared.GroupKey; public class MovingAverageProcessorImpl implements MovingAverageProcessor { + private static final long serialVersionUID = 9016357546663534562L; + private static final Logger logger = Logger.getLogger(MovingAverageProcessorImpl.class.getName()); private final Map boatSpeedEstimators = new HashMap<>(); @@ -43,8 +45,6 @@ public class MovingAverageProcessorImpl implements MovingAverageProcessor { private final Set availableBoatClasses = new HashSet<>(); - - public MovingAverageProcessorImpl(ClusterGroup speedClusterGroup) { this.speedClusterGroup = speedClusterGroup; } diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/PolarDataMiner.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/PolarDataMiner.java index 3411cc1878a..32be9b2e9f8 100755 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/PolarDataMiner.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/PolarDataMiner.java @@ -1,5 +1,6 @@ package com.sap.sailing.polars.mining; +import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -56,19 +57,20 @@ import com.sap.sse.datamining.impl.components.ParallelFilteringProcessor; import com.sap.sse.datamining.impl.components.ParallelMultiDimensionsValueNestingGroupingProcessor; import com.sap.sse.datamining.impl.functions.SimpleParameterizedFunction; -public class PolarDataMiner { +public class PolarDataMiner implements Serializable { + private static final long serialVersionUID = -3916741273749925910L; private static final int EXECUTOR_QUEUE_SIZE = 100; private static final int THREAD_POOL_SIZE = Math.max((int) (Runtime.getRuntime().availableProcessors() * (3.0/4.0)), 3); - private final ThreadPoolExecutor executor = createExecutor(); + private final transient ThreadPoolExecutor executor = createExecutor(); private final PolarSheetGenerationSettings backendPolarSheetGenerationSettings; - private final Map> fixesForRacesWhichAreStillLoading = new HashMap<>(); + private final transient Map> fixesForRacesWhichAreStillLoading = new HashMap<>(); - private final Queue fixQueue = new ConcurrentLinkedQueue(); + private final transient Queue fixQueue = new ConcurrentLinkedQueue(); private static final Logger logger = Logger.getLogger(PolarDataMiner.class.getSimpleName()); - private final ConcurrentHashMap> listeners = new ConcurrentHashMap<>(); + private final transient ConcurrentHashMap> listeners = new ConcurrentHashMap<>(); private ThreadPoolExecutor createExecutor() { return new ThreadPoolExecutor(THREAD_POOL_SIZE, THREAD_POOL_SIZE, 60, TimeUnit.SECONDS, @@ -106,7 +108,7 @@ public class PolarDataMiner { private CubicRegressionPerCourseProcessor cubicRegressionPerCourseProcessor; private SpeedRegressionPerAngleClusterProcessor speedRegressionPerAngleClusterProcessor; - private ParallelFilteringProcessor preFilteringProcessor; + private transient ParallelFilteringProcessor preFilteringProcessor; public PolarDataMiner() { this(PolarSheetGenerationSettingsImpl.createBackendPolarSettings()); diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/SpeedRegressionPerAngleClusterProcessor.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/SpeedRegressionPerAngleClusterProcessor.java index 3b58c9428e9..9d2ca7f4df8 100644 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/SpeedRegressionPerAngleClusterProcessor.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/SpeedRegressionPerAngleClusterProcessor.java @@ -1,5 +1,6 @@ package com.sap.sailing.polars.mining; +import java.io.Serializable; import java.util.HashMap; import java.util.Map; import java.util.Set; @@ -27,8 +28,11 @@ import com.sap.sse.datamining.factories.GroupKeyFactory; import com.sap.sse.datamining.impl.components.GroupedDataEntry; import com.sap.sse.datamining.shared.GroupKey; -public class SpeedRegressionPerAngleClusterProcessor implements Processor, Void>{ - +public class SpeedRegressionPerAngleClusterProcessor implements + Processor, Void>, Serializable { + + private static final long serialVersionUID = 3279917556091599077L; + private static final Logger logger = Logger.getLogger(CubicRegressionPerCourseProcessor.class.getName()); private final Map regressions = new HashMap<>(); @@ -37,7 +41,10 @@ public class SpeedRegressionPerAngleClusterProcessor implements Processor angleClusterGroup; - private final ConcurrentHashMap> listeners; + /** + * FIXME make sure listeners and replication interact correctly + */ + private final transient ConcurrentHashMap> listeners; public SpeedRegressionPerAngleClusterProcessor(ClusterGroup angleClusterGroup, ConcurrentHashMap> listeners) { this.angleClusterGroup = angleClusterGroup; diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/regression/IncrementalLeastSquares.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/regression/IncrementalLeastSquares.java index 53f912c87b6..ad45495bb03 100644 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/regression/IncrementalLeastSquares.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/regression/IncrementalLeastSquares.java @@ -1,5 +1,7 @@ package com.sap.sailing.polars.regression; +import java.io.Serializable; + import org.apache.commons.math.analysis.polynomials.PolynomialFunction; import com.sap.sailing.domain.polars.NotEnoughDataHasBeenAddedException; @@ -10,7 +12,7 @@ import com.sap.sailing.domain.polars.NotEnoughDataHasBeenAddedException; * @author Frederik Petersen (D054528) * */ -public interface IncrementalLeastSquares { +public interface IncrementalLeastSquares extends Serializable { /** * Adds data to the least squares regression. This only updates the internal matrix and vector and will not trigger the diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/regression/impl/IncrementalAnyOrderLeastSquaresImpl.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/regression/impl/IncrementalAnyOrderLeastSquaresImpl.java index d08beb2e22b..106662d0aa4 100644 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/regression/impl/IncrementalAnyOrderLeastSquaresImpl.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/regression/impl/IncrementalAnyOrderLeastSquaresImpl.java @@ -29,6 +29,8 @@ import com.sap.sse.concurrent.NamedReentrantReadWriteLock; */ public class IncrementalAnyOrderLeastSquaresImpl implements IncrementalLeastSquares { + private static final long serialVersionUID = -5282614133220702724L; + private class NaNCheckerVisitor implements RealMatrixPreservingVisitor { private boolean hasNaNEntry = false; @@ -64,10 +66,10 @@ public class IncrementalAnyOrderLeastSquaresImpl implements IncrementalLeastSqua private AtomicBoolean functionNeedsUpdate = new AtomicBoolean(true); - private final NamedReentrantReadWriteLock lock = new NamedReentrantReadWriteLock("IncrementalLeastSquaresLock", + private final transient NamedReentrantReadWriteLock lock = new NamedReentrantReadWriteLock("IncrementalLeastSquaresLock", false); - private final NamedReentrantReadWriteLock cacheLock = new NamedReentrantReadWriteLock("IncrementalLeastSquaresCacheLock", + private final transient NamedReentrantReadWriteLock cacheLock = new NamedReentrantReadWriteLock("IncrementalLeastSquaresCacheLock", true); private PolynomialFunction cachedFunction; diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/components/Number.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/components/Number.java index e8a3a70d352..6d9b4303b0b 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/components/Number.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/components/Number.java @@ -1,5 +1,7 @@ package com.sap.sse.datamining.test.util.components; +import java.io.Serializable; + import com.sap.sse.datamining.shared.annotations.Dimension; /* @@ -7,8 +9,9 @@ import com.sap.sse.datamining.shared.annotations.Dimension; * The tests will fail, because they are reflected via constant strings. */ -public class Number { +public class Number implements Serializable { + private static final long serialVersionUID = 1L; private int value; public Number(int value) { diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/data/ClusterGroup.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/data/ClusterGroup.java index da53a63acea..f17977b9be3 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/data/ClusterGroup.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/data/ClusterGroup.java @@ -1,5 +1,6 @@ package com.sap.sse.datamining.data; +import java.io.Serializable; import java.util.Locale; import com.sap.sse.i18n.ResourceBundleStringMessages; @@ -14,7 +15,7 @@ import com.sap.sse.i18n.ResourceBundleStringMessages; * * @see Cluster */ -public interface ClusterGroup { +public interface ClusterGroup extends Serializable { public String getLocalizedName(Locale locale, ResourceBundleStringMessages stringMessages); diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/data/ClusterGroupRepository.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/data/ClusterGroupRepository.java index 02392530051..b35d9424091 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/data/ClusterGroupRepository.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/data/ClusterGroupRepository.java @@ -1,11 +1,12 @@ package com.sap.sse.datamining.data; +import java.io.Serializable; import java.util.Collection; public interface ClusterGroupRepository { public void add(ClusterGroup clusterGroup); - public Collection> getClusterGroupsFor(Class type); + public Collection> getClusterGroupsFor(Class type); } diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/CompoundClusterGroupRepository.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/CompoundClusterGroupRepository.java index 316a81d3951..b9d28dd78b8 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/CompoundClusterGroupRepository.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/CompoundClusterGroupRepository.java @@ -1,5 +1,6 @@ package com.sap.sse.datamining.impl.data; +import java.io.Serializable; import java.util.Collection; import java.util.HashSet; @@ -24,7 +25,7 @@ public class CompoundClusterGroupRepository implements ClusterGroupRepository { } @Override - public Collection> getClusterGroupsFor(Class type) { + public Collection> getClusterGroupsFor(Class type) { Collection> allClusterGroups = new HashSet<>(); for (ClusterGroupRepository clusterGroupRepository : repositories) { allClusterGroups.addAll(clusterGroupRepository.getClusterGroupsFor(type)); diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/FixClusterGroup.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/FixClusterGroup.java index 8eb72802107..e22182bd2de 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/FixClusterGroup.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/FixClusterGroup.java @@ -1,5 +1,6 @@ package com.sap.sse.datamining.impl.data; +import java.io.Serializable; import java.util.Collection; import java.util.HashSet; import java.util.Locale; @@ -8,8 +9,9 @@ import com.sap.sse.datamining.data.Cluster; import com.sap.sse.datamining.data.ClusterGroup; import com.sap.sse.i18n.ResourceBundleStringMessages; -public class FixClusterGroup implements ClusterGroup { +public class FixClusterGroup implements ClusterGroup { + private static final long serialVersionUID = 2632796094234887943L; private final String messageKey; private final Collection> clusters; diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/SimpleClusterGroupRepository.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/SimpleClusterGroupRepository.java index 0363deae633..7e4c8b495d7 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/SimpleClusterGroupRepository.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/SimpleClusterGroupRepository.java @@ -1,5 +1,6 @@ package com.sap.sse.datamining.impl.data; +import java.io.Serializable; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; @@ -30,7 +31,7 @@ public class SimpleClusterGroupRepository implements ClusterGroupRepository { @SuppressWarnings("unchecked") // Necessary because you can't use instanceof with generics @Override - public Collection> getClusterGroupsFor(Class type) { + public Collection> getClusterGroupsFor(Class type) { Collection> specificClusterGroups = new HashSet<>(); if (clusterGroupsMappedByType.containsKey(type)) { for (ClusterGroup clusterGroup : clusterGroupsMappedByType.get(type)) { From 9e723f876e065c24a250e46d1dc50dac9d2a3c32 Mon Sep 17 00:00:00 2001 From: Frederik Petersen Date: Fri, 17 Jul 2015 19:03:05 +0200 Subject: [PATCH 02/31] PolarDataService now implements Replicable --- .../META-INF/MANIFEST.MF | 4 +- .../sailing/polars/PolarDataOperation.java | 8 ++ .../polars/impl/PolarDataServiceImpl.java | 113 +++++++++++++++++- 3 files changed, 122 insertions(+), 3 deletions(-) create mode 100644 java/com.sap.sailing.polars/src/com/sap/sailing/polars/PolarDataOperation.java diff --git a/java/com.sap.sailing.polars/META-INF/MANIFEST.MF b/java/com.sap.sailing.polars/META-INF/MANIFEST.MF index cdc7f5e0360..c830735c4fd 100644 --- a/java/com.sap.sailing.polars/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.polars/META-INF/MANIFEST.MF @@ -19,7 +19,9 @@ Require-Bundle: com.sap.sse, com.sap.sse.shared.android, org.apache.commons.math;bundle-version="2.1.0", - org.eclipse.osgi + org.eclipse.osgi, + com.sap.sse.replication;bundle-version="1.0.0", + com.sap.sse.operationaltransformation;bundle-version="1.0.0" Import-Package: com.sap.sailing.util, com.sap.sse.common diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/PolarDataOperation.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/PolarDataOperation.java new file mode 100644 index 00000000000..4504ec6fe35 --- /dev/null +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/PolarDataOperation.java @@ -0,0 +1,8 @@ +package com.sap.sailing.polars; + +import com.sap.sailing.polars.impl.PolarDataServiceImpl; +import com.sap.sse.replication.OperationWithResult; + +public interface PolarDataOperation extends OperationWithResult{ + +} diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/impl/PolarDataServiceImpl.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/impl/PolarDataServiceImpl.java index 4fa72c074cd..176ebf7df98 100755 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/impl/PolarDataServiceImpl.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/impl/PolarDataServiceImpl.java @@ -1,6 +1,14 @@ package com.sap.sailing.polars.impl; +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; +import java.net.MalformedURLException; +import java.util.HashSet; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutionException; import java.util.concurrent.Executor; @@ -27,12 +35,18 @@ import com.sap.sailing.domain.polars.NotEnoughDataHasBeenAddedException; import com.sap.sailing.domain.polars.PolarDataService; import com.sap.sailing.domain.polars.PolarsChangedListener; import com.sap.sailing.domain.tracking.TrackedRace; +import com.sap.sailing.polars.PolarDataOperation; import com.sap.sailing.polars.aggregation.PolarFixAggregator; import com.sap.sailing.polars.aggregation.SimplePolarFixRaceInterval; import com.sap.sailing.polars.data.PolarFix; import com.sap.sailing.polars.generation.PolarSheetGenerator; import com.sap.sailing.polars.mining.PolarDataMiner; import com.sap.sse.common.Util.Pair; +import com.sap.sse.replication.OperationExecutionListener; +import com.sap.sse.replication.OperationWithResult; +import com.sap.sse.replication.ReplicationMasterDescriptor; +import com.sap.sse.replication.impl.OperationWithResultWithIdWrapper; +import com.sap.sse.replication.impl.ReplicableWithObjectInputStream; import com.sap.sse.util.SmartFutureCache; /** @@ -43,12 +57,27 @@ import com.sap.sse.util.SmartFutureCache; * @author Frederik Petersen (D054528) * */ -public class PolarDataServiceImpl implements PolarDataService { +public class PolarDataServiceImpl implements PolarDataService, ReplicableWithObjectInputStream>{ - private final PolarDataMiner polarDataMiner; + private PolarDataMiner polarDataMiner; + + private final ConcurrentHashMap, OperationExecutionListener> operationExecutionListeners; + + /** + * The master from which this replicable is currently replicating, or null if this replicable is not + * currently replicated from any master. + */ + private ReplicationMasterDescriptor replicatingFromMaster; + + private final Set> operationsSentToMasterForReplication; + + private ThreadLocal currentlyFillingFromInitialLoadOrApplyingOperationReceivedFromMaster = ThreadLocal + .withInitial(() -> false); public PolarDataServiceImpl() { this.polarDataMiner = new PolarDataMiner(); + this.operationsSentToMasterForReplication = new HashSet<>(); + this.operationExecutionListeners = new ConcurrentHashMap<>(); } @Override @@ -217,4 +246,84 @@ public class PolarDataServiceImpl implements PolarDataService { polarDataMiner.unregisterListener(boatClass, listener); } + @Override + public void addOperationExecutionListener(OperationExecutionListener listener) { + operationExecutionListeners.put(listener, listener); + } + + @Override + public void removeOperationExecutionListener(OperationExecutionListener listener) { + operationExecutionListeners.remove(listener); + } + + @Override + public void clearReplicaState() throws MalformedURLException, IOException, InterruptedException { + polarDataMiner = null; + } + + @Override + public boolean isCurrentlyFillingFromInitialLoadOrApplyingOperationReceivedFromMaster() { + return currentlyFillingFromInitialLoadOrApplyingOperationReceivedFromMaster.get(); + } + + @Override + public void setCurrentlyFillingFromInitialLoadOrApplyingOperationReceivedFromMaster(boolean b) { + currentlyFillingFromInitialLoadOrApplyingOperationReceivedFromMaster.set(b); + + } + + @Override + public Serializable getId() { + return getClass().getName(); + } + + @Override + public ObjectInputStream createObjectInputStreamResolvingAgainstCache(InputStream is) throws IOException { + //FIXME problem since we dont have access to basedomainfactory + return new ObjectInputStream(is); + } + + @Override + public void initiallyFillFromInternal(ObjectInputStream is) throws IOException, ClassNotFoundException, + InterruptedException { + polarDataMiner = (PolarDataMiner) is.readObject(); + } + + @Override + public void serializeForInitialReplicationInternal(ObjectOutputStream objectOutputStream) throws IOException { + objectOutputStream.writeObject(polarDataMiner); + } + + @Override + public Iterable> getOperationExecutionListeners() { + return operationExecutionListeners.keySet(); + } + + @Override + public ReplicationMasterDescriptor getMasterDescriptor() { + return replicatingFromMaster; + } + + @Override + public void startedReplicatingFrom(ReplicationMasterDescriptor master) { + this.replicatingFromMaster = master; + } + + @Override + public void stoppedReplicatingFrom(ReplicationMasterDescriptor master) { + this.replicatingFromMaster = null; + } + + @Override + public boolean hasSentOperationToMaster(OperationWithResult operation) { + return this.operationsSentToMasterForReplication.contains(operation); + } + + + @Override + public void addOperationSentToMasterForReplication( + OperationWithResultWithIdWrapper operation) { + this.operationsSentToMasterForReplication.add(operation); + } + } From fb15a2bf7c9bbd9b079cf23af56c8b0384cc5e74 Mon Sep 17 00:00:00 2001 From: Frederik Petersen Date: Fri, 17 Jul 2015 19:12:31 +0200 Subject: [PATCH 03/31] Added replicable registration in polar bundle activator --- .../src/com/sap/sailing/polars/impl/Activator.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/impl/Activator.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/impl/Activator.java index 888e7d0844d..c5357d21292 100644 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/impl/Activator.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/impl/Activator.java @@ -1,6 +1,8 @@ package com.sap.sailing.polars.impl; +import java.util.Dictionary; import java.util.HashSet; +import java.util.Hashtable; import java.util.Set; import java.util.logging.Logger; @@ -9,6 +11,7 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceRegistration; import com.sap.sailing.domain.polars.PolarDataService; +import com.sap.sse.replication.Replicable; public class Activator implements BundleActivator { @@ -19,7 +22,11 @@ public class Activator implements BundleActivator { @Override public void start(BundleContext context) throws Exception { logger.info("Registering PolarDataService"); - registrations.add(context.registerService(PolarDataService.class, new PolarDataServiceImpl(), null)); + PolarDataServiceImpl service = new PolarDataServiceImpl(); + registrations.add(context.registerService(PolarDataService.class, service, null)); + final Dictionary replicableServiceProperties = new Hashtable<>(); + replicableServiceProperties.put(Replicable.OSGi_Service_Registry_ID_Property_Name, service.getId().toString()); + registrations.add(context.registerService(Replicable.class.getName(), service, replicableServiceProperties)); } @Override From 9a3e74ccbacf9ec7b2db1ca45edbca7e8eefb4de Mon Sep 17 00:00:00 2001 From: Frederik Petersen Date: Sat, 18 Jul 2015 00:48:58 +0200 Subject: [PATCH 04/31] More preparation for PolarService Serialization --- .../polars/mining/BearingClusterGroup.java | 19 ++++++++++++------- .../com/sap/sse/datamining/data/Cluster.java | 3 ++- .../sse/datamining/data/ClusterBoundary.java | 4 +++- .../datamining/impl/data/AbstractCluster.java | 1 + .../impl/data/AbstractClusterBoundary.java | 5 ++++- .../ClusterWithLowerAndUpperBoundaries.java | 2 ++ .../impl/data/ClusterWithSingleBoundary.java | 1 + .../impl/data/ComparableClusterBoundary.java | 6 +++++- .../impl/data/ComparatorClusterBoundary.java | 4 +++- .../datamining/impl/data/FixClusterGroup.java | 3 ++- 10 files changed, 35 insertions(+), 13 deletions(-) diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/BearingClusterGroup.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/BearingClusterGroup.java index 27256360014..918b1db3086 100644 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/BearingClusterGroup.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/BearingClusterGroup.java @@ -1,5 +1,6 @@ package com.sap.sailing.polars.mining; +import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; import java.util.Comparator; @@ -37,13 +38,7 @@ public class BearingClusterGroup extends FixClusterGroup{ private static ClusterBoundary createBoundary(double angleInDeg, ComparisonStrategy strategy) { Bearing angle = new DegreeBearingImpl(angleInDeg); - Comparator comparator = new Comparator() { - - @Override - public int compare(Bearing arg0, Bearing arg1) { - return new Double(arg0.getDegrees()).compareTo(new Double(arg1.getDegrees())); - } - }; + Comparator comparator = new BearingComparator(); return new ComparatorClusterBoundary(angle, strategy, comparator); } @@ -51,6 +46,16 @@ public class BearingClusterGroup extends FixClusterGroup{ public String getLocalizedName(Locale locale, ResourceBundleStringMessages stringMessages) { return ""; } + + private static class BearingComparator implements Comparator, Serializable { + + private static final long serialVersionUID = 8166601046140275541L; + + @Override + public int compare(Bearing arg0, Bearing arg1) { + return new Double(arg0.getDegrees()).compareTo(new Double(arg1.getDegrees())); + } + }; } diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/data/Cluster.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/data/Cluster.java index bcc903ea6bc..bbd535de846 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/data/Cluster.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/data/Cluster.java @@ -1,5 +1,6 @@ package com.sap.sse.datamining.data; +import java.io.Serializable; import java.util.Locale; import com.sap.sse.i18n.ResourceBundleStringMessages; @@ -16,7 +17,7 @@ import com.sap.sse.i18n.ResourceBundleStringMessages; * @see ClusterBoundary * @see ClusterGroup */ -public interface Cluster { +public interface Cluster extends Serializable { public String getAsLocalizedString(Locale locale, ResourceBundleStringMessages stringMessages); diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/data/ClusterBoundary.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/data/ClusterBoundary.java index 45f2b9fd03b..a6929625ae3 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/data/ClusterBoundary.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/data/ClusterBoundary.java @@ -1,5 +1,7 @@ package com.sap.sse.datamining.data; +import java.io.Serializable; + import com.sap.sse.datamining.impl.data.ComparisonStrategy; /** @@ -11,7 +13,7 @@ import com.sap.sse.datamining.impl.data.ComparisonStrategy; * * @see Cluster */ -public interface ClusterBoundary { +public interface ClusterBoundary extends Serializable { public boolean contains(ElementType value); diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/AbstractCluster.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/AbstractCluster.java index 08e1cbfe1de..05c41ceda0c 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/AbstractCluster.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/AbstractCluster.java @@ -10,6 +10,7 @@ import com.sap.sse.i18n.ResourceBundleStringMessages; public abstract class AbstractCluster implements Cluster { + private static final long serialVersionUID = 1606840566021644768L; private final String messageKey; private Collection> boundaries; diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/AbstractClusterBoundary.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/AbstractClusterBoundary.java index b42df0c8e3d..0f5a846fe35 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/AbstractClusterBoundary.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/AbstractClusterBoundary.java @@ -1,9 +1,12 @@ package com.sap.sse.datamining.impl.data; +import java.io.Serializable; + import com.sap.sse.datamining.data.ClusterBoundary; -public abstract class AbstractClusterBoundary implements ClusterBoundary { +public abstract class AbstractClusterBoundary implements ClusterBoundary { + private static final long serialVersionUID = 513488430319010656L; private final ElementType boundaryValue; private final ComparisonStrategy strategy; diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/ClusterWithLowerAndUpperBoundaries.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/ClusterWithLowerAndUpperBoundaries.java index 780396cf176..0393152d050 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/ClusterWithLowerAndUpperBoundaries.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/ClusterWithLowerAndUpperBoundaries.java @@ -8,6 +8,8 @@ import com.sap.sse.datamining.data.ClusterBoundary; public class ClusterWithLowerAndUpperBoundaries extends AbstractCluster { + private static final long serialVersionUID = -845964568416163995L; + /** * A {@link Cluster} with a lower and an upper boundary. This Cluster contains * all elements, that are contained by the given lowerBound and the given diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/ClusterWithSingleBoundary.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/ClusterWithSingleBoundary.java index 061f8552845..5479ccdae3c 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/ClusterWithSingleBoundary.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/ClusterWithSingleBoundary.java @@ -7,6 +7,7 @@ import com.sap.sse.datamining.data.ClusterBoundary; public class ClusterWithSingleBoundary extends AbstractCluster { + private static final long serialVersionUID = -3188802475809553490L; private static final char INFINITE = '\u221e'; /** diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/ComparableClusterBoundary.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/ComparableClusterBoundary.java index d52b87ae0d3..2890dfe2696 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/ComparableClusterBoundary.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/ComparableClusterBoundary.java @@ -1,7 +1,11 @@ package com.sap.sse.datamining.impl.data; -public class ComparableClusterBoundary> extends AbstractClusterBoundary { +import java.io.Serializable; + +public class ComparableClusterBoundary & Serializable> extends AbstractClusterBoundary { + private static final long serialVersionUID = -930603995272128901L; + public ComparableClusterBoundary(ElementType boundaryValue, ComparisonStrategy strategy) { super(boundaryValue, strategy); } diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/ComparatorClusterBoundary.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/ComparatorClusterBoundary.java index beb58232b85..f01b6d350ca 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/ComparatorClusterBoundary.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/ComparatorClusterBoundary.java @@ -1,9 +1,11 @@ package com.sap.sse.datamining.impl.data; +import java.io.Serializable; import java.util.Comparator; -public class ComparatorClusterBoundary extends AbstractClusterBoundary { +public class ComparatorClusterBoundary extends AbstractClusterBoundary { + private static final long serialVersionUID = -8177984229875233720L; private final Comparator comparator; public ComparatorClusterBoundary(ElementType boundaryValue, ComparisonStrategy strategy, diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/FixClusterGroup.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/FixClusterGroup.java index e22182bd2de..ad6bf794c44 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/FixClusterGroup.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/FixClusterGroup.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.Collection; import java.util.HashSet; import java.util.Locale; +import java.util.Set; import com.sap.sse.datamining.data.Cluster; import com.sap.sse.datamining.data.ClusterGroup; @@ -13,7 +14,7 @@ public class FixClusterGroup implements Cluste private static final long serialVersionUID = 2632796094234887943L; private final String messageKey; - private final Collection> clusters; + private final Set> clusters; public FixClusterGroup(String messageKey, Collection> clusters) { this.messageKey = messageKey; From 8c9e76a5ea75f6d922a907fad2abd338b2276746 Mon Sep 17 00:00:00 2001 From: Frederik Petersen Date: Sat, 18 Jul 2015 22:18:34 +0200 Subject: [PATCH 05/31] Polars Initial Load now working had to remove MovingAverageProcessor. It was supposed to be removed anyways, so I'll do that now. It was just left to be compared to the regressions during development. --- .../domain/polars/PolarDataService.java | 5 + .../mining/test/PolarDataMinerTest.java | 20 +++- .../polars/impl/PolarDataServiceImpl.java | 73 +++++++++++++- .../CubicRegressionPerCourseProcessor.java | 10 +- .../polars/mining/MovingAverageProcessor.java | 5 +- .../mining/MovingAverageProcessorImpl.java | 14 +-- .../sailing/polars/mining/PolarDataMiner.java | 96 ++++++++++--------- ...eedRegressionPerAngleClusterProcessor.java | 21 +++- ...oxy, Jetty on 8889, auto-replicate).launch | 2 +- .../server/impl/RacingEventServiceImpl.java | 2 + 10 files changed, 178 insertions(+), 70 deletions(-) diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/polars/PolarDataService.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/polars/PolarDataService.java index cd7b5c44c33..665200582a7 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/polars/PolarDataService.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/polars/PolarDataService.java @@ -8,6 +8,7 @@ import org.apache.commons.math.analysis.polynomials.PolynomialFunction; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.Competitor; +import com.sap.sailing.domain.base.DomainFactory; import com.sap.sailing.domain.base.SpeedWithBearingWithConfidence; import com.sap.sailing.domain.base.SpeedWithConfidence; import com.sap.sailing.domain.common.Bearing; @@ -242,5 +243,9 @@ public interface PolarDataService { */ void unregisterListener(BoatClass boatClass, PolarsChangedListener listener); + void registerDomainFactory(DomainFactory domainFactory); + + void unregisterDomainFactory(DomainFactory domainFactory); + } diff --git a/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/mining/test/PolarDataMinerTest.java b/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/mining/test/PolarDataMinerTest.java index dd5add44d21..dee8526a4c3 100644 --- a/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/mining/test/PolarDataMinerTest.java +++ b/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/mining/test/PolarDataMinerTest.java @@ -32,6 +32,7 @@ import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.PolarSheetGenerationSettings; import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.impl.DegreeBearingImpl; @@ -49,10 +50,16 @@ import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.domain.tracking.WindWithConfidence; import com.sap.sailing.domain.tracking.impl.DynamicGPSFixMovingTrackImpl; import com.sap.sailing.domain.tracking.impl.WindWithConfidenceImpl; +import com.sap.sailing.polars.mining.BearingClusterGroup; +import com.sap.sailing.polars.mining.CubicRegressionPerCourseProcessor; +import com.sap.sailing.polars.mining.MovingAverageProcessorImpl; import com.sap.sailing.polars.mining.PolarDataMiner; +import com.sap.sailing.polars.mining.SpeedClusterGroupFromWindSteppingCreator; +import com.sap.sailing.polars.mining.SpeedRegressionPerAngleClusterProcessor; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util.Pair; import com.sap.sse.common.impl.MillisecondsTimePoint; +import com.sap.sse.datamining.data.ClusterGroup; public class PolarDataMinerTest { @@ -73,12 +80,23 @@ public class PolarDataMinerTest { return new PolarSheetGenerationSettingsImpl(50, 0.1, 20, 20, 0.1, true, true, 2, 0.05, true, windStepping, false, 3); } + + private ClusterGroup createAngleClusterGroup() { + return new BearingClusterGroup(0, 180, 5); + } @Ignore @Test public void testGrouping() throws InterruptedException, TimeoutException, NoSuchMethodException, NotEnoughDataHasBeenAddedException { - PolarDataMiner miner = new PolarDataMiner(createTestPolarSettings()); + PolarSheetGenerationSettings settings = createTestPolarSettings(); + ClusterGroup angleClusterGroup = createAngleClusterGroup(); + WindSpeedSteppingWithMaxDistance stepping = settings.getWindSpeedStepping(); + final ClusterGroup speedClusterGroup = SpeedClusterGroupFromWindSteppingCreator + .createSpeedClusterGroupFrom(stepping); + PolarDataMiner miner = new PolarDataMiner(settings, new MovingAverageProcessorImpl(speedClusterGroup), + new CubicRegressionPerCourseProcessor(), + new SpeedRegressionPerAngleClusterProcessor(angleClusterGroup), speedClusterGroup, angleClusterGroup); BoatClass mockedBoatClass = mock(BoatClass.class); diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/impl/PolarDataServiceImpl.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/impl/PolarDataServiceImpl.java index 176ebf7df98..8f5816f5948 100755 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/impl/PolarDataServiceImpl.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/impl/PolarDataServiceImpl.java @@ -11,11 +11,13 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutionException; import java.util.concurrent.Executor; +import java.util.logging.Logger; import org.apache.commons.math.analysis.polynomials.PolynomialFunction; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.Competitor; +import com.sap.sailing.domain.base.DomainFactory; import com.sap.sailing.domain.base.SpeedWithBearingWithConfidence; import com.sap.sailing.domain.base.SpeedWithConfidence; import com.sap.sailing.domain.base.impl.SpeedWithBearingWithConfidenceImpl; @@ -30,6 +32,8 @@ import com.sap.sailing.domain.common.confidence.BearingWithConfidence; import com.sap.sailing.domain.common.confidence.impl.BearingWithConfidenceImpl; import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; +import com.sap.sailing.domain.common.impl.PolarSheetGenerationSettingsImpl; +import com.sap.sailing.domain.common.impl.WindSpeedSteppingWithMaxDistance; import com.sap.sailing.domain.common.tracking.GPSFixMoving; import com.sap.sailing.domain.polars.NotEnoughDataHasBeenAddedException; import com.sap.sailing.domain.polars.PolarDataService; @@ -40,8 +44,14 @@ import com.sap.sailing.polars.aggregation.PolarFixAggregator; import com.sap.sailing.polars.aggregation.SimplePolarFixRaceInterval; import com.sap.sailing.polars.data.PolarFix; import com.sap.sailing.polars.generation.PolarSheetGenerator; +import com.sap.sailing.polars.mining.BearingClusterGroup; +import com.sap.sailing.polars.mining.CubicRegressionPerCourseProcessor; +import com.sap.sailing.polars.mining.MovingAverageProcessorImpl; import com.sap.sailing.polars.mining.PolarDataMiner; +import com.sap.sailing.polars.mining.SpeedClusterGroupFromWindSteppingCreator; +import com.sap.sailing.polars.mining.SpeedRegressionPerAngleClusterProcessor; import com.sap.sse.common.Util.Pair; +import com.sap.sse.datamining.data.ClusterGroup; import com.sap.sse.replication.OperationExecutionListener; import com.sap.sse.replication.OperationWithResult; import com.sap.sse.replication.ReplicationMasterDescriptor; @@ -59,6 +69,8 @@ import com.sap.sse.util.SmartFutureCache; */ public class PolarDataServiceImpl implements PolarDataService, ReplicableWithObjectInputStream>{ + private static final Logger logger = Logger.getLogger(PolarDataServiceImpl.class.getSimpleName()); + private PolarDataMiner polarDataMiner; private final ConcurrentHashMap, OperationExecutionListener> operationExecutionListeners; @@ -73,13 +85,29 @@ public class PolarDataServiceImpl implements PolarDataService, ReplicableWithObj private ThreadLocal currentlyFillingFromInitialLoadOrApplyingOperationReceivedFromMaster = ThreadLocal .withInitial(() -> false); + + private DomainFactory domainFactory; public PolarDataServiceImpl() { - this.polarDataMiner = new PolarDataMiner(); + PolarSheetGenerationSettings settings = PolarSheetGenerationSettingsImpl.createBackendPolarSettings(); + ClusterGroup angleClusterGroup = createAngleClusterGroup(); + WindSpeedSteppingWithMaxDistance stepping = settings.getWindSpeedStepping(); + final ClusterGroup speedClusterGroup = SpeedClusterGroupFromWindSteppingCreator + .createSpeedClusterGroupFrom(stepping); + MovingAverageProcessorImpl movingAverageProcessor = new MovingAverageProcessorImpl(speedClusterGroup); + CubicRegressionPerCourseProcessor cubicRegressionPerCourseProcessor = new CubicRegressionPerCourseProcessor(); + SpeedRegressionPerAngleClusterProcessor speedRegressionPerAngleClusterProcessor = new SpeedRegressionPerAngleClusterProcessor( + angleClusterGroup); + this.polarDataMiner = new PolarDataMiner(settings, movingAverageProcessor, cubicRegressionPerCourseProcessor, + speedRegressionPerAngleClusterProcessor, speedClusterGroup, angleClusterGroup); this.operationsSentToMasterForReplication = new HashSet<>(); this.operationExecutionListeners = new ConcurrentHashMap<>(); } + private ClusterGroup createAngleClusterGroup() { + return new BearingClusterGroup(0, 180, 5); + } + @Override public SpeedWithConfidence getSpeed(BoatClass boatClass, Speed windSpeed, Bearing trueWindAngle) throws NotEnoughDataHasBeenAddedException { return polarDataMiner.estimateBoatSpeed(boatClass, windSpeed, trueWindAngle); @@ -279,19 +307,42 @@ public class PolarDataServiceImpl implements PolarDataService, ReplicableWithObj @Override public ObjectInputStream createObjectInputStreamResolvingAgainstCache(InputStream is) throws IOException { - //FIXME problem since we dont have access to basedomainfactory - return new ObjectInputStream(is); + ObjectInputStream ois; + if (domainFactory != null) { + ois = domainFactory.createObjectInputStreamResolvingAgainstThisFactory(is); + } else { + // TODO ensure that domainfactory is set here. Otherwise there can be issues with duplicate domain objects + logger.warning("PolarDataService didn't have a domain factory attached. Replication to this service could fail."); + ois = new ObjectInputStream(is); + } + return ois; } @Override public void initiallyFillFromInternal(ObjectInputStream is) throws IOException, ClassNotFoundException, InterruptedException { - polarDataMiner = (PolarDataMiner) is.readObject(); + PolarSheetGenerationSettings backendPolarSettings = (PolarSheetGenerationSettings) is.readObject(); + //MovingAverageProcessor movingAverageProcessor = (MovingAverageProcessor) is.readObject(); + PolarSheetGenerationSettings settings = PolarSheetGenerationSettingsImpl.createBackendPolarSettings(); + WindSpeedSteppingWithMaxDistance stepping = settings.getWindSpeedStepping(); + final ClusterGroup speedClusterGroup = SpeedClusterGroupFromWindSteppingCreator + .createSpeedClusterGroupFrom(stepping); + MovingAverageProcessorImpl movingAverageProcessor = new MovingAverageProcessorImpl(speedClusterGroup); + + CubicRegressionPerCourseProcessor cubicRegressionPerCourseProcessor = (CubicRegressionPerCourseProcessor) is.readObject(); + SpeedRegressionPerAngleClusterProcessor speedRegressionPerAngleClusterProcessor = (SpeedRegressionPerAngleClusterProcessor) is.readObject(); + + polarDataMiner = new PolarDataMiner(backendPolarSettings, movingAverageProcessor, + cubicRegressionPerCourseProcessor, speedRegressionPerAngleClusterProcessor, + movingAverageProcessor.getSpeedCluster(), speedRegressionPerAngleClusterProcessor.getAngleCluster()); } @Override public void serializeForInitialReplicationInternal(ObjectOutputStream objectOutputStream) throws IOException { - objectOutputStream.writeObject(polarDataMiner); + objectOutputStream.writeObject(polarDataMiner.getPolarSheetGenerationSettings()); + //objectOutputStream.writeObject(polarDataMiner.getMovingAverageProcessor()); + objectOutputStream.writeObject(polarDataMiner.getCubicRegressionPerCourseProcessor()); + objectOutputStream.writeObject(polarDataMiner.getSpeedRegressionPerAngleClusterProcessor()); } @Override @@ -326,4 +377,16 @@ public class PolarDataServiceImpl implements PolarDataService, ReplicableWithObj this.operationsSentToMasterForReplication.add(operation); } + @Override + public void registerDomainFactory(DomainFactory domainFactory) { + this.domainFactory = domainFactory; + } + + @Override + public void unregisterDomainFactory(DomainFactory domainFactory) { + if (this.domainFactory == domainFactory) { + this.domainFactory = null; + } + } + } diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/CubicRegressionPerCourseProcessor.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/CubicRegressionPerCourseProcessor.java index 0f27592874b..16fe845b1fa 100644 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/CubicRegressionPerCourseProcessor.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/CubicRegressionPerCourseProcessor.java @@ -36,10 +36,6 @@ public class CubicRegressionPerCourseProcessor implements * FIXME Make sure replication and listeners interact correctly */ private transient ConcurrentHashMap> listeners; - - public CubicRegressionPerCourseProcessor(ConcurrentHashMap> listeners) { - this.listeners = listeners; - } @Override public boolean canProcessElements() { @@ -152,6 +148,10 @@ public class CubicRegressionPerCourseProcessor implements logger.severe("Polar Data Mining Pipe failed. Cause: " + failure.getMessage()); throw new RuntimeException("Polar Data Miner failed.", failure); } + + public void setListeners(ConcurrentHashMap> listeners) { + this.listeners = listeners; + } @Override @@ -194,4 +194,6 @@ public class CubicRegressionPerCourseProcessor implements return null; } + + } diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/MovingAverageProcessor.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/MovingAverageProcessor.java index b354092b62b..f27023e1274 100755 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/MovingAverageProcessor.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/MovingAverageProcessor.java @@ -1,7 +1,6 @@ package com.sap.sailing.polars.mining; import java.io.Serializable; -import java.util.Set; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.SpeedWithBearingWithConfidence; @@ -9,11 +8,11 @@ import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.polars.NotEnoughDataHasBeenAddedException; import com.sap.sse.datamining.components.Processor; +import com.sap.sse.datamining.data.ClusterGroup; import com.sap.sse.datamining.impl.components.GroupedDataEntry; public interface MovingAverageProcessor extends Processor, Void>, Serializable { SpeedWithBearingWithConfidence getAverageSpeedAndCourseOverGround(BoatClass boatClass, Speed windSpeed, LegType legType) throws NotEnoughDataHasBeenAddedException; - - Set getAvailableBoatClasses(); + ClusterGroup getSpeedCluster(); } \ No newline at end of file diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/MovingAverageProcessorImpl.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/MovingAverageProcessorImpl.java index da045353576..0c0d6093961 100755 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/MovingAverageProcessorImpl.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/MovingAverageProcessorImpl.java @@ -1,9 +1,7 @@ package com.sap.sailing.polars.mining; import java.util.HashMap; -import java.util.HashSet; import java.util.Map; -import java.util.Set; import java.util.logging.Logger; import com.sap.sailing.domain.base.BoatClass; @@ -43,8 +41,6 @@ public class MovingAverageProcessorImpl implements MovingAverageProcessor { private final ClusterGroup speedClusterGroup; - private final Set availableBoatClasses = new HashSet<>(); - public MovingAverageProcessorImpl(ClusterGroup speedClusterGroup) { this.speedClusterGroup = speedClusterGroup; } @@ -79,7 +75,6 @@ public class MovingAverageProcessorImpl implements MovingAverageProcessor { BearingWithConfidence angleToTheWind = fix.getAbsoluteAngleToTheWind(); WindWithConfidence> windSpeed = fix.getWind(); SpeedWithBearingWithConfidence boatSpeedWithConfidence = fix.getBoatSpeed(); - availableBoatClasses.add(element.getDataEntry().getBoatClass()); WindWithConfidence> windWithConfidenceForSpeed = windSpeed; double confidenceForWindSpeed = windWithConfidenceForSpeed.getConfidence(); double confidenceForWindBearing = angleToTheWind.getConfidence(); @@ -158,10 +153,6 @@ public class MovingAverageProcessorImpl implements MovingAverageProcessor { throw new RuntimeException("Polar Data Miner failed.", failure); } - public Set getAvailableBoatClasses() { - return availableBoatClasses; - } - @Override public Class> getInputType() { // TODO Auto-generated method stub @@ -218,4 +209,9 @@ public class MovingAverageProcessorImpl implements MovingAverageProcessor { return compoundKey; } + @Override + public ClusterGroup getSpeedCluster() { + return speedClusterGroup; + } + } diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/PolarDataMiner.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/PolarDataMiner.java index 32be9b2e9f8..290929a625c 100755 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/PolarDataMiner.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/PolarDataMiner.java @@ -1,6 +1,5 @@ package com.sap.sailing.polars.mining; -import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -37,10 +36,8 @@ import com.sap.sailing.domain.common.TrackedRaceStatusEnum; import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; -import com.sap.sailing.domain.common.impl.PolarSheetGenerationSettingsImpl; import com.sap.sailing.domain.common.impl.PolarSheetsDataImpl; import com.sap.sailing.domain.common.impl.PolarSheetsHistogramDataImpl; -import com.sap.sailing.domain.common.impl.WindSpeedSteppingWithMaxDistance; import com.sap.sailing.domain.common.tracking.GPSFixMoving; import com.sap.sailing.domain.polars.NotEnoughDataHasBeenAddedException; import com.sap.sailing.domain.polars.PolarsChangedListener; @@ -57,20 +54,38 @@ import com.sap.sse.datamining.impl.components.ParallelFilteringProcessor; import com.sap.sse.datamining.impl.components.ParallelMultiDimensionsValueNestingGroupingProcessor; import com.sap.sse.datamining.impl.functions.SimpleParameterizedFunction; -public class PolarDataMiner implements Serializable { +public class PolarDataMiner { - private static final long serialVersionUID = -3916741273749925910L; private static final int EXECUTOR_QUEUE_SIZE = 100; private static final int THREAD_POOL_SIZE = Math.max((int) (Runtime.getRuntime().availableProcessors() * (3.0/4.0)), 3); - private final transient ThreadPoolExecutor executor = createExecutor(); - private final PolarSheetGenerationSettings backendPolarSheetGenerationSettings; - private final transient Map> fixesForRacesWhichAreStillLoading = new HashMap<>(); + private final ThreadPoolExecutor executor = createExecutor(); + private final Map> fixesForRacesWhichAreStillLoading = new HashMap<>(); - private final transient Queue fixQueue = new ConcurrentLinkedQueue(); + private final Queue fixQueue = new ConcurrentLinkedQueue(); private static final Logger logger = Logger.getLogger(PolarDataMiner.class.getSimpleName()); - private final transient ConcurrentHashMap> listeners = new ConcurrentHashMap<>(); + private final ConcurrentHashMap> listeners = new ConcurrentHashMap<>(); + + private ParallelFilteringProcessor preFilteringProcessor; + + + private final PolarSheetGenerationSettings backendPolarSheetGenerationSettings; + + /** + * This processor keeps track of the moving average of the speed values and the average angle for each course (legtype tack combination) + */ + private final MovingAverageProcessor movingAverageProcessor; + + /** + * This processor uses two cubic regressions angle to the true wind over windspeed and boatspeed over windspeed for each + * course (legtype tack combination) + */ + private final CubicRegressionPerCourseProcessor cubicRegressionPerCourseProcessor; + + private final SpeedRegressionPerAngleClusterProcessor speedRegressionPerAngleClusterProcessor; + private final ClusterGroup speedClusterGroup; + private final ClusterGroup angleClusterGroup; private ThreadPoolExecutor createExecutor() { return new ThreadPoolExecutor(THREAD_POOL_SIZE, THREAD_POOL_SIZE, 60, TimeUnit.SECONDS, @@ -94,28 +109,17 @@ public class PolarDataMiner implements Serializable { }; } - - - /** - * This processor keeps track of the moving average of the speed values and the average angle for each course (legtype tack combination) - */ - private MovingAverageProcessor movingAverageProcessor; - - /** - * This processor uses two cubic regressions angle to the true wind over windspeed and boatspeed over windspeed for each - * course (legtype tack combination) - */ - private CubicRegressionPerCourseProcessor cubicRegressionPerCourseProcessor; - - private SpeedRegressionPerAngleClusterProcessor speedRegressionPerAngleClusterProcessor; - private transient ParallelFilteringProcessor preFilteringProcessor; - - public PolarDataMiner() { - this(PolarSheetGenerationSettingsImpl.createBackendPolarSettings()); - } - - public PolarDataMiner(PolarSheetGenerationSettings backendPolarSettings) { + public PolarDataMiner(PolarSheetGenerationSettings backendPolarSettings, MovingAverageProcessor movingAverageProcessor, + CubicRegressionPerCourseProcessor cubicRegressionPerCourseProcessor, SpeedRegressionPerAngleClusterProcessor speedRegressionPerAngleClusterProcessor, + ClusterGroup speedClusterGroup, ClusterGroup angleClusterGroup) { + cubicRegressionPerCourseProcessor.setListeners(listeners); + speedRegressionPerAngleClusterProcessor.setListeners(listeners); backendPolarSheetGenerationSettings = backendPolarSettings; + this.movingAverageProcessor = movingAverageProcessor; + this.cubicRegressionPerCourseProcessor = cubicRegressionPerCourseProcessor; + this.speedRegressionPerAngleClusterProcessor = speedRegressionPerAngleClusterProcessor; + this.speedClusterGroup = speedClusterGroup; + this.angleClusterGroup = angleClusterGroup; try { setUpWorkflow(); } catch (ClassCastException | NoSuchMethodException | SecurityException e) { @@ -126,10 +130,6 @@ public class PolarDataMiner implements Serializable { private void setUpWorkflow() throws ClassCastException, NoSuchMethodException, SecurityException { - WindSpeedSteppingWithMaxDistance stepping = backendPolarSheetGenerationSettings.getWindSpeedStepping(); - final ClusterGroup speedClusterGroup = SpeedClusterGroupFromWindSteppingCreator - .createSpeedClusterGroupFrom(stepping); - movingAverageProcessor = new MovingAverageProcessorImpl(speedClusterGroup); Collection, ?>> movingAverageGrouperResultReceivers = new ArrayList, ?>>(); movingAverageGrouperResultReceivers.add(movingAverageProcessor); @@ -141,8 +141,6 @@ public class PolarDataMiner implements Serializable { Processor> movingAverageGroupingProcessor = new ParallelMultiDimensionsValueNestingGroupingProcessor( GPSFixMovingWithPolarContext.class, executor, movingAverageGrouperResultReceivers, parameterizedDimensions); - - cubicRegressionPerCourseProcessor = new CubicRegressionPerCourseProcessor(listeners); Collection, ?>> regressionPerCourseGrouperResultReceivers = new ArrayList, ?>>(); regressionPerCourseGrouperResultReceivers.add(cubicRegressionPerCourseProcessor); @@ -153,8 +151,6 @@ public class PolarDataMiner implements Serializable { Processor> cubicRegressionPerCourseGroupingProcessor = new ParallelMultiDimensionsValueNestingGroupingProcessor( GPSFixMovingWithPolarContext.class, executor, regressionPerCourseGrouperResultReceivers, parameterizedDimensionsForCubicRegression); - ClusterGroup angleClusterGroup = createAngleClusterGroup(); - speedRegressionPerAngleClusterProcessor = new SpeedRegressionPerAngleClusterProcessor(angleClusterGroup, listeners); Collection, ?>> regressionPerAngleClusterGrouperResultReceivers = new ArrayList, ?>>(); regressionPerAngleClusterGrouperResultReceivers.add(speedRegressionPerAngleClusterProcessor); @@ -218,10 +214,6 @@ public class PolarDataMiner implements Serializable { } - private ClusterGroup createAngleClusterGroup() { - return new BearingClusterGroup(0, 180, 5); - } - public void addFix(GPSFixMoving fix, Competitor competitor, TrackedRace trackedRace) { GPSFixMovingWithOriginInfo fixWithOriginInfo = new GPSFixMovingWithOriginInfo(fix, trackedRace, competitor); if (trackedRace.getStatus().getStatus() == TrackedRaceStatusEnum.LOADING) { @@ -389,7 +381,7 @@ public class PolarDataMiner implements Serializable { } public Set getAvailableBoatClasses() { - return movingAverageProcessor.getAvailableBoatClasses(); + return speedRegressionPerAngleClusterProcessor.getAvailableBoatClasses(); } public int[] getDataCountsForWindSpeed(BoatClass boatClass, Speed windSpeed, int startAngleInclusive, int endAngleExclusive) { @@ -460,4 +452,20 @@ public class PolarDataMiner implements Serializable { listenersForBoatClass.remove(listener); } } + + public MovingAverageProcessor getMovingAverageProcessor() { + return movingAverageProcessor; + } + + public CubicRegressionPerCourseProcessor getCubicRegressionPerCourseProcessor() { + return cubicRegressionPerCourseProcessor; + } + + public SpeedRegressionPerAngleClusterProcessor getSpeedRegressionPerAngleClusterProcessor() { + return speedRegressionPerAngleClusterProcessor; + } + + public PolarSheetGenerationSettings getPolarSheetGenerationSettings() { + return backendPolarSheetGenerationSettings; + } } diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/SpeedRegressionPerAngleClusterProcessor.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/SpeedRegressionPerAngleClusterProcessor.java index 9d2ca7f4df8..0233a5db2c5 100644 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/SpeedRegressionPerAngleClusterProcessor.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/SpeedRegressionPerAngleClusterProcessor.java @@ -2,6 +2,7 @@ package com.sap.sailing.polars.mining; import java.io.Serializable; import java.util.HashMap; +import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; @@ -44,11 +45,12 @@ public class SpeedRegressionPerAngleClusterProcessor implements /** * FIXME make sure listeners and replication interact correctly */ - private final transient ConcurrentHashMap> listeners; + private transient ConcurrentHashMap> listeners; + + private final Set availableBoatClasses = new HashSet(); - public SpeedRegressionPerAngleClusterProcessor(ClusterGroup angleClusterGroup, ConcurrentHashMap> listeners) { + public SpeedRegressionPerAngleClusterProcessor(ClusterGroup angleClusterGroup) { this.angleClusterGroup = angleClusterGroup; - this.listeners = listeners; } @Override @@ -77,6 +79,7 @@ public class SpeedRegressionPerAngleClusterProcessor implements } GPSFixMovingWithPolarContext fix = element.getDataEntry(); regression.addData(fix.getWind().getObject().getKnots(), fix.getBoatSpeed().getObject().getKnots()); + availableBoatClasses.add(boatClass); Set listenersForBoatClass = listeners.get(fix.getBoatClass()); if (listenersForBoatClass != null) { for (PolarsChangedListener listener : listenersForBoatClass) { @@ -162,6 +165,14 @@ public class SpeedRegressionPerAngleClusterProcessor implements return polynomialFunction; } + public void setListeners(ConcurrentHashMap> listeners) { + this.listeners = listeners; + } + + Set getAvailableBoatClasses() { + return availableBoatClasses; + } + @Override public Class> getInputType() { // TODO Auto-generated method stub @@ -202,4 +213,8 @@ public class SpeedRegressionPerAngleClusterProcessor implements return null; } + public ClusterGroup getAngleCluster() { + return angleClusterGroup; + } + } diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, auto-replicate).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, auto-replicate).launch index ee9da52e684..211f921f890 100644 --- a/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, auto-replicate).launch +++ b/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, auto-replicate).launch @@ -19,7 +19,7 @@ - + diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java index 9da4f310d54..b026d4826b9 100644 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java @@ -3191,6 +3191,7 @@ public class RacingEventServiceImpl implements RacingEventService, ClearStateTes public void setPolarDataService(PolarDataService service) { if (this.polarDataService == null) { polarDataService = service; + polarDataService.registerDomainFactory(baseDomainFactory); setPolarDataServiceOnAllTrackedRaces(service); } } @@ -3216,6 +3217,7 @@ public class RacingEventServiceImpl implements RacingEventService, ClearStateTes public void unsetPolarDataService(PolarDataService service) { if (polarDataService == service) { + polarDataService.unregisterDomainFactory(baseDomainFactory); polarDataService = null; setPolarDataService(null); } From 7f9da36277544665b9492df8185efd281a84ca8f Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Sun, 19 Jul 2015 11:28:35 +0200 Subject: [PATCH 06/31] solving a NPE related to missing mark positions which had a severe effect on ranking based on windward leg distances --- .../domain/ranking/AbstractRankingMetric.java | 11 ++++-- .../domain/tracking/impl/TrackedLegImpl.java | 37 ++++++++++--------- 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/AbstractRankingMetric.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/AbstractRankingMetric.java index 63a9d72fdc8..dd4bda1f732 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/AbstractRankingMetric.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/AbstractRankingMetric.java @@ -593,7 +593,9 @@ public abstract class AbstractRankingMetric implements RankingMetric { * For each leg the total windward distance sailed is limited to the leg's windward distance at its * {@link TrackedLeg#getReferenceTimePoint() reference time point}. This ensures that significantly "overstaying" the lay lines * doesn't let a competitor rank better than one who already passed the mark but traveled little windward distance in - * the next leg. + * the next leg.

+ * + * If mark positions along the way are not known, the windward distance of those legs will be counted as 0. * * @param timePoint needed to determine competitor's position at that time point; note that the * time point for wind approximation is taken to be a reference time point selected based on the mark passings @@ -620,7 +622,7 @@ public abstract class AbstractRankingMetric implements RankingMetric { if (estimatedPosition != null) { final Distance windwardDistanceFromLegStart = trackedLeg.getWindwardDistanceFromLegStart(estimatedPosition, cache); final Distance legWindwardDistance = trackedLeg.getWindwardDistance(cache); - if (legWindwardDistance.compareTo(windwardDistanceFromLegStart) < 0) { + if (legWindwardDistance != null && legWindwardDistance.compareTo(windwardDistanceFromLegStart) < 0) { d = d.add(legWindwardDistance); } else { // if the competitor is currently at the mark rounding, the windward distance within the leg may @@ -632,7 +634,10 @@ public abstract class AbstractRankingMetric implements RankingMetric { } break; } else { - d = d.add(trackedLeg.getWindwardDistance(cache)); + final Distance legWindwardDistance = trackedLeg.getWindwardDistance(cache); + if (legWindwardDistance != null) { + d = d.add(legWindwardDistance); + } } } } diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegImpl.java index 47b7e3714a3..772fa02000e 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegImpl.java @@ -454,27 +454,30 @@ public class TrackedLegImpl implements TrackedLeg { Distance getWindwardDistance(final Position pos1, final Position pos2, TimePoint at, WindPositionMode windPositionMode, WindLegTypeAndLegBearingCache cache) { Distance result; - try { - final LegType legType = cache.getLegType(this, at); - if (legType != LegType.REACHING) { // upwind or downwind - final Position effectivePosition = getEffectiveWindPosition( - () -> pos1.translateGreatCircle(pos1.getBearingGreatCircle(pos2), pos1.getDistance(pos2).scale(0.5)), - at, windPositionMode); - Wind wind = getTrackedRace().getWind(effectivePosition, at); - if (wind == null) { - result = pos2.alongTrackDistance(pos1, cache.getLegBearing(this, at)); + if (pos1 == null || pos2 == null) { + result = null; + } else { + try { + final LegType legType = cache.getLegType(this, at); + if (legType != LegType.REACHING) { // upwind or downwind + final Position effectivePosition = getEffectiveWindPosition(() -> pos1.translateGreatCircle( + pos1.getBearingGreatCircle(pos2), pos1.getDistance(pos2).scale(0.5)), at, windPositionMode); + Wind wind = getTrackedRace().getWind(effectivePosition, at); + if (wind == null) { + result = pos2.alongTrackDistance(pos1, cache.getLegBearing(this, at)); + } else { + Position projectionToLineThroughPos2 = pos1.projectToLineThrough(pos2, wind.getBearing()); + result = pos2.alongTrackDistance(projectionToLineThroughPos2, + legType == LegType.UPWIND ? wind.getFrom() : wind.getBearing()); + } } else { - Position projectionToLineThroughPos2 = pos1.projectToLineThrough(pos2, wind.getBearing()); - result = pos2.alongTrackDistance(projectionToLineThroughPos2, - legType == LegType.UPWIND ? wind.getFrom() : wind.getBearing()); + // reaching leg, return distance projected onto leg's bearing + result = pos2.alongTrackDistance(pos1, cache.getLegBearing(this, at)); } - } else { - // reaching leg, return distance projected onto leg's bearing + } catch (NoWindException e) { + // no wind information; use along-track distance as fallback result = pos2.alongTrackDistance(pos1, cache.getLegBearing(this, at)); } - } catch (NoWindException e) { - // no wind information; use along-track distance as fallback - result = pos2.alongTrackDistance(pos1, cache.getLegBearing(this, at)); } return result; } From 59b76b9848827dc48ec91abda473c0d7ff432218 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Sun, 19 Jul 2015 15:26:18 +0200 Subject: [PATCH 07/31] let TrackedRaceImpl resolve against DomainFactory which now has a RaceLogResolver which is provided by RacingEventService; in production mode, the RacingEventService constructors make sure that the DomainFactory uses the RacingEventService as its RaceLogResolver. The resolver is used by TrackedRaceImpl to set its raceLogResolver after de-serialization --- .../domain/base/SharedDomainFactory.java | 3 + .../base/impl/SharedDomainFactoryImpl.java | 15 ++- .../impl/DomainFactoryTest.java | 2 +- .../domain/test/CompetitorListenerTest.java | 4 +- .../sailing/domain/test/CourseUpdateTest.java | 2 +- .../test/LeaderboardCourseChangeTest.java | 2 +- .../test/MultipleClassesInRegattaTest.java | 2 +- .../domain/test/OfflineSerializationTest.java | 34 +++--- .../domain/test/OnlineTracTracBasedTest.java | 4 +- ...nicodeCharactersInCompetitorNamesTest.java | 2 +- .../domain/test/mock/MockedTrackedRace.java | 7 ++ ...ockedTrackedRaceWithStartTimeAndRanks.java | 7 ++ .../sailing/domain/base/DomainFactory.java | 2 +- .../domain/base/impl/DomainFactoryImpl.java | 9 +- .../sailing/domain/tracking/TrackedRace.java | 4 +- .../domain/tracking/impl/TrackedRaceImpl.java | 12 ++ .../gwt/ui/test/MockedTrackedRace.java | 7 ++ .../mongodb/test/StoreCompetitorTest.java | 2 +- .../TestStoringAndRetrievingLeaderboards.java | 2 +- .../test/AbstractServerReplicationTest.java | 2 +- ...LeaderboardCorrectionsReplicationTest.java | 4 +- .../server/test/CompetitorStoreTest.java | 4 +- .../server/test/MasterDataImportTest.java | 2 +- .../impl/PersistentCompetitorStore.java | 6 +- .../server/impl/RacingEventServiceImpl.java | 108 +++++++++++++----- .../server/masterdata/DummyTrackedRace.java | 7 ++ .../app/data/InMemoryDataStore.java | 2 +- 27 files changed, 182 insertions(+), 75 deletions(-) diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/SharedDomainFactory.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/SharedDomainFactory.java index 328868c02ab..9afe77af0aa 100755 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/SharedDomainFactory.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/SharedDomainFactory.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.List; import java.util.UUID; +import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RaceLogResolver; import com.sap.sailing.domain.base.configuration.DeviceConfigurationMatcher; import com.sap.sailing.domain.common.MarkType; import com.sap.sailing.domain.common.PassingInstruction; @@ -108,4 +109,6 @@ public interface SharedDomainFactory extends CompetitorFactory { ControlPointWithTwoMarks getOrCreateControlPointWithTwoMarks(Serializable id, String name, Mark left, Mark right); ControlPointWithTwoMarks getOrCreateControlPointWithTwoMarks(String id, String name, Mark left, Mark right); + + RaceLogResolver getRaceLogResolver(); } diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/SharedDomainFactoryImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/SharedDomainFactoryImpl.java index a2ef6df5f73..c3fbac12988 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/SharedDomainFactoryImpl.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/SharedDomainFactoryImpl.java @@ -16,6 +16,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; +import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RaceLogResolver; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.CompetitorStore; @@ -106,14 +107,18 @@ public class SharedDomainFactoryImpl implements SharedDomainFactory { private final Set mayStartWithNoUpwindLeg; + private final RaceLogResolver raceLogResolver; + /** * Uses a transient competitor store + * @param raceLogResolver TODO */ - public SharedDomainFactoryImpl() { - this(new TransientCompetitorStoreImpl()); + public SharedDomainFactoryImpl(RaceLogResolver raceLogResolver) { + this(new TransientCompetitorStoreImpl(), raceLogResolver); } - public SharedDomainFactoryImpl(CompetitorStore competitorStore) { + public SharedDomainFactoryImpl(CompetitorStore competitorStore, RaceLogResolver raceLogResolver) { + this.raceLogResolver = raceLogResolver; waypointCacheReferenceQueue = new ReferenceQueue(); nationalityCache = new HashMap(); markCache = new HashMap(); @@ -386,4 +391,8 @@ public class SharedDomainFactoryImpl implements SharedDomainFactory { return markCache.get(markIdCache.get(toStringRepresentationOfID)); } + @Override + public RaceLogResolver getRaceLogResolver() { + return raceLogResolver; + } } diff --git a/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryTest.java b/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryTest.java index f6b46ce87d1..64c8053f107 100644 --- a/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryTest.java +++ b/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryTest.java @@ -17,7 +17,7 @@ public class DomainFactoryTest { @Before public void before() { - com.sap.sailing.domain.base.DomainFactory baseDomainFactory = new com.sap.sailing.domain.base.impl.DomainFactoryImpl(); + com.sap.sailing.domain.base.DomainFactory baseDomainFactory = new com.sap.sailing.domain.base.impl.DomainFactoryImpl((srlid)->null); swissTimingDomainFactory = new com.sap.sailing.domain.swisstimingadapter.impl.DomainFactoryImpl( baseDomainFactory); } diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CompetitorListenerTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CompetitorListenerTest.java index ab97edcbbff..8635dc19eca 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CompetitorListenerTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CompetitorListenerTest.java @@ -63,7 +63,7 @@ public class CompetitorListenerTest extends AbstractSerializationTest { @Before public void setUp() { - baseDomainFactory = new DomainFactoryImpl(); + baseDomainFactory = new DomainFactoryImpl((srlid)->null); competitor = TrackBasedTest.createCompetitor("Hasso"); nationalityChanged = false; whatChangedNationality = null; @@ -251,7 +251,7 @@ public class CompetitorListenerTest extends AbstractSerializationTest { @Test public void testCompetitorSerializationLosesAllExternalListeners() throws ClassNotFoundException, IOException { - DomainFactory baseDomainFactory = new DomainFactoryImpl(); + DomainFactory baseDomainFactory = new DomainFactoryImpl((srlid)->null); DynamicCompetitor clonedCompetitor = cloneBySerialization(competitor, baseDomainFactory); clonedCompetitor.setName("Dr. Hasso Plattner"); clonedCompetitor.getBoat().setSailId("POR 40"); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java index c777e2d010c..d5c8a4b7178 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java @@ -80,7 +80,7 @@ public class CourseUpdateTest extends AbstractTracTracLiveTest { @Before public void setUp() throws MalformedURLException, IOException, InterruptedException, URISyntaxException, SubscriberInitializationException, ParseException, CreateModelException { super.setUp(); - domainFactory = new DomainFactoryImpl(new com.sap.sailing.domain.base.impl.DomainFactoryImpl()); + domainFactory = new DomainFactoryImpl(new com.sap.sailing.domain.base.impl.DomainFactoryImpl((srlid)->null)); domainRegatta = domainFactory.getOrCreateDefaultRegatta(EmptyRaceLogStore.INSTANCE, EmptyRegattaLogStore.INSTANCE, getTracTracRace(), /* trackedRegattaRegistry */ null); trackedRegatta = new DynamicTrackedRegattaImpl(domainRegatta); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardCourseChangeTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardCourseChangeTest.java index 62fceea3754..db6cfdb55e2 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardCourseChangeTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardCourseChangeTest.java @@ -118,7 +118,7 @@ public class LeaderboardCourseChangeTest { ThresholdBasedResultDiscardingRule rule = new ThresholdBasedResultDiscardingRuleImpl(ruleRaw); Leaderboard leaderboard = new RegattaLeaderboardImpl(mockedRegatta, rule); - DomainFactory baseDomainFactory = new DomainFactoryImpl(); + DomainFactory baseDomainFactory = new DomainFactoryImpl((srlid)->null); LeaderboardDTO leaderboardDTO = leaderboard.getLeaderboardDTO(timePoint, raceColumnNames, false, trackedRegattaRegistry, baseDomainFactory, /* fillNetPointsUncorrected */ false); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MultipleClassesInRegattaTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MultipleClassesInRegattaTest.java index 7cbbad0ae5e..7e7a7e29630 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MultipleClassesInRegattaTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MultipleClassesInRegattaTest.java @@ -39,7 +39,7 @@ public class MultipleClassesInRegattaTest { @Before public void setUp() { - domainFactory = new DomainFactoryImpl(new com.sap.sailing.domain.base.impl.DomainFactoryImpl()); + domainFactory = new DomainFactoryImpl(new com.sap.sailing.domain.base.impl.DomainFactoryImpl((srlid)->null)); } @Test diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OfflineSerializationTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OfflineSerializationTest.java index 6e3bb03cbf0..72f002fbfb8 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OfflineSerializationTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OfflineSerializationTest.java @@ -59,7 +59,7 @@ public class OfflineSerializationTest extends AbstractSerializationTest { */ @Test public void testHashCodeOfSerializedPairIsConsistent() throws ClassNotFoundException, IOException { - DomainFactory receiverDomainFactory = new DomainFactoryImpl(); + DomainFactory receiverDomainFactory = new DomainFactoryImpl((srlid)->null); final Throwable s1 = new Throwable(); final Throwable s2 = new Throwable(); com.sap.sse.common.Util.Pair p = @@ -91,7 +91,7 @@ public class OfflineSerializationTest extends AbstractSerializationTest { */ @Test public void testSerializingIntArray() throws ClassNotFoundException, IOException { - DomainFactory receiverDomainFactory = new DomainFactoryImpl(); + DomainFactory receiverDomainFactory = new DomainFactoryImpl((srlid)->null); int[] intArray = new int[] { 5, 8 }; int[] clone = cloneBySerialization(intArray, receiverDomainFactory); assertTrue(Arrays.equals(intArray, clone)); @@ -99,7 +99,7 @@ public class OfflineSerializationTest extends AbstractSerializationTest { @Test public void testSerializingEventWithLeaderboardGroups() throws ClassNotFoundException, IOException { - DomainFactory receiverDomainFactory = new DomainFactoryImpl(); + DomainFactory receiverDomainFactory = new DomainFactoryImpl((srlid)->null); Event e = new EventImpl("Event Name", MillisecondsTimePoint.now(), MillisecondsTimePoint.now().plus( Duration.ONE_DAY.times(10)), "At Home", /* is public */true, UUID.randomUUID()); LeaderboardGroup lg1 = new LeaderboardGroupImpl("LG1", "LG1 Description", /* displayName */ null, /* displayGroupsInReverseOrder */ false, Collections. emptyList()); @@ -117,7 +117,7 @@ public class OfflineSerializationTest extends AbstractSerializationTest { */ @Test public void testSerializingResultDiscardingRuleImpl() throws ClassNotFoundException, IOException { - DomainFactory receiverDomainFactory = new DomainFactoryImpl(); + DomainFactory receiverDomainFactory = new DomainFactoryImpl((srlid)->null); ThresholdBasedResultDiscardingRuleImpl rdri = new ThresholdBasedResultDiscardingRuleImpl(new int[] { 5, 8 }); ThresholdBasedResultDiscardingRuleImpl clone = cloneBySerialization(rdri, receiverDomainFactory); assertTrue(Arrays.equals(rdri.getDiscardIndexResultsStartingWithHowManyRaces(), @@ -136,7 +136,7 @@ public class OfflineSerializationTest extends AbstractSerializationTest { final double FACTOR = 2.0; overallLeaderboard.getRaceColumnByName("Test Leaderboard").setFactor(FACTOR); - DomainFactory receiverDomainFactory = new DomainFactoryImpl(); + DomainFactory receiverDomainFactory = new DomainFactoryImpl((srlid)->null); LeaderboardGroup clone = cloneBySerialization(leaderboardGroup, receiverDomainFactory); assertEquals(FACTOR, overallLeaderboard.getRaceColumnByName("Test Leaderboard").getFactor(), 0.00000001); assertEquals(FACTOR, clone.getOverallLeaderboard().getRaceColumnByName("Test Leaderboard").getFactor(), 0.00000001); @@ -144,8 +144,8 @@ public class OfflineSerializationTest extends AbstractSerializationTest { @Test public void testIdentityStabilityOfMarkSerialization() throws ClassNotFoundException, IOException { - DomainFactory senderDomainFactory = new DomainFactoryImpl(); - DomainFactory receiverDomainFactory = new DomainFactoryImpl(); + DomainFactory senderDomainFactory = new DomainFactoryImpl((srlid)->null); + DomainFactory receiverDomainFactory = new DomainFactoryImpl((srlid)->null); Mark sendersMark1 = senderDomainFactory.getOrCreateMark("TestBuoy1"); Mark receiversMark1 = cloneBySerialization(sendersMark1, receiverDomainFactory); Mark receiversSecondCopyOfMark1 = cloneBySerialization(sendersMark1, receiverDomainFactory); @@ -154,8 +154,8 @@ public class OfflineSerializationTest extends AbstractSerializationTest { @Test public void testIdentityStabilityOfWaypointSerialization() throws ClassNotFoundException, IOException { - DomainFactory senderDomainFactory = new DomainFactoryImpl(); - DomainFactory receiverDomainFactory = new DomainFactoryImpl(); + DomainFactory senderDomainFactory = new DomainFactoryImpl((srlid)->null); + DomainFactory receiverDomainFactory = new DomainFactoryImpl((srlid)->null); Mark sendersMark1 = senderDomainFactory.getOrCreateMark("TestBuoy1"); Waypoint sendersWaypoint1 = senderDomainFactory.createWaypoint(sendersMark1, /*passingInstruction*/null); Waypoint receiversWaypoint1 = cloneBySerialization(sendersWaypoint1, receiverDomainFactory); @@ -165,8 +165,8 @@ public class OfflineSerializationTest extends AbstractSerializationTest { @Test public void testIdentityStabilityOfBoatClassSerialization() throws ClassNotFoundException, IOException { - DomainFactory senderDomainFactory = new DomainFactoryImpl(); - DomainFactory receiverDomainFactory = new DomainFactoryImpl(); + DomainFactory senderDomainFactory = new DomainFactoryImpl((srlid)->null); + DomainFactory receiverDomainFactory = new DomainFactoryImpl((srlid)->null); BoatClass sendersBoatClass1 = senderDomainFactory.getOrCreateBoatClass("49er", /* typicallyStartsUpwind */ true); BoatClass receiversBoatClass1 = cloneBySerialization(sendersBoatClass1, receiverDomainFactory); BoatClass receiversSecondCopyOfBoatClass1 = cloneBySerialization(sendersBoatClass1, receiverDomainFactory); @@ -175,8 +175,8 @@ public class OfflineSerializationTest extends AbstractSerializationTest { @Test public void testIdentityStabilityOfNationalitySerialization() throws ClassNotFoundException, IOException { - DomainFactory senderDomainFactory = new DomainFactoryImpl(); - DomainFactory receiverDomainFactory = new DomainFactoryImpl(); + DomainFactory senderDomainFactory = new DomainFactoryImpl((srlid)->null); + DomainFactory receiverDomainFactory = new DomainFactoryImpl((srlid)->null); Nationality sendersNationality1 = senderDomainFactory.getOrCreateNationality("GER"); Nationality receiversNationality1 = cloneBySerialization(sendersNationality1, receiverDomainFactory); Nationality receiversSecondCopyOfNationality1 = cloneBySerialization(sendersNationality1, receiverDomainFactory); @@ -185,8 +185,8 @@ public class OfflineSerializationTest extends AbstractSerializationTest { @Test public void testIdentityStabilityOfCompetitorSerialization() throws ClassNotFoundException, IOException { - DomainFactory senderDomainFactory = new DomainFactoryImpl(); - DomainFactory receiverDomainFactory = new DomainFactoryImpl(); + DomainFactory senderDomainFactory = new DomainFactoryImpl((srlid)->null); + DomainFactory receiverDomainFactory = new DomainFactoryImpl((srlid)->null); String competitorName = "Tina Maximiliane Lutz"; Competitor sendersCompetitor1 = new CompetitorImpl(123, competitorName, Color.RED, null, null, new TeamImpl("STG", Collections.singleton( new PersonImpl(competitorName, senderDomainFactory.getOrCreateNationality("GER"), @@ -201,8 +201,8 @@ public class OfflineSerializationTest extends AbstractSerializationTest { @Test public void ensureSameObjectWrittenTwiceComesOutIdentical() throws ClassNotFoundException, IOException { - final DomainFactoryImpl senderDomainFactory = new DomainFactoryImpl(); - DomainFactory receiverDomainFactory = new DomainFactoryImpl(); + final DomainFactoryImpl senderDomainFactory = new DomainFactoryImpl((srlid)->null); + DomainFactory receiverDomainFactory = new DomainFactoryImpl((srlid)->null); Nationality n = senderDomainFactory.getOrCreateNationality("GER"); Object[] copies = cloneManyBySerialization(receiverDomainFactory, n, n); assertEquals(2, copies.length); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OnlineTracTracBasedTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OnlineTracTracBasedTest.java index 28341dce76c..815c328937b 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OnlineTracTracBasedTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OnlineTracTracBasedTest.java @@ -86,7 +86,7 @@ public abstract class OnlineTracTracBasedTest extends AbstractTracTracLiveTest { @Before public void setUp() throws MalformedURLException, IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException { - domainFactory = new DomainFactoryImpl(new com.sap.sailing.domain.base.impl.DomainFactoryImpl()); + domainFactory = new DomainFactoryImpl(new com.sap.sailing.domain.base.impl.DomainFactoryImpl((srlid)->null)); // keep superclass implementation from automatically setting up for a Weymouth event and force subclasses // to select a race } @@ -219,7 +219,7 @@ public abstract class OnlineTracTracBasedTest extends AbstractTracTracLiveTest { throws FileNotFoundException, MalformedURLException, URISyntaxException, SubscriberInitializationException, CreateModelException { super.setUp(paramUrl, liveUri, storedUri); if (domainFactory == null) { - domainFactory = new DomainFactoryImpl(new com.sap.sailing.domain.base.impl.DomainFactoryImpl()); + domainFactory = new DomainFactoryImpl(new com.sap.sailing.domain.base.impl.DomainFactoryImpl((srlid)->null)); } domainEvent = domainFactory.getOrCreateDefaultRegatta(EmptyRaceLogStore.INSTANCE, EmptyRegattaLogStore.INSTANCE, getTracTracRace(), /* trackedRegattaRegistry */ null); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/UnicodeCharactersInCompetitorNamesTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/UnicodeCharactersInCompetitorNamesTest.java index 6d6652b7772..eefd9495d9c 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/UnicodeCharactersInCompetitorNamesTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/UnicodeCharactersInCompetitorNamesTest.java @@ -38,7 +38,7 @@ public class UnicodeCharactersInCompetitorNamesTest { @Before public void setUp() { - domainFactory = new DomainFactoryImpl(new com.sap.sailing.domain.base.impl.DomainFactoryImpl()); + domainFactory = new DomainFactoryImpl(new com.sap.sailing.domain.base.impl.DomainFactoryImpl((srlid)->null)); } public static void main(String[] args) throws URISyntaxException, IOException, InterruptedException, CreateModelException, SubscriberInitializationException { diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java index 0a44d6c0851..4c3d0485d2f 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java @@ -23,6 +23,7 @@ import com.sap.sailing.domain.base.RaceDefinition; import com.sap.sailing.domain.base.Regatta; import com.sap.sailing.domain.base.RegattaListener; import com.sap.sailing.domain.base.Series; +import com.sap.sailing.domain.base.SharedDomainFactory; import com.sap.sailing.domain.base.Sideline; import com.sap.sailing.domain.base.SpeedWithConfidence; import com.sap.sailing.domain.base.Waypoint; @@ -75,6 +76,7 @@ import com.sap.sailing.domain.tracking.WindTrack; import com.sap.sailing.domain.tracking.WindWithConfidence; import com.sap.sailing.domain.tracking.impl.WindTrackImpl; import com.sap.sse.common.Duration; +import com.sap.sse.common.IsManagedByCache; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; @@ -985,4 +987,9 @@ public class MockedTrackedRace implements DynamicTrackedRace { public RankingMetric getRankingMetric() { return null; } + + @Override + public IsManagedByCache resolve(SharedDomainFactory domainFactory) { + return this; + } } diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java index a07b567922f..2267dc3d786 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java @@ -14,6 +14,7 @@ import com.sap.sailing.domain.base.Leg; import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.base.RaceDefinition; import com.sap.sailing.domain.base.Regatta; +import com.sap.sailing.domain.base.SharedDomainFactory; import com.sap.sailing.domain.base.Sideline; import com.sap.sailing.domain.base.SpeedWithConfidence; import com.sap.sailing.domain.base.Waypoint; @@ -57,6 +58,7 @@ import com.sap.sailing.domain.tracking.WindTrack; import com.sap.sailing.domain.tracking.WindWithConfidence; import com.sap.sailing.domain.tracking.impl.DynamicTrackedRegattaImpl; import com.sap.sse.common.Duration; +import com.sap.sse.common.IsManagedByCache; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; @@ -646,4 +648,9 @@ public class MockedTrackedRaceWithStartTimeAndRanks implements TrackedRace { @Override public void detachRaceExecutionOrderProvider(RaceExecutionOrderProvider raceExecutionOrderProvider) { } + + @Override + public IsManagedByCache resolve(SharedDomainFactory domainFactory) { + return this; + } } diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/DomainFactory.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/DomainFactory.java index f6319d24a54..8090d5f5a92 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/DomainFactory.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/DomainFactory.java @@ -31,7 +31,7 @@ public interface DomainFactory extends SharedDomainFactory { * the RacingEventService.getBaseDomainFactory() instead which should be the single instance used * by all other services linked to the RacingEventService. */ - static DomainFactory INSTANCE = new DomainFactoryImpl(); + static DomainFactory INSTANCE = new DomainFactoryImpl((srlid)->null); MarkPassing createMarkPassing(TimePoint timePoint, Waypoint waypoint, Competitor competitor); diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.java index 5ff93bdfbb8..67a733f277c 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.java @@ -8,6 +8,7 @@ import java.util.Iterator; import java.util.List; import java.util.logging.Logger; +import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RaceLogResolver; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.CompetitorStore; import com.sap.sailing.domain.base.DomainFactory; @@ -67,12 +68,12 @@ public class DomainFactoryImpl extends SharedDomainFactoryImpl implements Domain /** * Uses a transient competitor store */ - public DomainFactoryImpl() { - super(new TransientCompetitorStoreImpl()); + public DomainFactoryImpl(RaceLogResolver raceLogResolver) { + super(new TransientCompetitorStoreImpl(), raceLogResolver); } - public DomainFactoryImpl(CompetitorStore competitorStore) { - super(competitorStore); + public DomainFactoryImpl(CompetitorStore competitorStore, RaceLogResolver raceLogResolver) { + super(competitorStore, raceLogResolver); } @Override diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java index c560317f7f3..008317d1663 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java @@ -17,6 +17,7 @@ import com.sap.sailing.domain.base.Leg; import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.base.RaceDefinition; import com.sap.sailing.domain.base.Regatta; +import com.sap.sailing.domain.base.SharedDomainFactory; import com.sap.sailing.domain.base.Sideline; import com.sap.sailing.domain.base.SpeedWithConfidence; import com.sap.sailing.domain.base.Waypoint; @@ -46,6 +47,7 @@ import com.sap.sailing.domain.ranking.RankingMetric; import com.sap.sailing.domain.ranking.RankingMetric.RankingInfo; import com.sap.sailing.domain.tracking.impl.TrackedRaceImpl; import com.sap.sse.common.Duration; +import com.sap.sse.common.IsManagedByCache; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; @@ -64,7 +66,7 @@ import com.sap.sse.common.Util; * @author Axel Uhl (d043530) * */ -public interface TrackedRace extends Serializable { +public interface TrackedRace extends Serializable, IsManagedByCache { final long MAX_TIME_BETWEEN_START_AND_FIRST_MARK_PASSING_IN_MILLISECONDS = 30000; final long DEFAULT_LIVE_DELAY_IN_MILLISECONDS = 5000; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java index 3a5e35dbc8c..dca065c759a 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java @@ -54,6 +54,7 @@ import com.sap.sailing.domain.base.CourseListener; import com.sap.sailing.domain.base.Leg; import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.base.RaceDefinition; +import com.sap.sailing.domain.base.SharedDomainFactory; import com.sap.sailing.domain.base.Sideline; import com.sap.sailing.domain.base.SpeedWithBearingWithConfidence; import com.sap.sailing.domain.base.SpeedWithConfidence; @@ -134,6 +135,7 @@ import com.sap.sailing.domain.tracking.WindStore; import com.sap.sailing.domain.tracking.WindTrack; import com.sap.sailing.domain.tracking.WindWithConfidence; import com.sap.sse.common.Duration; +import com.sap.sse.common.IsManagedByCache; import com.sap.sse.common.NoCorrespondingServiceRegisteredException; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Timed; @@ -3692,4 +3694,14 @@ public abstract class TrackedRaceImpl extends TrackedRaceWithWindEssentials impl public void setRaceLogResolver(RaceLogResolver raceLogResolver) { this.raceLogResolver = raceLogResolver; } + + /** + * When given the opportunity to resolve after de-serialization, grabs the {@link RaceLogResolver} from the + * {@link SharedDomainFactory} because the field is transient and needs filling after de-serialization. + */ + @Override + public IsManagedByCache resolve(SharedDomainFactory domainFactory) { + this.raceLogResolver = domainFactory.getRaceLogResolver(); + return this; + } } diff --git a/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java b/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java index 25b21ceb0c8..5d721c9a944 100755 --- a/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java +++ b/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java @@ -17,6 +17,7 @@ import com.sap.sailing.domain.base.Leg; import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.base.RaceDefinition; import com.sap.sailing.domain.base.Regatta; +import com.sap.sailing.domain.base.SharedDomainFactory; import com.sap.sailing.domain.base.Sideline; import com.sap.sailing.domain.base.SpeedWithConfidence; import com.sap.sailing.domain.base.Waypoint; @@ -63,6 +64,7 @@ import com.sap.sailing.domain.tracking.WindTrack; import com.sap.sailing.domain.tracking.WindWithConfidence; import com.sap.sailing.domain.tracking.impl.WindTrackImpl; import com.sap.sse.common.Duration; +import com.sap.sse.common.IsManagedByCache; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; @@ -783,4 +785,9 @@ public class MockedTrackedRace implements DynamicTrackedRace { @Override public void attachRaceExecutionProvider(RaceExecutionOrderProvider raceExecutionOrderProvider) { } + + @Override + public IsManagedByCache resolve(SharedDomainFactory domainFactory) { + return this; + } } diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreCompetitorTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreCompetitorTest.java index 1dddc822bf6..2f140adbb70 100755 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreCompetitorTest.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreCompetitorTest.java @@ -36,7 +36,7 @@ public class StoreCompetitorTest extends AbstractMongoDBTest { @Before public void setUp() { // clear the domainFactory competitor store for a clean start: - domainFactory = new DomainFactoryImpl(); + domainFactory = new DomainFactoryImpl((srlid)->null); } private void dropCompetitorCollection() { diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingLeaderboards.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingLeaderboards.java index df02eb3c65e..f8537422396 100755 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingLeaderboards.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingLeaderboards.java @@ -347,7 +347,7 @@ public class TestStoringAndRetrievingLeaderboards extends AbstractMongoDBTest { final int[] discardIndexResultsStartingWithHowManyRaces = new int[] { 5, 8 }; FlexibleLeaderboardImpl leaderboard = new FlexibleLeaderboardImpl(leaderboardName, new ThresholdBasedResultDiscardingRuleImpl(discardIndexResultsStartingWithHowManyRaces), new LowPoint(), null); - final DomainFactory domainFactory = new DomainFactoryImpl(); + final DomainFactory domainFactory = new DomainFactoryImpl((srlid)->null); // create the competitor through the competitor store/factory here so that the DomainObjectFactory finds it and // resolves the score corrections appropriate Competitor competitor = domainFactory.getOrCreateCompetitor(123, "$$$Dr. Wolfgang+Hunger$$$", Color.RED, "someone@nowhere.de", null, new TeamImpl("STG", Collections.singleton( diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java index 211737f2c3c..96b932701ba 100755 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java @@ -51,7 +51,7 @@ public abstract class AbstractServerReplicationTest extends com.sap.sse.replicat public RacingEventServiceImpl createNewReplica() { return new RacingEventServiceImpl(PersistenceFactory.INSTANCE.getDomainObjectFactory(mongoDBService, // replica gets its own base DomainFactory: - new DomainFactoryImpl()), mongoObjectFactory, MediaDBFactory.INSTANCE.getMediaDB(mongoDBService), + new DomainFactoryImpl((srlid)->null)), mongoObjectFactory, MediaDBFactory.INSTANCE.getMediaDB(mongoDBService), EmptyWindStore.INSTANCE, EmptyGPSFixStore.INSTANCE); } } diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/DelayedLeaderboardCorrectionsReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/DelayedLeaderboardCorrectionsReplicationTest.java index 9bb2e1db068..d9906b54a35 100755 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/DelayedLeaderboardCorrectionsReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/DelayedLeaderboardCorrectionsReplicationTest.java @@ -77,7 +77,7 @@ public class DelayedLeaderboardCorrectionsReplicationTest extends AbstractServer // then start initial load, wait until finished; then link a tracked race to leaderboard's RaceColumn on master and // verify that on the replica it is associated to the RaceColumn as well, and the DelayedLeaderboardCorrections are // resolved properly on the replica. - final DomainFactory domainFactory = new DomainFactoryImpl(); + final DomainFactory domainFactory = new DomainFactoryImpl((srlid)->null); BoatClass boatClass = domainFactory.getOrCreateBoatClass("29erXX", /* typicallyStartsUpwind */ true); DynamicCompetitor hasso = AbstractLeaderboardTest.createCompetitor("Dr. Hasso Plattner"); // don't create competitor using CompetitorStore final DynamicTrackedRace q2YellowTrackedRace = new MockedTrackedRaceWithFixedRank(hasso, /* rank */ 1, /* started */ false, boatClass) { @@ -105,7 +105,7 @@ public class DelayedLeaderboardCorrectionsReplicationTest extends AbstractServer // re-load new master from persistence master = createRacingEventServiceWithOneMockedTrackedRace(q2YellowTrackedRace, domainFactory); - DomainFactoryImpl replicaDomainFactory = new DomainFactoryImpl(); + DomainFactoryImpl replicaDomainFactory = new DomainFactoryImpl((srlid)->null); replica = createRacingEventServiceWithOneMockedTrackedRace(q2YellowTrackedRace, replicaDomainFactory); final Leaderboard masterLeaderboardReloaded = master.getLeaderboardByName(leaderboardName); assertNotNull(masterLeaderboardReloaded); diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/CompetitorStoreTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/CompetitorStoreTest.java index d1bf8e4e247..3b151c2c483 100755 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/CompetitorStoreTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/CompetitorStoreTest.java @@ -52,14 +52,14 @@ public class CompetitorStoreTest { @Test public void testPersistentCompetitorStore() { CompetitorStore persistentStore1 = new PersistentCompetitorStore( - PersistenceFactory.INSTANCE.getDefaultMongoObjectFactory(), /* clearStore */true, null); + PersistenceFactory.INSTANCE.getDefaultMongoObjectFactory(), /* clearStore */true, null, /* raceLogResolver */ (srlid)->null); DynamicCompetitor template = AbstractLeaderboardTest.createCompetitor("Test Competitor"); Competitor competitor = persistentStore1.getOrCreateCompetitor(template.getId(), template.getName(), template.getColor(), template.getEmail(), template.getFlagImage(), template.getTeam(), template.getBoat(), /* timeOnTimeFactor */ 1.234, /* timeOnDistanceAllowanceInSecondsPerNauticalMile */ Duration.ONE_SECOND.times(730)); CompetitorStore persistentStore2 = new PersistentCompetitorStore( - PersistenceFactory.INSTANCE.getDefaultMongoObjectFactory(), /* clearStore */false, null); + PersistenceFactory.INSTANCE.getDefaultMongoObjectFactory(), /* clearStore */false, null, /* raceLogResolver */ (srlid)->null); Competitor competitor2 = persistentStore2.getExistingCompetitorById(template.getId()); assertNotSame(competitor2, template); // the new store loads new instances from the database assertEquals(template.getId(), competitor2.getId()); diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java index 35940fb21b6..9acf17eff9f 100755 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java @@ -741,7 +741,7 @@ public class MasterDataImportTest { public void testMasterDataImportForRaceLogEventsReferencingCompetitors() throws MalformedURLException, IOException, InterruptedException, ClassNotFoundException { // Setup source service - DomainFactory sourceDomainFactory = new DomainFactoryImpl(); + DomainFactory sourceDomainFactory = new DomainFactoryImpl((srlid)->null); RacingEventService sourceService = new RacingEventServiceImpl( PersistenceFactory.INSTANCE.getDomainObjectFactory(MongoDBService.INSTANCE, sourceDomainFactory), PersistenceFactory.INSTANCE.getMongoObjectFactory(MongoDBService.INSTANCE), diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/PersistentCompetitorStore.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/PersistentCompetitorStore.java index 664a99941d5..f51f0c722d7 100755 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/PersistentCompetitorStore.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/PersistentCompetitorStore.java @@ -5,6 +5,7 @@ import java.io.ObjectInputStream; import java.io.Serializable; import java.net.URI; +import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RaceLogResolver; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.CompetitorStore; import com.sap.sailing.domain.base.DomainFactory; @@ -40,8 +41,9 @@ public class PersistentCompetitorStore extends TransientCompetitorStoreImpl impl * if true, the persistent competitor store is initially cleared, with all persistent * competitor data removed; use with caution! */ - public PersistentCompetitorStore(MongoObjectFactory storeTo, boolean clear, TypeBasedServiceFinderFactory serviceFinderFactory) { - DomainFactoryImpl baseDomainFactory = new DomainFactoryImpl(this); + public PersistentCompetitorStore(MongoObjectFactory storeTo, boolean clear, + TypeBasedServiceFinderFactory serviceFinderFactory, RaceLogResolver raceLogResolver) { + DomainFactoryImpl baseDomainFactory = new DomainFactoryImpl(this, raceLogResolver); this.loadFrom = PersistenceFactory.INSTANCE.getDomainObjectFactory(MongoDBService.INSTANCE, baseDomainFactory, serviceFinderFactory); this.storeTo = storeTo; if (clear) { diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java index 9da4f310d54..4b261ad11b1 100644 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java @@ -34,6 +34,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; +import java.util.function.Function; import java.util.logging.Level; import java.util.logging.Logger; @@ -52,6 +53,7 @@ import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogEventVisitor; import com.sap.sailing.domain.abstractlog.race.SimpleRaceLogIdentifier; +import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RaceLogResolver; import com.sap.sailing.domain.abstractlog.race.state.RaceState; import com.sap.sailing.domain.abstractlog.race.state.ReadonlyRaceState; import com.sap.sailing.domain.abstractlog.race.state.impl.RaceStateImpl; @@ -396,6 +398,23 @@ public class RacingEventServiceImpl implements RacingEventService, ClearStateTes private final JoinedClassLoader joinedClassLoader; + /** + * Providing the constructor parameters for a new {@link RacingEventServiceImpl} instance is a bit tricky + * in some cases because containment and initialization order of some types is fairly tightly coupled. + * There is a dependency of many such objects on an instance of {@link RaceLogResolver} which is implemented + * by {@link RacingEventServiceImpl}. However, therefore, this instance only becomes available in the + * innermost constructor. + * + * @author Axel Uhl (d043530) + * + */ + public static interface ConstructorParameters { + DomainObjectFactory getDomainObjectFactory(); + MongoObjectFactory getMongoObjectFactory(); + com.sap.sailing.domain.base.DomainFactory getBaseDomainFactory(); + CompetitorStore getCompetitorStore(); + } + /** * Constructs a {@link DomainFactory base domain factory} that uses this object's {@link #competitorStore competitor * store} for competitor management. This base domain factory is then also used for the construction of the @@ -421,29 +440,41 @@ public class RacingEventServiceImpl implements RacingEventService, ClearStateTes * be cleared before the service starts. * * @param clearPersistentCompetitorStore - * if true, the {@link PersistentCompetitorStore} is created empty, with the correcponding + * if true, the {@link PersistentCompetitorStore} is created empty, with the corresponding * database collection cleared as well. Use with caution! When used with false, competitors * created and stored during previous service executions will initially be loaded. */ - public RacingEventServiceImpl(boolean clearPersistentCompetitorStore, - TypeBasedServiceFinderFactory serviceFinderFactory) { - this(new PersistentCompetitorStore( - PersistenceFactory.INSTANCE.getDefaultMongoObjectFactory(serviceFinderFactory), - clearPersistentCompetitorStore, serviceFinderFactory), null, null, serviceFinderFactory); + public RacingEventServiceImpl(boolean clearPersistentCompetitorStore, final TypeBasedServiceFinderFactory serviceFinderFactory) { + this((final RaceLogResolver raceLogResolver)-> { + return new ConstructorParameters() { + private final MongoObjectFactory mongoObjectFactory = PersistenceFactory.INSTANCE.getDefaultMongoObjectFactory(serviceFinderFactory); + private final PersistentCompetitorStore competitorStore = new PersistentCompetitorStore( + PersistenceFactory.INSTANCE.getDefaultMongoObjectFactory(serviceFinderFactory), + clearPersistentCompetitorStore, serviceFinderFactory, raceLogResolver); + + @Override public DomainObjectFactory getDomainObjectFactory() { return competitorStore.getDomainObjectFactory(); } + @Override public MongoObjectFactory getMongoObjectFactory() { return mongoObjectFactory; } + @Override public DomainFactory getBaseDomainFactory() { return competitorStore.getBaseDomainFactory(); } + @Override public CompetitorStore getCompetitorStore() { return competitorStore; } + }; + }, MediaDBFactory.INSTANCE.getDefaultMediaDB(), null, null, serviceFinderFactory); } - private RacingEventServiceImpl(boolean clearPersistentCompetitorStore, WindStore windStore, - GPSFixStore gpsFixStore, TypeBasedServiceFinderFactory serviceFinderFactory) { - this(new PersistentCompetitorStore( - PersistenceFactory.INSTANCE.getDefaultMongoObjectFactory(serviceFinderFactory), - clearPersistentCompetitorStore, serviceFinderFactory), windStore, gpsFixStore, serviceFinderFactory); - } + private RacingEventServiceImpl(final boolean clearPersistentCompetitorStore, WindStore windStore, + GPSFixStore gpsFixStore, final TypeBasedServiceFinderFactory serviceFinderFactory) { + this((final RaceLogResolver raceLogResolver)-> { + return new ConstructorParameters() { + private final MongoObjectFactory mongoObjectFactory = PersistenceFactory.INSTANCE.getDefaultMongoObjectFactory(serviceFinderFactory); + private final PersistentCompetitorStore competitorStore = new PersistentCompetitorStore( + mongoObjectFactory, + clearPersistentCompetitorStore, serviceFinderFactory, raceLogResolver); - private RacingEventServiceImpl(PersistentCompetitorStore persistentCompetitorStore, WindStore windStore, - GPSFixStore gpsFixStore, TypeBasedServiceFinderFactory serviceFinderFactory) { - this(persistentCompetitorStore.getDomainObjectFactory(), persistentCompetitorStore.getMongoObjectFactory(), - persistentCompetitorStore.getBaseDomainFactory(), MediaDBFactory.INSTANCE.getDefaultMediaDB(), - persistentCompetitorStore, windStore, gpsFixStore, serviceFinderFactory); + @Override public DomainObjectFactory getDomainObjectFactory() { return competitorStore.getDomainObjectFactory(); } + @Override public MongoObjectFactory getMongoObjectFactory() { return mongoObjectFactory; } + @Override public DomainFactory getBaseDomainFactory() { return competitorStore.getBaseDomainFactory(); } + @Override public CompetitorStore getCompetitorStore() { return competitorStore; } + }; + }, MediaDBFactory.INSTANCE.getDefaultMediaDB(), windStore, gpsFixStore, serviceFinderFactory); } /** @@ -452,10 +483,30 @@ public class RacingEventServiceImpl implements RacingEventService, ClearStateTes * be used for testing because it provides a transient {@link CompetitorStore} as required for competitor * persistence. */ - public RacingEventServiceImpl(DomainObjectFactory domainObjectFactory, MongoObjectFactory mongoObjectFactory, + public RacingEventServiceImpl(Function domainObjectFactoryProvider, + final MongoObjectFactory mongoObjectFactory, MediaDB mediaDB, WindStore windStore, GPSFixStore gpsFixStore) { + this((final RaceLogResolver raceLogResolver)-> { + return new ConstructorParameters() { + private final DomainObjectFactory domainObjectFactory = domainObjectFactoryProvider.apply(raceLogResolver); + + @Override public DomainObjectFactory getDomainObjectFactory() { return domainObjectFactory; } + @Override public MongoObjectFactory getMongoObjectFactory() { return mongoObjectFactory; } + @Override public DomainFactory getBaseDomainFactory() { return domainObjectFactory.getBaseDomainFactory(); } + @Override public CompetitorStore getCompetitorStore() { return getBaseDomainFactory().getCompetitorStore(); } + }; + }, mediaDB, windStore, gpsFixStore, null); + } + + public RacingEventServiceImpl(final DomainObjectFactory domainObjectFactory, MongoObjectFactory mongoObjectFactory, MediaDB mediaDB, WindStore windStore, GPSFixStore gpsFixStore) { - this(domainObjectFactory, mongoObjectFactory, domainObjectFactory.getBaseDomainFactory(), mediaDB, - domainObjectFactory.getBaseDomainFactory().getCompetitorStore(), windStore, gpsFixStore, null); + this((final RaceLogResolver raceLogResolver)-> { + return new ConstructorParameters() { + @Override public DomainObjectFactory getDomainObjectFactory() { return domainObjectFactory; } + @Override public MongoObjectFactory getMongoObjectFactory() { return mongoObjectFactory; } + @Override public DomainFactory getBaseDomainFactory() { return domainObjectFactory.getBaseDomainFactory(); } + @Override public CompetitorStore getCompetitorStore() { return getBaseDomainFactory().getCompetitorStore(); } + }; + }, mediaDB, windStore, gpsFixStore, null); } /** @@ -467,14 +518,18 @@ public class RacingEventServiceImpl implements RacingEventService, ClearStateTes * of {@link DeviceIdentifier}s of specific device types or the managing of the device-to-competitor * associations per race tracked. */ - private RacingEventServiceImpl(DomainObjectFactory domainObjectFactory, MongoObjectFactory mongoObjectFactory, - com.sap.sailing.domain.base.DomainFactory baseDomainFactory, MediaDB mediaDb, - CompetitorStore competitorStore, WindStore windStore, GPSFixStore gpsFixStore, - TypeBasedServiceFinderFactory serviceFinderFactory) { + private RacingEventServiceImpl(Function constructorParametersProvider, MediaDB mediaDb, + WindStore windStore, GPSFixStore gpsFixStore, TypeBasedServiceFinderFactory serviceFinderFactory) { logger.info("Created " + this); + final ConstructorParameters constructorParameters = constructorParametersProvider.apply(this); + this.domainObjectFactory = constructorParameters.getDomainObjectFactory(); this.masterDataClassLoaders.add(this.getClass().getClassLoader()); joinedClassLoader = new JoinedClassLoader(masterDataClassLoaders); this.operationsSentToMasterForReplication = new HashSet<>(); + this.baseDomainFactory = constructorParameters.getBaseDomainFactory(); + this.mongoObjectFactory = constructorParameters.getMongoObjectFactory(); + this.mediaDB = mediaDb; + this.competitorStore = constructorParameters.getCompetitorStore(); if (windStore == null) { try { windStore = MongoWindStoreFactory.INSTANCE.getMongoWindStore(mongoObjectFactory, domainObjectFactory); @@ -482,11 +537,6 @@ public class RacingEventServiceImpl implements RacingEventService, ClearStateTes throw new RuntimeException(e); } } - this.baseDomainFactory = baseDomainFactory; - this.domainObjectFactory = domainObjectFactory; - this.mongoObjectFactory = mongoObjectFactory; - this.mediaDB = mediaDb; - this.competitorStore = competitorStore; this.competitorStore.addCompetitorUpdateListener(new CompetitorUpdateListener() { @Override public void competitorUpdated(Competitor competitor) { diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/DummyTrackedRace.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/DummyTrackedRace.java index 370826f1ecd..ae6e89de466 100755 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/DummyTrackedRace.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/DummyTrackedRace.java @@ -14,6 +14,7 @@ import com.sap.sailing.domain.base.Leg; import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.base.RaceDefinition; import com.sap.sailing.domain.base.Regatta; +import com.sap.sailing.domain.base.SharedDomainFactory; import com.sap.sailing.domain.base.Sideline; import com.sap.sailing.domain.base.SpeedWithConfidence; import com.sap.sailing.domain.base.Waypoint; @@ -56,6 +57,7 @@ import com.sap.sailing.domain.tracking.WindWithConfidence; import com.sap.sailing.domain.tracking.impl.DynamicTrackedRegattaImpl; import com.sap.sailing.domain.tracking.impl.EmptyWindStore; import com.sap.sse.common.Duration; +import com.sap.sse.common.IsManagedByCache; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; @@ -621,4 +623,9 @@ public class DummyTrackedRace extends TrackedRaceWithWindEssentials { @Override public void detachRaceExecutionOrderProvider(RaceExecutionOrderProvider raceExecutionOrderProvider) { } + + @Override + public IsManagedByCache resolve(SharedDomainFactory domainFactory) { + return this; + } } diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/InMemoryDataStore.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/InMemoryDataStore.java index bef7ea2ba5b..602112949ab 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/InMemoryDataStore.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/InMemoryDataStore.java @@ -44,7 +44,7 @@ public enum InMemoryDataStore implements DataStore { managedRaceById = new HashMap<>(); marksById = new HashMap<>(); courseData = null; - domainFactory = new SharedDomainFactoryImpl(); + domainFactory = new SharedDomainFactoryImpl(new AndroidRaceLogResolver()); eventUUID = null; courseUUID = null; From b7da28d350cc3acc72ba515308d56a90bf4c3e12 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Sun, 19 Jul 2015 15:44:00 +0200 Subject: [PATCH 08/31] added RaceLogResolver resolution to test case --- .../test/AbstractServerReplicationTest.java | 22 +++++++++++++++---- .../server/impl/RacingEventServiceImpl.java | 2 +- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java index 96b932701ba..9484df6fc20 100755 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java @@ -1,7 +1,10 @@ package com.sap.sailing.server.replication.test; +import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RaceLogResolver; +import com.sap.sailing.domain.base.CompetitorStore; import com.sap.sailing.domain.base.DomainFactory; import com.sap.sailing.domain.base.impl.DomainFactoryImpl; +import com.sap.sailing.domain.persistence.DomainObjectFactory; import com.sap.sailing.domain.persistence.MongoObjectFactory; import com.sap.sailing.domain.persistence.PersistenceFactory; import com.sap.sailing.domain.persistence.media.MediaDBFactory; @@ -49,10 +52,21 @@ public abstract class AbstractServerReplicationTest extends com.sap.sse.replicat @Override public RacingEventServiceImpl createNewReplica() { - return new RacingEventServiceImpl(PersistenceFactory.INSTANCE.getDomainObjectFactory(mongoDBService, - // replica gets its own base DomainFactory: - new DomainFactoryImpl((srlid)->null)), mongoObjectFactory, MediaDBFactory.INSTANCE.getMediaDB(mongoDBService), - EmptyWindStore.INSTANCE, EmptyGPSFixStore.INSTANCE); + return new RacingEventServiceImpl( + (final RaceLogResolver raceLogResolver) -> { + return new RacingEventServiceImpl.ConstructorParameters() { + private final DomainObjectFactory domainObjectFactory = + PersistenceFactory.INSTANCE.getDomainObjectFactory(mongoDBService, + // replica gets its own base DomainFactory: + new DomainFactoryImpl(raceLogResolver)); + + @Override public DomainObjectFactory getDomainObjectFactory() { return domainObjectFactory; } + @Override public MongoObjectFactory getMongoObjectFactory() { return mongoObjectFactory; } + @Override public DomainFactory getBaseDomainFactory() { return domainObjectFactory.getBaseDomainFactory(); } + @Override public CompetitorStore getCompetitorStore() { return getBaseDomainFactory().getCompetitorStore(); } + }; + }, MediaDBFactory.INSTANCE.getMediaDB(mongoDBService), EmptyWindStore.INSTANCE, EmptyGPSFixStore.INSTANCE, + /* serviceFinderFactory */ null); } } } diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java index 4b261ad11b1..2aeaaaa80e4 100644 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java @@ -518,7 +518,7 @@ public class RacingEventServiceImpl implements RacingEventService, ClearStateTes * of {@link DeviceIdentifier}s of specific device types or the managing of the device-to-competitor * associations per race tracked. */ - private RacingEventServiceImpl(Function constructorParametersProvider, MediaDB mediaDb, + public RacingEventServiceImpl(Function constructorParametersProvider, MediaDB mediaDb, WindStore windStore, GPSFixStore gpsFixStore, TypeBasedServiceFinderFactory serviceFinderFactory) { logger.info("Created " + this); final ConstructorParameters constructorParameters = constructorParametersProvider.apply(this); From e9b9c5f9c9ab5761f51a6f5cd23824dec3be444a Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Sun, 19 Jul 2015 17:20:04 +0200 Subject: [PATCH 09/31] fixed two tests --- .../test/AbstractServerReplicationTest.java | 14 +++++++++++--- .../replication/test/ServerReplicationTest.java | 3 +-- .../test/TrackedRaceContentsReplicationTest.java | 10 +++++----- ...RaceWithGPSFixStoreContentsReplicationTest.java | 9 ++++++--- 4 files changed, 23 insertions(+), 13 deletions(-) diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java index 9484df6fc20..0a6d6be4a76 100755 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java @@ -12,6 +12,7 @@ import com.sap.sailing.domain.racelog.tracking.EmptyGPSFixStore; import com.sap.sailing.domain.tracking.impl.EmptyWindStore; import com.sap.sailing.server.RacingEventService; import com.sap.sailing.server.impl.RacingEventServiceImpl; +import com.sap.sailing.server.impl.RacingEventServiceImpl.ConstructorParameters; import com.sap.sse.mongodb.MongoDBService; public abstract class AbstractServerReplicationTest extends com.sap.sse.replication.testsupport.AbstractServerWithSingleServiceReplicationTest { @@ -45,9 +46,16 @@ public abstract class AbstractServerReplicationTest extends com.sap.sse.replicat @Override public RacingEventServiceImpl createNewMaster() { - return new RacingEventServiceImpl(PersistenceFactory.INSTANCE.getDomainObjectFactory(mongoDBService, - DomainFactory.INSTANCE), mongoObjectFactory, MediaDBFactory.INSTANCE.getMediaDB(mongoDBService), - EmptyWindStore.INSTANCE, EmptyGPSFixStore.INSTANCE); + return new RacingEventServiceImpl((final RaceLogResolver raceLogResolver)-> { + return new ConstructorParameters() { + private final DomainFactory baseDomainFactory = new DomainFactoryImpl(raceLogResolver); + + @Override public DomainObjectFactory getDomainObjectFactory() { return PersistenceFactory.INSTANCE.getDomainObjectFactory(mongoDBService, baseDomainFactory); } + @Override public MongoObjectFactory getMongoObjectFactory() { return mongoObjectFactory; } + @Override public DomainFactory getBaseDomainFactory() { return baseDomainFactory; } + @Override public CompetitorStore getCompetitorStore() { return getBaseDomainFactory().getCompetitorStore(); } + }; + }, MediaDBFactory.INSTANCE.getMediaDB(mongoDBService), EmptyWindStore.INSTANCE, EmptyGPSFixStore.INSTANCE, null); } @Override diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/ServerReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/ServerReplicationTest.java index f4f6daf471b..cb6350d943c 100755 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/ServerReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/ServerReplicationTest.java @@ -78,8 +78,7 @@ public class ServerReplicationTest extends AbstractServerReplicationTest { @Test public void testWaypointRemovalReplication() throws InterruptedException { final String boatClassName = "49er"; - // FIXME use master DomainFactory; see bug 592 - final DomainFactory masterDomainFactory = DomainFactory.INSTANCE; + final DomainFactory masterDomainFactory = testSetUp.getMaster().getBaseDomainFactory(); BoatClass boatClass = masterDomainFactory.getOrCreateBoatClass(boatClassName); final String baseEventName = "Test Event"; AddDefaultRegatta addRegattaOperation = new AddDefaultRegatta(RegattaImpl.getDefaultName(baseEventName, boatClassName), boatClassName, diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java index b9f67ccbd04..d4fddc0fc24 100755 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java @@ -76,13 +76,13 @@ public class TrackedRaceContentsReplicationTest extends AbstractServerReplicatio super.setUp(); final String boatClassName = "49er"; // FIXME use master DomainFactory; see bug 592 - final DomainFactory masterDomainFactory = DomainFactory.INSTANCE; + final DomainFactory masterDomainFactory = testSetUp.getMaster().getBaseDomainFactory(); BoatClass boatClass = masterDomainFactory.getOrCreateBoatClass(boatClassName, /* typicallyStartsUpwind */true); competitor = masterDomainFactory.getCompetitorStore().getOrCreateCompetitor("GER 61", "Tina Lutz", Color.RED, "someone@nowhere.de", null, new TeamImpl("Tina Lutz + Susann Beucke", - (List) Arrays.asList(new PersonImpl[] { new PersonImpl("Tina Lutz", DomainFactory.INSTANCE.getOrCreateNationality("GER"), null, null), - new PersonImpl("Tina Lutz", DomainFactory.INSTANCE.getOrCreateNationality("GER"), null, null) }), - new PersonImpl("Rigo de Mas", DomainFactory.INSTANCE.getOrCreateNationality("NED"), null, null)), - new BoatImpl("GER 61", DomainFactory.INSTANCE.getOrCreateBoatClass("470", /* typicallyStartsUpwind */ true), "GER 61"), + (List) Arrays.asList(new PersonImpl[] { new PersonImpl("Tina Lutz", masterDomainFactory.getOrCreateNationality("GER"), null, null), + new PersonImpl("Tina Lutz", masterDomainFactory.getOrCreateNationality("GER"), null, null) }), + new PersonImpl("Rigo de Mas", masterDomainFactory.getOrCreateNationality("NED"), null, null)), + new BoatImpl("GER 61", masterDomainFactory.getOrCreateBoatClass("470", /* typicallyStartsUpwind */ true), "GER 61"), /* timeOnTimeFactor */ null, /* timeOnDistanceAllowanceInSecondsPerNauticalMile */ null); final String baseEventName = "Test Event"; AddDefaultRegatta addEventOperation = new AddDefaultRegatta(RegattaImpl.getDefaultName(baseEventName, boatClassName), boatClassName, diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceWithGPSFixStoreContentsReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceWithGPSFixStoreContentsReplicationTest.java index 00a9cbd536f..1451d9f3c8c 100644 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceWithGPSFixStoreContentsReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceWithGPSFixStoreContentsReplicationTest.java @@ -75,8 +75,7 @@ public class TrackedRaceWithGPSFixStoreContentsReplicationTest extends AbstractS /* dropDB */true, /* master=null means create a new one */null, /* replica=null means create a new one */null); final String boatClassName = "49er"; - // FIXME use master DomainFactory; see bug 592 - final DomainFactory masterDomainFactory = DomainFactory.INSTANCE; + final DomainFactory masterDomainFactory = testSetUp.getMaster().getBaseDomainFactory(); BoatClass boatClass = masterDomainFactory.getOrCreateBoatClass(boatClassName, /* typicallyStartsUpwind */true); competitor = masterDomainFactory.getCompetitorStore().getOrCreateCompetitor("GER 61", "Tina Lutz", Color.RED, "someone@nowhere.de", null, new TeamImpl("Tina Lutz + Susann Beucke", (List) Arrays.asList(new PersonImpl[] { new PersonImpl("Tina Lutz", DomainFactory.INSTANCE.getOrCreateNationality("GER"), null, null), @@ -145,5 +144,9 @@ public class TrackedRaceWithGPSFixStoreContentsReplicationTest extends AbstractS } } - + @Test + public void testTrackedRaceHasValidRaceLogResolverAfterDeserialization() { + TrackedRace replicaTrackedRace = replica.getTrackedRace(raceIdentifier); + assertNotNull(replicaTrackedRace.getRaceLogResolver()); + } } From 7c71d24500fc2d5b1c6d557c84a41bcd4ae8d36b Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Sun, 19 Jul 2015 17:26:42 +0200 Subject: [PATCH 10/31] bizarre: a basic RabbitMQ test fails for a race condition suddenly; introduced some longer wait period --- .../sap/sailing/server/replication/test/SimpleRabbitMQTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/SimpleRabbitMQTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/SimpleRabbitMQTest.java index 5e650ab2e4d..2fd2476f9a5 100755 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/SimpleRabbitMQTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/SimpleRabbitMQTest.java @@ -61,6 +61,7 @@ public class SimpleRabbitMQTest { new Thread(consumer2).start(); String message = "Hello World!"; channel.basicPublish(EXCHANGE_NAME, /* queue name */ "", null, message.getBytes()); + Thread.sleep(1000); consumer1.waitUntilReceived(1000); consumer2.waitUntilReceived(1000); assertEquals(message, received.get(consumer1)); From 43e41f331177cabbc92e458c534d45d9e32dc15d Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Sun, 19 Jul 2015 18:03:26 +0200 Subject: [PATCH 11/31] let SailingGWT sdm.launch pick the server port automatically --- java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch b/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch index 70e39c8656c..9e0f5cfd10a 100644 --- a/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch +++ b/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch @@ -3,6 +3,7 @@ + @@ -71,7 +72,7 @@ - + From e25d10bddb963d8e078af3433c6c8de6ec20a5bd Mon Sep 17 00:00:00 2001 From: Frederik Petersen Date: Mon, 20 Jul 2015 10:22:58 +0200 Subject: [PATCH 12/31] Initial load for polars now works --- .../sailing/polars/impl/PolarDataServiceImpl.java | 9 +++++++++ .../sap/sailing/polars/mining/WindSpeedLevel.java | 5 ++++- .../impl/IncrementalAnyOrderLeastSquaresImpl.java | 14 ++++++++++++-- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/impl/PolarDataServiceImpl.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/impl/PolarDataServiceImpl.java index 8f5816f5948..de86571dfc6 100755 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/impl/PolarDataServiceImpl.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/impl/PolarDataServiceImpl.java @@ -110,6 +110,9 @@ public class PolarDataServiceImpl implements PolarDataService, ReplicableWithObj @Override public SpeedWithConfidence getSpeed(BoatClass boatClass, Speed windSpeed, Bearing trueWindAngle) throws NotEnoughDataHasBeenAddedException { + if (polarDataMiner == null) { + throw new NotEnoughDataHasBeenAddedException("Polar Data Miner is currently unavailable. Maybe we are in the process of replication initial load?"); + } return polarDataMiner.estimateBoatSpeed(boatClass, windSpeed, trueWindAngle); } @@ -122,6 +125,9 @@ public class PolarDataServiceImpl implements PolarDataService, ReplicableWithObj @Override public SpeedWithBearingWithConfidence getAverageSpeedWithBearing(BoatClass boatClass, Speed windSpeed, LegType legType, Tack tack, boolean useRegressionForSpeed) throws NotEnoughDataHasBeenAddedException { + if (polarDataMiner == null) { + throw new NotEnoughDataHasBeenAddedException("Polar Data Miner is currently unavailable. Maybe we are in the process of replication initial load?"); + } SpeedWithBearingWithConfidence averageSpeedAndCourseOverGround = polarDataMiner .getAverageSpeedAndCourseOverGround(boatClass, windSpeed, legType, useRegressionForSpeed); if (tack == Tack.PORT) { @@ -242,6 +248,9 @@ public class PolarDataServiceImpl implements PolarDataService, ReplicableWithObj if (boatClass == null || windSpeed == null) { throw new IllegalArgumentException("Boatclass and windspeed cannot be null."); } + if (polarDataMiner == null) { + throw new NotEnoughDataHasBeenAddedException("Polar Data Miner is currently unavailable. Maybe we are in the process of replication initial load?"); + } SpeedWithBearingWithConfidence speed = polarDataMiner.getAverageSpeedAndCourseOverGround(boatClass, windSpeed, legType, true); Bearing bearing = new DegreeBearingImpl(speed.getObject().getBearing().getDegrees() * 2); BearingWithConfidence bearingWithConfidence = new BearingWithConfidenceImpl(bearing, speed.getConfidence(), diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/WindSpeedLevel.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/WindSpeedLevel.java index 2a8cd2f34a3..35fd09e862e 100644 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/WindSpeedLevel.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/WindSpeedLevel.java @@ -1,10 +1,13 @@ package com.sap.sailing.polars.mining; +import java.io.Serializable; + import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.WindSpeedStepping; -public class WindSpeedLevel { +public class WindSpeedLevel implements Serializable { + private static final long serialVersionUID = -4498750034316806342L; private final int level; private final WindSpeedStepping stepping; diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/regression/impl/IncrementalAnyOrderLeastSquaresImpl.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/regression/impl/IncrementalAnyOrderLeastSquaresImpl.java index 106662d0aa4..150441aca97 100644 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/regression/impl/IncrementalAnyOrderLeastSquaresImpl.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/regression/impl/IncrementalAnyOrderLeastSquaresImpl.java @@ -1,5 +1,6 @@ package com.sap.sailing.polars.regression.impl; +import java.io.IOException; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; @@ -66,10 +67,10 @@ public class IncrementalAnyOrderLeastSquaresImpl implements IncrementalLeastSqua private AtomicBoolean functionNeedsUpdate = new AtomicBoolean(true); - private final transient NamedReentrantReadWriteLock lock = new NamedReentrantReadWriteLock("IncrementalLeastSquaresLock", + private transient NamedReentrantReadWriteLock lock = new NamedReentrantReadWriteLock("IncrementalLeastSquaresLock", false); - private final transient NamedReentrantReadWriteLock cacheLock = new NamedReentrantReadWriteLock("IncrementalLeastSquaresCacheLock", + private transient NamedReentrantReadWriteLock cacheLock = new NamedReentrantReadWriteLock("IncrementalLeastSquaresCacheLock", true); private PolynomialFunction cachedFunction; @@ -298,6 +299,15 @@ public class IncrementalAnyOrderLeastSquaresImpl implements IncrementalLeastSqua } } + + private void readObject(java.io.ObjectInputStream stream) + throws IOException, ClassNotFoundException { + stream.defaultReadObject(); + lock = new NamedReentrantReadWriteLock("IncrementalLeastSquaresLock", + false); + cacheLock = new NamedReentrantReadWriteLock("IncrementalLeastSquaresCacheLock", + true); + } @Override public long getNumberOfAddedPoints() { From a43d0d4e8d6e0df4de1c087bfdcc27ed7b2583d1 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 20 Jul 2015 14:02:19 +0200 Subject: [PATCH 13/31] maintain race column order when deciding the discarded races to make them stable across replicas --- .../leaderboard/impl/PerSeriesResultDiscardingRuleImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/PerSeriesResultDiscardingRuleImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/PerSeriesResultDiscardingRuleImpl.java index 0e5c2800089..5a0af206178 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/PerSeriesResultDiscardingRuleImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/PerSeriesResultDiscardingRuleImpl.java @@ -43,7 +43,7 @@ public class PerSeriesResultDiscardingRuleImpl implements ResultDiscardingRule { } private Iterable getColumnsToConsiderInSeries(Series series, Iterable allRaceColumnsToConsider) { - Set result = new HashSet<>(); + Set result = new LinkedHashSet<>(); for (RaceColumn seriesColumn : series.getRaceColumns()) { if (Util.contains(allRaceColumnsToConsider, seriesColumn)) { result.add(seriesColumn); From 1d3e372999acc952ca0c41c73229f480f103d976 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 20 Jul 2015 14:15:58 +0200 Subject: [PATCH 14/31] fixed imports --- .../PerSeriesResultDiscardingRuleImpl.java | 1 + .../domain/tracking/impl/TrackedRaceImpl.java | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/PerSeriesResultDiscardingRuleImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/PerSeriesResultDiscardingRuleImpl.java index 5a0af206178..56dad38c75e 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/PerSeriesResultDiscardingRuleImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/PerSeriesResultDiscardingRuleImpl.java @@ -1,6 +1,7 @@ package com.sap.sailing.domain.leaderboard.impl; import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Set; import com.sap.sailing.domain.base.Competitor; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java index dca065c759a..ce6eef463ca 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java @@ -1024,14 +1024,17 @@ public abstract class TrackedRaceImpl extends TrackedRaceWithWindEssentials impl && timePoint.compareTo(markPassings.last().getTimePoint()) > 0) { // competitor has finished race at or before the requested time point; use time point of crossing the finish line end = markPassings.last().getTimePoint(); - } else if ((trackedLegOfCompetitor=getTrackedLeg(competitor, timePoint)) == null || - (!trackedLegOfCompetitor.hasFinishedLeg(getEndOfTracking()) - && ((getEndOfTracking() != null && timePoint.after(getEndOfTracking())) - || getStatus().getStatus() == TrackedRaceStatusEnum.FINISHED))) { - // If the race is no longer tracking and hence no more data can be expected, and the competitor - // hasn't finished a leg after the requested time point, no valid distance traveled can be determined - // for the competitor in this race the the time point requested - end = null; + } else { + final TimePoint endOfTracking = getEndOfTracking(); + if ((trackedLegOfCompetitor=getTrackedLeg(competitor, timePoint)) == null || + (!trackedLegOfCompetitor.hasFinishedLeg(endOfTracking) + && ((endOfTracking != null && timePoint.after(endOfTracking)) + || getStatus().getStatus() == TrackedRaceStatusEnum.FINISHED))) { + // If the race is no longer tracking and hence no more data can be expected, and the competitor + // hasn't finished a leg after the requested time point, no valid distance traveled can be determined + // for the competitor in this race the the time point requested + end = null; + } } if (end == null) { result = null; From 7a4fd4c4ece696ab648e1819ccad44f4d36a19f9 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 20 Jul 2015 14:21:33 +0200 Subject: [PATCH 15/31] fixed NPE when endOfTracking is null --- .../sap/sailing/domain/tracking/impl/TrackedRaceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java index ce6eef463ca..33007fea5f4 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java @@ -1027,9 +1027,8 @@ public abstract class TrackedRaceImpl extends TrackedRaceWithWindEssentials impl } else { final TimePoint endOfTracking = getEndOfTracking(); if ((trackedLegOfCompetitor=getTrackedLeg(competitor, timePoint)) == null || - (!trackedLegOfCompetitor.hasFinishedLeg(endOfTracking) - && ((endOfTracking != null && timePoint.after(endOfTracking)) - || getStatus().getStatus() == TrackedRaceStatusEnum.FINISHED))) { + (endOfTracking != null && !trackedLegOfCompetitor.hasFinishedLeg(endOfTracking) + && (timePoint.after(endOfTracking) || getStatus().getStatus() == TrackedRaceStatusEnum.FINISHED))) { // If the race is no longer tracking and hence no more data can be expected, and the competitor // hasn't finished a leg after the requested time point, no valid distance traveled can be determined // for the competitor in this race the the time point requested From 0f618345e6e6fc6d249ccbb7427e0fe769dcdef2 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 20 Jul 2015 14:57:47 +0200 Subject: [PATCH 16/31] avoiding another NPE regarding leg finishing time --- .../leaderboard/impl/AbstractSimpleLeaderboardImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java index 307d43dd716..f0cd0aa2d84 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java @@ -1670,8 +1670,9 @@ public abstract class AbstractSimpleLeaderboardImpl implements Leaderboard, Race result.estimatedTimeToNextWaypointInSeconds = estimatedTimeToNextMarkInSeconds==null?null:estimatedTimeToNextMarkInSeconds.asSeconds(); result.timeInMilliseconds = time.asMillis(); result.finished = trackedLeg.hasFinishedLeg(timePoint); + final TimePoint legFinishTime = trackedLeg.getFinishTime(); result.correctedTotalTime = trackedLeg.hasStartedLeg(timePoint) ? trackedLeg.getTrackedLeg().getTrackedRace().getRankingMetric().getCorrectedTime(trackedLeg.getCompetitor(), - trackedLeg.hasFinishedLeg(timePoint) ? trackedLeg.getFinishTime() : timePoint, cache) : null; + trackedLeg.hasFinishedLeg(timePoint) ? legFinishTime : timePoint, cache) : null; // fetch the leg gap in own corrected time from the ranking metric final Duration gapToLeaderInOwnTime = trackedLeg.getTrackedLeg().getTrackedRace().getRankingMetric(). getLegGapToLegLeaderInOwnTime(trackedLeg, timePoint, rankingInfo, cache); @@ -1721,8 +1722,8 @@ public abstract class AbstractSimpleLeaderboardImpl implements Leaderboard, Race case TACK: case JIBE: case PENALTY_CIRCLE: - if (!maneuver.getTimePoint().before(startOfLeg) && (!trackedLeg.hasFinishedLeg(timePoint) || - maneuver.getTimePoint().before(trackedLeg.getFinishTime()))) { + if (!maneuver.getTimePoint().before(startOfLeg) && (legFinishTime == null || legFinishTime.after(timePoint) || + maneuver.getTimePoint().before(legFinishTime))) { if (maneuver.getManeuverLoss() != null) { result.numberOfManeuvers.put(maneuver.getType(), result.numberOfManeuvers.get(maneuver.getType()) + 1); From b4dc012351fa298a98c3304c706e5612f4272afb Mon Sep 17 00:00:00 2001 From: "Christopher Ronnewinkel (D036654)" Date: Mon, 20 Jul 2015 15:14:59 +0200 Subject: [PATCH 17/31] fix final step of get-paths-even-timed for cases (e.g. offshore-races) where the simulation time-step is large compared to the even-timing time-step (currently always 15sec); --- .../src/com/sap/sailing/simulator/impl/PathImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathImpl.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathImpl.java index 1813ab93f56..b2165f8cae8 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathImpl.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathImpl.java @@ -132,7 +132,8 @@ public class PathImpl implements Path, Serializable { if ((this.pathPoints.get(idx).getTimePoint().asMillis() >= nextTimePoint.asMillis())||(idx == this.pathPoints.size()-1)) { - if (idx == this.pathPoints.size()-1) { + // for the last step, next-time-point needs to be aligned to the time-range of the course + if (nextTimePoint.after(endTime)) { nextTimePoint = endTime; } From d95976143760d4b89ef6194e709f4dd4eb6d6168 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 20 Jul 2015 15:37:59 +0200 Subject: [PATCH 18/31] set "correct Igtimi imported wind by declination" by default --- .../main/java/com/sap/sailing/gwt/ui/adminconsole/WindPanel.java | 1 + 1 file changed, 1 insertion(+) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/WindPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/WindPanel.java index bee50c3ef2c..753f101c79e 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/WindPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/WindPanel.java @@ -254,6 +254,7 @@ public class WindPanel extends FormPanel implements RegattasDisplayer, WindShowe igtimiWindImportRootPanel.add(contentPanel); contentPanel.add(new Label(stringMessages.seeIgtimiTabForAccountSettings())); final CheckBox correctByDeclination = new CheckBox(stringMessages.declinationCheckbox()); + correctByDeclination.setValue(true); // by default this is desirable because the Igtimi connector reads uncorrected magnetic values final Button importButton = new Button(stringMessages.importWindFromIgtimi()); final HTML resultReport = new HTML(); importButton.addClickHandler(new ClickHandler() { From 85eaf104da2f8fbbcc58b727f5ba50a07569783d Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 20 Jul 2015 17:02:27 +0200 Subject: [PATCH 19/31] avoid another NPE due to empty windward distance of leg (bug 3154) --- .../domain/tracking/impl/TrackedLegOfCompetitorImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java index 8b884a4f3db..998248a9ded 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java @@ -350,7 +350,7 @@ public class TrackedLegOfCompetitorImpl implements TrackedLegOfCompetitor { if (startPos != null) { Distance d = getTrackedLeg().getAbsoluteWindwardDistance(startPos, endPos, to, WindPositionMode.EXACT, cache); - result = d.inTime(to.asMillis() - start.getTimePoint().asMillis()); + result = d == null ? null : d.inTime(to.asMillis() - start.getTimePoint().asMillis()); } } } From af5226e646114e454dd9a8c082647349ac4e33a8 Mon Sep 17 00:00:00 2001 From: fmittag Date: Mon, 20 Jul 2015 17:15:33 +0200 Subject: [PATCH 20/31] fixed raceboard link creation for flexible leaderboards --- .../place/event/AbstractEventActivity.java | 6 ----- .../home/client/place/event/EventView.java | 3 ++- .../RegattaCompetitionSeries.java | 2 +- .../racelist/RaceListColumnFactory.java | 2 +- .../partials/updatesBox/UpdatesBoxItem.java | 4 +-- .../ui/shared/dispatch/event/LiveRaceDTO.java | 5 ++-- .../ui/shared/dispatch/event/RaceContext.java | 9 ++++--- .../dispatch/event/RaceListRaceDTO.java | 7 ++--- .../news/AbstractRaceNewsEntryDTO.java | 26 +++++++------------ .../news/RaceCompetitorNewsEntryDTO.java | 5 ++-- .../gwt/ui/shared/race/RaceMetadataDTO.java | 26 +++++++++++-------- 11 files changed, 46 insertions(+), 49 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/AbstractEventActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/AbstractEventActivity.java index c5772d5be6d..79cabe3ba1f 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/AbstractEventActivity.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/AbstractEventActivity.java @@ -133,12 +133,6 @@ public abstract class AbstractEventActivity ex return getRaceViewerURL(leaderboard.name, raceIdentifier); } - @Override - public String getRaceViewerURL(String regattaName, String trackedRaceName) { - return EntryPointLinkFactory - .createRaceBoardLink(createRaceBoardLinkParameters(regattaName, regattaName, trackedRaceName)); - } - public String getRaceViewerURL(String leaderboardName, RegattaAndRaceIdentifier raceIdentifier) { return EntryPointLinkFactory .createRaceBoardLink(createRaceBoardLinkParameters(leaderboardName, raceIdentifier.getRegattaName(), raceIdentifier.getRaceName())); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/EventView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/EventView.java index 052e6225ac5..51b4b5d7ace 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/EventView.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/EventView.java @@ -6,6 +6,7 @@ import com.google.gwt.place.shared.Place; import com.google.gwt.safehtml.shared.SafeUri; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.IsWidget; +import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; import com.sap.sailing.domain.common.dto.RaceDTO; import com.sap.sailing.gwt.common.client.controls.tabbar.TabView; import com.sap.sailing.gwt.home.client.place.event.regatta.AbstractEventRegattaPlace; @@ -56,7 +57,7 @@ public interface EventView getRegattaRacesNavigation(String regattaName); PlaceNavigation getRegattaNavigation(String regattaName); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/raceCompetition/RegattaCompetitionSeries.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/raceCompetition/RegattaCompetitionSeries.java index ae417f68822..367122d1810 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/raceCompetition/RegattaCompetitionSeries.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/raceCompetition/RegattaCompetitionSeries.java @@ -38,7 +38,7 @@ public class RegattaCompetitionSeries extends Composite { RegattaCompetitionFleet competitionFleet = new RegattaCompetitionFleet(fleet); for (RaceListRaceDTO race : fleet.getRaces()) { boolean tracked = race.getTrackingState() == RaceTrackingState.TRACKED_VALID_DATA; - String raceViewerUrl = tracked ? presenter.getRaceViewerURL(race.getRegattaName(), race.getTrackedRaceName()) : null; + String raceViewerUrl = tracked ? presenter.getRaceViewerURL(race.getRegattaName(), race.getRegattaAndRaceIdentifier()) : null; competitionFleet.addRace(race, raceViewerUrl); } containerUi.add(competitionFleet); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/racelist/RaceListColumnFactory.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/racelist/RaceListColumnFactory.java index a94a9dffbdc..a5b441aeba5 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/racelist/RaceListColumnFactory.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/racelist/RaceListColumnFactory.java @@ -514,7 +514,7 @@ public class RaceListColumnFactory { } else { String styleNames = data.getViewState() == RaceViewState.FINISHED ? analyseRaceStyle : watchNowStyle; String text = data.getViewState() == RaceViewState.FINISHED ? I18N.analyseRace() : I18N_UBI.watchNow(); - String raceViewerURL = presenter.getRaceViewerURL(data.getRegattaName(), data.getTrackedRaceName()); + String raceViewerURL = presenter.getRaceViewerURL(data.getLeaderboardName(), data.getRegattaAndRaceIdentifier()); sb.append(TEMPLATE.raceViewerLinkButton(styleNames, text, raceViewerURL)); } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/updatesBox/UpdatesBoxItem.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/updatesBox/UpdatesBoxItem.java index d0f77e0fac8..7fb6a9cdbc2 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/updatesBox/UpdatesBoxItem.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/updatesBox/UpdatesBoxItem.java @@ -75,8 +75,8 @@ public class UpdatesBoxItem extends Widget { placeNavigation = presenter.getRegattaLeaderboardNavigation(((LeaderboardNewsEntryDTO) entry).getLeaderboardName()); } else if(entry instanceof AbstractRaceNewsEntryDTO) { AbstractRaceNewsEntryDTO raceEntry = (AbstractRaceNewsEntryDTO) entry; - if(raceEntry.getTrackedRaceName() != null) { - directLink = presenter.getRaceViewerURL(raceEntry.getRegattaName(), raceEntry.getTrackedRaceName()); + if(raceEntry.getRegattaAndRaceIdentfier() != null) { + directLink = presenter.getRaceViewerURL(raceEntry.getLeaderboardName(), raceEntry.getRegattaAndRaceIdentfier()); } } if(placeNavigation != null) { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/event/LiveRaceDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/event/LiveRaceDTO.java index 76a336dd357..cbd67cbf9b1 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/event/LiveRaceDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/event/LiveRaceDTO.java @@ -1,5 +1,6 @@ package com.sap.sailing.gwt.ui.shared.dispatch.event; +import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; import com.sap.sailing.gwt.ui.shared.race.FlagStateDTO; import com.sap.sailing.gwt.ui.shared.race.RaceMetadataDTO; import com.sap.sailing.gwt.ui.shared.race.RaceProgressDTO; @@ -15,8 +16,8 @@ public class LiveRaceDTO extends RaceMetadataDTO { private LiveRaceDTO() { } - public LiveRaceDTO(String regattaName, String raceName) { - super(regattaName, raceName); + public LiveRaceDTO(String leaderboardName, RegattaAndRaceIdentifier regattaAndRaceIdentifier, String raceName) { + super(leaderboardName, regattaAndRaceIdentifier, raceName); } public FlagStateDTO getFlagState() { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/event/RaceContext.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/event/RaceContext.java index 331ef9460ef..ecf8050f2b3 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/event/RaceContext.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/event/RaceContext.java @@ -100,6 +100,10 @@ public class RaceContext { return !LeaderboardNameConstants.DEFAULT_FLEET_NAME.equals(fleet.getName()); } + public String getLeaderboardName() { + return leaderboard.getName(); + } + public String getRegattaName() { if (leaderboard instanceof RegattaLeaderboard) { Regatta regatta = ((RegattaLeaderboard) leaderboard).getRegatta(); @@ -333,7 +337,7 @@ public class RaceContext { // and special flags states indicating how the postponed/canceled races will be continued if (isLiveOrOfPublicInterest()) { // the start time is always given for live races - LiveRaceDTO liveRaceDTO = new LiveRaceDTO(getRegattaName(), raceColumn.getName()); + LiveRaceDTO liveRaceDTO = new LiveRaceDTO(getLeaderboardName(), trackedRace != null ? trackedRace.getRaceIdentifier(): null, raceColumn.getName()); fillRaceData(liveRaceDTO); liveRaceDTO.setFlagState(getFlagStateOrNull()); liveRaceDTO.setProgress(getProgressOrNull()); @@ -348,7 +352,7 @@ public class RaceContext { // and special flags states indicating how the postponed/canceled races will be continued if (getLiveRaceViewState() == RaceViewState.FINISHED) { // the start time is always given for live races - RaceListRaceDTO liveRaceDTO = new RaceListRaceDTO(getRegattaName(), raceColumn.getName()); + RaceListRaceDTO liveRaceDTO = new RaceListRaceDTO(getLeaderboardName(), trackedRace != null ? trackedRace.getRaceIdentifier(): null, raceColumn.getName()); fillRaceData(liveRaceDTO); liveRaceDTO.setDuration(getDurationOrNull()); liveRaceDTO.setWinner(getWinnerOrNull()); @@ -436,7 +440,6 @@ public class RaceContext { private void fillRaceData(RaceMetadataDTO dto) { dto.setViewState(getLiveRaceViewState()); dto.setRegattaDisplayName(getRegattaDisplayName()); - dto.setTrackedRaceName(trackedRace != null ? trackedRace.getRaceIdentifier().getRaceName() : null); dto.setTrackingState(getRaceTrackingState()); dto.setFleet(getFleetMetadataOrNull()); dto.setStart(getStartTimeAsDate()); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/event/RaceListRaceDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/event/RaceListRaceDTO.java index 3c1306abff2..8efd14b90a5 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/event/RaceListRaceDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/event/RaceListRaceDTO.java @@ -1,5 +1,6 @@ package com.sap.sailing.gwt.ui.shared.dispatch.event; +import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; import com.sap.sailing.gwt.ui.shared.race.RaceMetadataDTO; import com.sap.sailing.gwt.ui.shared.race.wind.WindStatisticsDTO; import com.sap.sse.common.Duration; @@ -15,9 +16,9 @@ public class RaceListRaceDTO extends RaceMetadataDTO { @SuppressWarnings("unused") private RaceListRaceDTO() { } - - public RaceListRaceDTO(String regattaName, String raceName) { - super(regattaName, raceName); + + public RaceListRaceDTO(String leaderboardName, RegattaAndRaceIdentifier regattaAndRaceIdentifier, String raceName) { + super(leaderboardName, regattaAndRaceIdentifier, raceName); } public Duration getDuration() { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/news/AbstractRaceNewsEntryDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/news/AbstractRaceNewsEntryDTO.java index 0c82cecc687..e906303b10e 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/news/AbstractRaceNewsEntryDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/news/AbstractRaceNewsEntryDTO.java @@ -3,21 +3,21 @@ package com.sap.sailing.gwt.ui.shared.dispatch.news; import java.util.Date; import com.google.gwt.core.shared.GwtIncompatible; +import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; public abstract class AbstractRaceNewsEntryDTO extends NewsEntryDTO { - private String regattaName; - private String trackedRaceName; + private String leaderboardName; + private RegattaAndRaceIdentifier regattaAndRaceIdentfier; private String boatClass; protected AbstractRaceNewsEntryDTO() { } @GwtIncompatible - public AbstractRaceNewsEntryDTO(String regattaName, String trackedRaceName, String raceTitle, String boatClass, Date timestamp) { + public AbstractRaceNewsEntryDTO(String leaderboardName, RegattaAndRaceIdentifier regattaAndRaceIdentifier, String raceTitle, String boatClass, Date timestamp) { super(raceTitle, timestamp, null); - this.regattaName = regattaName; - this.trackedRaceName = trackedRaceName; + this.leaderboardName = leaderboardName; this.boatClass = boatClass; } @@ -26,19 +26,11 @@ public abstract class AbstractRaceNewsEntryDTO extends NewsEntryDTO { return boatClass; } - public String getRegattaName() { - return regattaName; + public String getLeaderboardName() { + return leaderboardName; } - public void setRegattaName(String regattaName) { - this.regattaName = regattaName; - } - - public String getTrackedRaceName() { - return trackedRaceName; - } - - public void setTrackedRaceName(String trackedRaceName) { - this.trackedRaceName = trackedRaceName; + public RegattaAndRaceIdentifier getRegattaAndRaceIdentfier() { + return regattaAndRaceIdentfier; } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/news/RaceCompetitorNewsEntryDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/news/RaceCompetitorNewsEntryDTO.java index 77d26641128..61a894944b7 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/news/RaceCompetitorNewsEntryDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/news/RaceCompetitorNewsEntryDTO.java @@ -2,6 +2,7 @@ package com.sap.sailing.gwt.ui.shared.dispatch.news; import java.util.Date; +import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; import com.sap.sailing.gwt.ui.client.StringMessages; public class RaceCompetitorNewsEntryDTO extends AbstractRaceNewsEntryDTO { @@ -17,8 +18,8 @@ public class RaceCompetitorNewsEntryDTO extends AbstractRaceNewsEntryDTO { private RaceCompetitorNewsEntryDTO() { } - public RaceCompetitorNewsEntryDTO(String regattaName, String trackedRaceName, String raceTitle, String boatClass, Date timestamp, String competitorName, Type type) { - super(regattaName, trackedRaceName, raceTitle, boatClass, timestamp); + public RaceCompetitorNewsEntryDTO(String leaderboardName, RegattaAndRaceIdentifier regattaAndRaceIdentifier, String raceTitle, String boatClass, Date timestamp, String competitorName, Type type) { + super(leaderboardName, regattaAndRaceIdentifier, raceTitle, boatClass, timestamp); this.competitorName = competitorName; this.type = type; } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/race/RaceMetadataDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/race/RaceMetadataDTO.java index 2e79496a559..6bb5935b2e4 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/race/RaceMetadataDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/race/RaceMetadataDTO.java @@ -2,6 +2,7 @@ package com.sap.sailing.gwt.ui.shared.race; import java.util.Date; +import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sailing.gwt.ui.shared.dispatch.DTO; import com.sap.sailing.gwt.ui.shared.race.wind.AbstractWindDTO; @@ -56,10 +57,11 @@ public abstract class RaceMetadataDTO implements D TRACKED_VALID_DATA // tracking is connected and all required data for displaying the race viewer is available } + private String leaderboardName; + private RegattaAndRaceIdentifier regattaAndRaceIdentifier; private String regattaName; private String regattaDisplayName; private String raceName; - private String trackedRaceName; private FleetMetadataDTO fleet; private Date start; private String courseArea; @@ -72,8 +74,10 @@ public abstract class RaceMetadataDTO implements D protected RaceMetadataDTO() { } - public RaceMetadataDTO(String regattaName, String raceName) { - this.regattaName = regattaName; + public RaceMetadataDTO(String leaderboardName, RegattaAndRaceIdentifier regattaAndRaceIdentifier, String raceName) { + this.leaderboardName = leaderboardName; + this.regattaAndRaceIdentifier = regattaAndRaceIdentifier; + this.regattaName = leaderboardName; this.raceName = raceName; } @@ -81,6 +85,10 @@ public abstract class RaceMetadataDTO implements D return regattaName; } + public String getLeaderboardName() { + return leaderboardName; + } + public String getRaceName() { return raceName; } @@ -141,14 +149,6 @@ public abstract class RaceMetadataDTO implements D this.trackingState = trackingState; } - public String getTrackedRaceName() { - return trackedRaceName; - } - - public void setTrackedRaceName(String trackedRaceName) { - this.trackedRaceName = trackedRaceName; - } - public WIND getWind() { return wind; } @@ -165,6 +165,10 @@ public abstract class RaceMetadataDTO implements D this.regattaDisplayName = regattaDisplayName; } + public RegattaAndRaceIdentifier getRegattaAndRaceIdentifier() { + return regattaAndRaceIdentifier; + } + @Override public int compareTo(RaceMetadataDTO o) { Date thisStart = getStart(); From 8415d5db459a147412aafb811792e8b72a5ba7af Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 20 Jul 2015 17:38:14 +0200 Subject: [PATCH 21/31] log STOPPING of a bundle as SEVERE. Just found a STOPPING message in the log --- .../src/com/sap/sailing/server/impl/ExtenderBundleTracker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/ExtenderBundleTracker.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/ExtenderBundleTracker.java index 9562c31b0be..d6539118f31 100644 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/ExtenderBundleTracker.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/ExtenderBundleTracker.java @@ -42,7 +42,7 @@ public class ExtenderBundleTracker extends BundleTracker { for (StackTraceElement traceElement : stackTrace) { b.append(traceElement.toString() + "\n"); } - logger.fine(b.toString()); + logger.severe(b.toString()); } String trackManifestEntry = (String) bundle.getHeaders().get("TrackLifecycle"); if (trackManifestEntry != null) { From 071a23bc8ffe7378d28fc27d158228db083963d9 Mon Sep 17 00:00:00 2001 From: Frederik Petersen Date: Mon, 20 Jul 2015 17:41:54 +0200 Subject: [PATCH 22/31] Removed MovingAverage processor from polar data miner Was only meant for comparison purposes with Regression. Now regression is used every anyway, so we only need to have the regression processors --- .../common/PolarSheetsXYDiagramData.java | 4 -- .../impl/PolarSheetsXYDiagramDataImpl.java | 20 +-------- .../domain/polars/PolarDataService.java | 30 ------------- .../PolarSheetsXYDiagramPopupPanel.java | 24 +---------- .../gwt/ui/server/SailingServiceImpl.java | 34 ++------------- .../mining/test/PolarDataMinerTest.java | 10 +---- .../polars/impl/PolarDataServiceImpl.java | 33 ++++----------- .../mining/GPSFixMovingWithPolarContext.java | 13 +----- .../sailing/polars/mining/PolarDataMiner.java | 42 ++++--------------- .../gateway/jaxrs/api/PolarResource.java | 2 +- .../simulator/impl/PolarDiagramGPS.java | 8 ++-- .../simulator/impl/PolarDiagramGPSDirect.java | 8 ++-- 12 files changed, 33 insertions(+), 195 deletions(-) diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/PolarSheetsXYDiagramData.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/PolarSheetsXYDiagramData.java index 0ab886a20b7..cc0513be00b 100644 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/PolarSheetsXYDiagramData.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/PolarSheetsXYDiagramData.java @@ -7,10 +7,6 @@ import com.sap.sse.common.Util.Pair; public interface PolarSheetsXYDiagramData extends Serializable { - List> getPointsForAverageSpeedMovingAverage(Tack tack, LegType legType); - - List> getPointsForAverageConfidence(Tack tack, LegType legType); - List> getPointsForAverageSpeedRegression(Tack tack, LegType legType); } diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/PolarSheetsXYDiagramDataImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/PolarSheetsXYDiagramDataImpl.java index 8fb3db96bfe..89326f27c70 100644 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/PolarSheetsXYDiagramDataImpl.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/PolarSheetsXYDiagramDataImpl.java @@ -14,30 +14,12 @@ public class PolarSheetsXYDiagramDataImpl implements PolarSheetsXYDiagramData { PolarSheetsXYDiagramDataImpl() { } - - private Map, List>> pointsForAverageSpeedMovingAverage; private Map, List>> pointsForAverageSpeedRegression; - private Map, List>> pointsForAverageConfidence; - public PolarSheetsXYDiagramDataImpl( - Map, List>> movingAverageSpeedDataLists, - Map, List>> regressionSpeedDataLists, - Map, List>> averageConfidenceDataLists) { - pointsForAverageSpeedMovingAverage = movingAverageSpeedDataLists; + Map, List>> regressionSpeedDataLists) { pointsForAverageSpeedRegression = regressionSpeedDataLists; - pointsForAverageConfidence = averageConfidenceDataLists; - } - - @Override - public List> getPointsForAverageSpeedMovingAverage(Tack tack, LegType legType) { - return pointsForAverageSpeedMovingAverage.get(new Pair(legType, tack)); - } - - @Override - public List> getPointsForAverageConfidence(Tack tack, LegType legType) { - return pointsForAverageConfidence.get(new Pair(legType, tack)); } @Override diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/polars/PolarDataService.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/polars/PolarDataService.java index 665200582a7..4161db07d7d 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/polars/PolarDataService.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/polars/PolarDataService.java @@ -52,36 +52,6 @@ public interface PolarDataService { SpeedWithConfidence getSpeed(BoatClass boatClass, Speed windSpeed, Bearing trueWindAngle) throws NotEnoughDataHasBeenAddedException; - /** - * - * @param boatClass - * @param windSpeed - * @param legType - * Should be {@link LegType#UPWIND} or {@link LegType#DOWNWIND}, there is no information for other - * courses yet. Use getSpeed for the desired angle to get rawer information on other courses for now. - * @param tack - * Polar data can vary depending on the tack the boat is on. - * @param useRegressionForSpeed TODO - * @return The estimated average speed of a boat for the supplied parameters with the estimated average bearing to - * the true wind and a confidence which consists of the confidences of the wind speed, and boat speed sources (50%) - * and a confidence calculated using the amount of underlying fixes (50%). 0 <= confidence < 1
- * A value with zero confidence doesn't have any significance!
- *
- * - * The bearing is somewhere between -179 to +180
- *
- * - * Get the speed using returnValue.getObject()
- *
- * - * Returns null if the leg type is not up or downwind. - * - * @throws NotEnoughDataHasBeenAddedException - * If there is not enough data to supply a value with some kind of significance. - */ - SpeedWithBearingWithConfidence getAverageSpeedWithBearing(BoatClass boatClass, Speed windSpeed, - LegType legType, Tack tack, boolean useRegressionForSpeed) throws NotEnoughDataHasBeenAddedException; - /** * Generates a polar sheet for given races and settings using the provided executor for the worker threads. This diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/polarsheets/PolarSheetsXYDiagramPopupPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/polarsheets/PolarSheetsXYDiagramPopupPanel.java index 61b25de0ef7..35775dc0ea6 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/polarsheets/PolarSheetsXYDiagramPopupPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/polarsheets/PolarSheetsXYDiagramPopupPanel.java @@ -4,12 +4,9 @@ import java.util.List; import org.moxieapps.gwt.highcharts.client.AxisTitle; import org.moxieapps.gwt.highcharts.client.Chart; -import org.moxieapps.gwt.highcharts.client.PlotLine; import org.moxieapps.gwt.highcharts.client.Point; import org.moxieapps.gwt.highcharts.client.Series; import org.moxieapps.gwt.highcharts.client.Series.Type; -import org.moxieapps.gwt.highcharts.client.plotOptions.Marker; -import org.moxieapps.gwt.highcharts.client.plotOptions.SplinePlotOptions; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; @@ -58,33 +55,14 @@ public class PolarSheetsXYDiagramPopupPanel extends DialogBox { } private void addSpeedAndConfidenceSeriesForTackAndLegType(PolarSheetsXYDiagramData result, Tack tack, LegType legType, boolean showByDefault) { - Point[] pointsForUpwindStarboardAverageSpeedMovingAverage = toPointArray(result.getPointsForAverageSpeedMovingAverage(tack, legType)); - Series speedSeriesMovingAverage = chart.createSeries(); - speedSeriesMovingAverage.setName(tack + " " + legType + " Speed - MovingAverage"); - speedSeriesMovingAverage.setPoints(pointsForUpwindStarboardAverageSpeedMovingAverage); - chart.addSeries(speedSeriesMovingAverage, false, false); - Point[] pointsForUpwindStarboardAverageSpeedRegression = toPointArray(result.getPointsForAverageSpeedRegression(tack, legType)); Series speedSeriesRegression = chart.createSeries(); speedSeriesRegression.setName(tack + " " + legType + " Speed - Regression"); speedSeriesRegression.setPoints(pointsForUpwindStarboardAverageSpeedRegression); chart.addSeries(speedSeriesRegression, false, false); - - Point[] pointsForUpwindStarboardAverageConfidence = toPointArray(result.getPointsForAverageConfidence(tack, legType)); - Series confidenceSeries = chart - .createSeries() - .setYAxis(1) - .setType(Series.Type.SPLINE) - .setPlotOptions( - new SplinePlotOptions().setColor("#AA4643").setMarker(new Marker().setEnabled(false)) - .setDashStyle(PlotLine.DashStyle.SHORT_DOT)); - confidenceSeries.setName(tack + " " + legType + " Confidence"); - confidenceSeries.setPoints(pointsForUpwindStarboardAverageConfidence); - chart.addSeries(confidenceSeries, false, false); - + if (!showByDefault) { speedSeriesRegression.setVisible(false, false); - confidenceSeries.setVisible(false, false); } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java index e7ab188631d..e302311b980 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java @@ -61,10 +61,10 @@ import com.sap.sailing.domain.abstractlog.AbstractLog; import com.sap.sailing.domain.abstractlog.AbstractLogEvent; import com.sap.sailing.domain.abstractlog.MultiLogAnalyzer; import com.sap.sailing.domain.abstractlog.impl.AllEventsOfTypeFinder; -import com.sap.sailing.domain.abstractlog.race.RaceLogFixedMarkPassingEvent; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory; +import com.sap.sailing.domain.abstractlog.race.RaceLogFixedMarkPassingEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogFlagEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogSuppressedMarkPassingsEvent; import com.sap.sailing.domain.abstractlog.race.analyzing.impl.AbortingFlagFinder; @@ -5585,45 +5585,20 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S @Override public PolarSheetsXYDiagramData createXYDiagramForBoatClass(String boatClassName) { BoatClass boatClass = getService().getBaseDomainFactory().getOrCreateBoatClass(boatClassName); - Map, List>> movingAverageSpeedDataLists = new HashMap<>(); Map, List>> regressionSpeedDataLists = new HashMap<>(); - Map, List>> averageConfidenceDataLists = new HashMap<>(); for (LegType legType : new LegType[] { LegType.UPWIND, LegType.DOWNWIND }) { for (Tack tack : new Tack[] { Tack.PORT, Tack.STARBOARD }) { - movingAverageSpeedDataLists.put(new Pair(legType, tack), - new ArrayList>()); regressionSpeedDataLists.put(new Pair(legType, tack), new ArrayList>()); - averageConfidenceDataLists.put(new Pair(legType, tack), - new ArrayList>()); } } for (double windInKnots = 0.1; windInKnots < 30; windInKnots = windInKnots + 0.1) { for (LegType legType : new LegType[] { LegType.UPWIND, LegType.DOWNWIND }) { - for (Tack tack : new Tack[] { Tack.PORT, Tack.STARBOARD }) { - - try { - SpeedWithBearingWithConfidence averageUpwindStarboardMovingAverage = getService() - .getPolarDataService().getAverageSpeedWithBearing(boatClass, - new KnotSpeedImpl(windInKnots), legType, tack, false); - - movingAverageSpeedDataLists.get(new Pair(legType, tack)).add( - new Pair(windInKnots, averageUpwindStarboardMovingAverage.getObject() - .getKnots())); - - - averageConfidenceDataLists.get(new Pair(legType, tack)).add( - new Pair(windInKnots, averageUpwindStarboardMovingAverage - .getConfidence())); - - } catch (NotEnoughDataHasBeenAddedException e) { - // Do not add a point to the result - } - + for (Tack tack : new Tack[] { Tack.PORT, Tack.STARBOARD }) { try { SpeedWithBearingWithConfidence averageUpwindStarboardRegression = getService() .getPolarDataService().getAverageSpeedWithBearing(boatClass, - new KnotSpeedImpl(windInKnots), legType, tack, true); + new KnotSpeedImpl(windInKnots), legType, tack); regressionSpeedDataLists.get(new Pair(legType, tack)).add( new Pair(windInKnots, averageUpwindStarboardRegression.getObject() @@ -5635,8 +5610,7 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S } } - PolarSheetsXYDiagramData data = new PolarSheetsXYDiagramDataImpl(movingAverageSpeedDataLists, - regressionSpeedDataLists, averageConfidenceDataLists); + PolarSheetsXYDiagramData data = new PolarSheetsXYDiagramDataImpl(regressionSpeedDataLists); return data; } diff --git a/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/mining/test/PolarDataMinerTest.java b/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/mining/test/PolarDataMinerTest.java index dee8526a4c3..54b47b9586b 100644 --- a/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/mining/test/PolarDataMinerTest.java +++ b/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/mining/test/PolarDataMinerTest.java @@ -32,7 +32,6 @@ import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.PolarSheetGenerationSettings; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.impl.DegreeBearingImpl; @@ -52,9 +51,7 @@ import com.sap.sailing.domain.tracking.impl.DynamicGPSFixMovingTrackImpl; import com.sap.sailing.domain.tracking.impl.WindWithConfidenceImpl; import com.sap.sailing.polars.mining.BearingClusterGroup; import com.sap.sailing.polars.mining.CubicRegressionPerCourseProcessor; -import com.sap.sailing.polars.mining.MovingAverageProcessorImpl; import com.sap.sailing.polars.mining.PolarDataMiner; -import com.sap.sailing.polars.mining.SpeedClusterGroupFromWindSteppingCreator; import com.sap.sailing.polars.mining.SpeedRegressionPerAngleClusterProcessor; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util.Pair; @@ -91,12 +88,9 @@ public class PolarDataMinerTest { NotEnoughDataHasBeenAddedException { PolarSheetGenerationSettings settings = createTestPolarSettings(); ClusterGroup angleClusterGroup = createAngleClusterGroup(); - WindSpeedSteppingWithMaxDistance stepping = settings.getWindSpeedStepping(); - final ClusterGroup speedClusterGroup = SpeedClusterGroupFromWindSteppingCreator - .createSpeedClusterGroupFrom(stepping); - PolarDataMiner miner = new PolarDataMiner(settings, new MovingAverageProcessorImpl(speedClusterGroup), + PolarDataMiner miner = new PolarDataMiner(settings, new CubicRegressionPerCourseProcessor(), - new SpeedRegressionPerAngleClusterProcessor(angleClusterGroup), speedClusterGroup, angleClusterGroup); + new SpeedRegressionPerAngleClusterProcessor(angleClusterGroup), angleClusterGroup); BoatClass mockedBoatClass = mock(BoatClass.class); diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/impl/PolarDataServiceImpl.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/impl/PolarDataServiceImpl.java index de86571dfc6..c4892903732 100755 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/impl/PolarDataServiceImpl.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/impl/PolarDataServiceImpl.java @@ -33,7 +33,6 @@ import com.sap.sailing.domain.common.confidence.impl.BearingWithConfidenceImpl; import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.PolarSheetGenerationSettingsImpl; -import com.sap.sailing.domain.common.impl.WindSpeedSteppingWithMaxDistance; import com.sap.sailing.domain.common.tracking.GPSFixMoving; import com.sap.sailing.domain.polars.NotEnoughDataHasBeenAddedException; import com.sap.sailing.domain.polars.PolarDataService; @@ -46,9 +45,7 @@ import com.sap.sailing.polars.data.PolarFix; import com.sap.sailing.polars.generation.PolarSheetGenerator; import com.sap.sailing.polars.mining.BearingClusterGroup; import com.sap.sailing.polars.mining.CubicRegressionPerCourseProcessor; -import com.sap.sailing.polars.mining.MovingAverageProcessorImpl; import com.sap.sailing.polars.mining.PolarDataMiner; -import com.sap.sailing.polars.mining.SpeedClusterGroupFromWindSteppingCreator; import com.sap.sailing.polars.mining.SpeedRegressionPerAngleClusterProcessor; import com.sap.sse.common.Util.Pair; import com.sap.sse.datamining.data.ClusterGroup; @@ -91,15 +88,11 @@ public class PolarDataServiceImpl implements PolarDataService, ReplicableWithObj public PolarDataServiceImpl() { PolarSheetGenerationSettings settings = PolarSheetGenerationSettingsImpl.createBackendPolarSettings(); ClusterGroup angleClusterGroup = createAngleClusterGroup(); - WindSpeedSteppingWithMaxDistance stepping = settings.getWindSpeedStepping(); - final ClusterGroup speedClusterGroup = SpeedClusterGroupFromWindSteppingCreator - .createSpeedClusterGroupFrom(stepping); - MovingAverageProcessorImpl movingAverageProcessor = new MovingAverageProcessorImpl(speedClusterGroup); CubicRegressionPerCourseProcessor cubicRegressionPerCourseProcessor = new CubicRegressionPerCourseProcessor(); SpeedRegressionPerAngleClusterProcessor speedRegressionPerAngleClusterProcessor = new SpeedRegressionPerAngleClusterProcessor( angleClusterGroup); - this.polarDataMiner = new PolarDataMiner(settings, movingAverageProcessor, cubicRegressionPerCourseProcessor, - speedRegressionPerAngleClusterProcessor, speedClusterGroup, angleClusterGroup); + this.polarDataMiner = new PolarDataMiner(settings, cubicRegressionPerCourseProcessor, + speedRegressionPerAngleClusterProcessor, angleClusterGroup); this.operationsSentToMasterForReplication = new HashSet<>(); this.operationExecutionListeners = new ConcurrentHashMap<>(); } @@ -124,12 +117,12 @@ public class PolarDataServiceImpl implements PolarDataService, ReplicableWithObj @Override public SpeedWithBearingWithConfidence getAverageSpeedWithBearing(BoatClass boatClass, Speed windSpeed, - LegType legType, Tack tack, boolean useRegressionForSpeed) throws NotEnoughDataHasBeenAddedException { + LegType legType, Tack tack) throws NotEnoughDataHasBeenAddedException { if (polarDataMiner == null) { throw new NotEnoughDataHasBeenAddedException("Polar Data Miner is currently unavailable. Maybe we are in the process of replication initial load?"); } SpeedWithBearingWithConfidence averageSpeedAndCourseOverGround = polarDataMiner - .getAverageSpeedAndCourseOverGround(boatClass, windSpeed, legType, useRegressionForSpeed); + .getAverageSpeedAndCourseOverGround(boatClass, windSpeed, legType); if (tack == Tack.PORT) { //Negative twa DegreeBearingImpl bearing = new DegreeBearingImpl(-averageSpeedAndCourseOverGround.getObject().getBearing() @@ -251,19 +244,13 @@ public class PolarDataServiceImpl implements PolarDataService, ReplicableWithObj if (polarDataMiner == null) { throw new NotEnoughDataHasBeenAddedException("Polar Data Miner is currently unavailable. Maybe we are in the process of replication initial load?"); } - SpeedWithBearingWithConfidence speed = polarDataMiner.getAverageSpeedAndCourseOverGround(boatClass, windSpeed, legType, true); + SpeedWithBearingWithConfidence speed = polarDataMiner.getAverageSpeedAndCourseOverGround(boatClass, windSpeed, legType); Bearing bearing = new DegreeBearingImpl(speed.getObject().getBearing().getDegrees() * 2); BearingWithConfidence bearingWithConfidence = new BearingWithConfidenceImpl(bearing, speed.getConfidence(), null); return bearingWithConfidence; } - @Override - public SpeedWithBearingWithConfidence getAverageSpeedWithBearing(BoatClass boatClass, Speed windSpeed, - LegType legType, Tack tack) throws NotEnoughDataHasBeenAddedException { - return getAverageSpeedWithBearing(boatClass, windSpeed, legType, tack, true); - } - @Override public void insertExistingFixes(TrackedRace trackedRace) { for (Competitor competitor : trackedRace.getRace().getCompetitors()) { @@ -331,19 +318,13 @@ public class PolarDataServiceImpl implements PolarDataService, ReplicableWithObj public void initiallyFillFromInternal(ObjectInputStream is) throws IOException, ClassNotFoundException, InterruptedException { PolarSheetGenerationSettings backendPolarSettings = (PolarSheetGenerationSettings) is.readObject(); - //MovingAverageProcessor movingAverageProcessor = (MovingAverageProcessor) is.readObject(); - PolarSheetGenerationSettings settings = PolarSheetGenerationSettingsImpl.createBackendPolarSettings(); - WindSpeedSteppingWithMaxDistance stepping = settings.getWindSpeedStepping(); - final ClusterGroup speedClusterGroup = SpeedClusterGroupFromWindSteppingCreator - .createSpeedClusterGroupFrom(stepping); - MovingAverageProcessorImpl movingAverageProcessor = new MovingAverageProcessorImpl(speedClusterGroup); CubicRegressionPerCourseProcessor cubicRegressionPerCourseProcessor = (CubicRegressionPerCourseProcessor) is.readObject(); SpeedRegressionPerAngleClusterProcessor speedRegressionPerAngleClusterProcessor = (SpeedRegressionPerAngleClusterProcessor) is.readObject(); - polarDataMiner = new PolarDataMiner(backendPolarSettings, movingAverageProcessor, + polarDataMiner = new PolarDataMiner(backendPolarSettings, cubicRegressionPerCourseProcessor, speedRegressionPerAngleClusterProcessor, - movingAverageProcessor.getSpeedCluster(), speedRegressionPerAngleClusterProcessor.getAngleCluster()); + speedRegressionPerAngleClusterProcessor.getAngleCluster()); } @Override diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/GPSFixMovingWithPolarContext.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/GPSFixMovingWithPolarContext.java index 0f9f4dc12ab..4283c45aa93 100644 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/GPSFixMovingWithPolarContext.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/GPSFixMovingWithPolarContext.java @@ -10,7 +10,6 @@ import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.WindSource; import com.sap.sailing.domain.common.WindSourceType; import com.sap.sailing.domain.common.confidence.BearingWithConfidence; @@ -28,12 +27,11 @@ import com.sap.sse.common.Util.Pair; import com.sap.sse.datamining.data.Cluster; import com.sap.sse.datamining.data.ClusterGroup; -public class GPSFixMovingWithPolarContext implements MovingAveragePolarClusterKey, AngleClusterPolarClusterKey { +public class GPSFixMovingWithPolarContext implements LegTypePolarClusterKey, AngleClusterPolarClusterKey { private final GPSFixMoving fix; private final TrackedRace race; private final Competitor competitor; - private final ClusterGroup windSpeedClusterGroup; private final Set windSourcesToExcludeForSpeed; private final ClusterGroup angleClusterGroup; private final BearingWithConfidence absTrueWindAngle; @@ -42,11 +40,10 @@ public class GPSFixMovingWithPolarContext implements MovingAveragePolarClusterKe private LegType legType; public GPSFixMovingWithPolarContext(GPSFixMoving fix, TrackedRace race, Competitor competitor, - ClusterGroup windSpeedClusterGroup, ClusterGroup angleClusterGroup) { + ClusterGroup angleClusterGroup) { this.fix = fix; this.race = race; this.competitor = competitor; - this.windSpeedClusterGroup = windSpeedClusterGroup; this.angleClusterGroup = angleClusterGroup; this.windSourcesToExcludeForSpeed = collectWindSourcesToIgnoreForSpeed(); this.absTrueWindAngle = computeTrueWindAngleAbsolute(); @@ -89,12 +86,6 @@ public class GPSFixMovingWithPolarContext implements MovingAveragePolarClusterKe return result; } - @Override - public Cluster getWindSpeedCluster() { - final WindWithConfidence> windWithConfidence = getWind(); - return windWithConfidence == null ? null : windSpeedClusterGroup.getClusterFor(windWithConfidence.getObject()); - } - public WindWithConfidence> getWind() { return wind; } diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/PolarDataMiner.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/PolarDataMiner.java index 290929a625c..d65855df3c8 100755 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/PolarDataMiner.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/PolarDataMiner.java @@ -68,15 +68,9 @@ public class PolarDataMiner { private final ConcurrentHashMap> listeners = new ConcurrentHashMap<>(); private ParallelFilteringProcessor preFilteringProcessor; - private final PolarSheetGenerationSettings backendPolarSheetGenerationSettings; - /** - * This processor keeps track of the moving average of the speed values and the average angle for each course (legtype tack combination) - */ - private final MovingAverageProcessor movingAverageProcessor; - /** * This processor uses two cubic regressions angle to the true wind over windspeed and boatspeed over windspeed for each * course (legtype tack combination) @@ -84,7 +78,6 @@ public class PolarDataMiner { private final CubicRegressionPerCourseProcessor cubicRegressionPerCourseProcessor; private final SpeedRegressionPerAngleClusterProcessor speedRegressionPerAngleClusterProcessor; - private final ClusterGroup speedClusterGroup; private final ClusterGroup angleClusterGroup; private ThreadPoolExecutor createExecutor() { @@ -109,16 +102,15 @@ public class PolarDataMiner { }; } - public PolarDataMiner(PolarSheetGenerationSettings backendPolarSettings, MovingAverageProcessor movingAverageProcessor, - CubicRegressionPerCourseProcessor cubicRegressionPerCourseProcessor, SpeedRegressionPerAngleClusterProcessor speedRegressionPerAngleClusterProcessor, - ClusterGroup speedClusterGroup, ClusterGroup angleClusterGroup) { + public PolarDataMiner(PolarSheetGenerationSettings backendPolarSettings, + CubicRegressionPerCourseProcessor cubicRegressionPerCourseProcessor, + SpeedRegressionPerAngleClusterProcessor speedRegressionPerAngleClusterProcessor, + ClusterGroup angleClusterGroup) { cubicRegressionPerCourseProcessor.setListeners(listeners); speedRegressionPerAngleClusterProcessor.setListeners(listeners); backendPolarSheetGenerationSettings = backendPolarSettings; - this.movingAverageProcessor = movingAverageProcessor; this.cubicRegressionPerCourseProcessor = cubicRegressionPerCourseProcessor; this.speedRegressionPerAngleClusterProcessor = speedRegressionPerAngleClusterProcessor; - this.speedClusterGroup = speedClusterGroup; this.angleClusterGroup = angleClusterGroup; try { setUpWorkflow(); @@ -130,17 +122,6 @@ public class PolarDataMiner { private void setUpWorkflow() throws ClassCastException, NoSuchMethodException, SecurityException { - Collection, ?>> movingAverageGrouperResultReceivers = new ArrayList, ?>>(); - movingAverageGrouperResultReceivers.add(movingAverageProcessor); - - Collection> parameterizedDimensions = new ArrayList<>(); - for (Function function : PolarDataDimensionCollectionFactory.getMovingAverageClusterKeyDimensions()) { - parameterizedDimensions.add(new SimpleParameterizedFunction<>(function, ParameterProvider.NULL)); - } - - Processor> movingAverageGroupingProcessor = new ParallelMultiDimensionsValueNestingGroupingProcessor( - GPSFixMovingWithPolarContext.class, executor, movingAverageGrouperResultReceivers, parameterizedDimensions); - Collection, ?>> regressionPerCourseGrouperResultReceivers = new ArrayList, ?>>(); regressionPerCourseGrouperResultReceivers.add(cubicRegressionPerCourseProcessor); @@ -164,7 +145,6 @@ public class PolarDataMiner { Collection> filteringResultReceivers = new ArrayList<>(); - filteringResultReceivers.add(movingAverageGroupingProcessor); filteringResultReceivers.add(cubicRegressionPerCourseGroupingProcessor); filteringResultReceivers.add(regressionPerAngleClusterGroupingProcessor); @@ -183,7 +163,7 @@ public class PolarDataMiner { protected GPSFixMovingWithPolarContext enrich(GPSFixMovingWithOriginInfo element) { GPSFixMovingWithPolarContext result = null; result = new GPSFixMovingWithPolarContext(element.getFix(), element.getTrackedRace(), - element.getCompetitor(), speedClusterGroup, angleClusterGroup); + element.getCompetitor(), angleClusterGroup); return result; } }; @@ -397,13 +377,9 @@ public class PolarDataMiner { } public SpeedWithBearingWithConfidence getAverageSpeedAndCourseOverGround(BoatClass boatClass, - Speed windSpeed, LegType legType, boolean useRegressionForSpeed) throws NotEnoughDataHasBeenAddedException { + Speed windSpeed, LegType legType) throws NotEnoughDataHasBeenAddedException { SpeedWithBearingWithConfidence averageSpeedAndCourseOverGround = null; - if (useRegressionForSpeed) { - averageSpeedAndCourseOverGround = cubicRegressionPerCourseProcessor.getAverageSpeedAndCourseOverGround(boatClass, windSpeed, legType); - } else { - averageSpeedAndCourseOverGround = movingAverageProcessor.getAverageSpeedAndCourseOverGround(boatClass, windSpeed, legType); - } + averageSpeedAndCourseOverGround = cubicRegressionPerCourseProcessor.getAverageSpeedAndCourseOverGround(boatClass, windSpeed, legType); return averageSpeedAndCourseOverGround; } @@ -453,10 +429,6 @@ public class PolarDataMiner { } } - public MovingAverageProcessor getMovingAverageProcessor() { - return movingAverageProcessor; - } - public CubicRegressionPerCourseProcessor getCubicRegressionPerCourseProcessor() { return cubicRegressionPerCourseProcessor; } diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/PolarResource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/PolarResource.java index 020b2dc782b..a6633dc57e2 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/PolarResource.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/PolarResource.java @@ -122,7 +122,7 @@ public class PolarResource extends AbstractSailingServerResource { try { PolarDataService service = getService().getPolarDataService(); SpeedWithBearingWithConfidence speedWithBearing = service.getAverageSpeedWithBearing(boatClass, - windSpeed, legType, tack, true); + windSpeed, legType, tack); String resultString = "Speed: " + speedWithBearing.getObject().getKnots() + "kn; Angle: " + speedWithBearing.getObject().getBearing().getDegrees() + "°; Confidence: " + speedWithBearing.getConfidence(); diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramGPS.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramGPS.java index fb121b0e1ec..21e724d6612 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramGPS.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramGPS.java @@ -57,9 +57,9 @@ public class PolarDiagramGPS extends PolarDiagramBase { for (int i = 0; i < windSpeeds.size(); i++) { try { beatPort = this.polarData.getAverageSpeedWithBearing(this.boatClass, windSpeeds.get(i), LegType.UPWIND, - Tack.PORT, true).getObject(); + Tack.PORT).getObject(); beatStar = this.polarData.getAverageSpeedWithBearing(this.boatClass, windSpeeds.get(i), LegType.UPWIND, - Tack.STARBOARD, true).getObject(); + Tack.STARBOARD).getObject(); } catch (NotEnoughDataHasBeenAddedException e) { beatPort = null; beatStar = null; @@ -86,9 +86,9 @@ public class PolarDiagramGPS extends PolarDiagramBase { for (int i = 0; i < windSpeeds.size(); i++) { try { jibePort = this.polarData.getAverageSpeedWithBearing(this.boatClass, windSpeeds.get(i), - LegType.DOWNWIND, Tack.PORT, true).getObject(); + LegType.DOWNWIND, Tack.PORT).getObject(); jibeStar = this.polarData.getAverageSpeedWithBearing(this.boatClass, windSpeeds.get(i), - LegType.DOWNWIND, Tack.STARBOARD, true).getObject(); + LegType.DOWNWIND, Tack.STARBOARD).getObject(); } catch (NotEnoughDataHasBeenAddedException e) { jibePort = null; jibeStar = null; diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramGPSDirect.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramGPSDirect.java index 9371406c41c..467335702b0 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramGPSDirect.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramGPSDirect.java @@ -146,13 +146,13 @@ public class PolarDiagramGPSDirect implements PolarDiagram, Serializable { try { if (beatPort == null) { SpeedWithBearing beatPortRelative = this.polarData.getAverageSpeedWithBearing(this.boatClass, wind, - LegType.UPWIND, Tack.PORT, true).getObject(); + LegType.UPWIND, Tack.PORT).getObject(); beatPort = new KnotSpeedWithBearingImpl(beatPortRelative.getKnots(), this.wind.getBearing().reverse() .add(beatPortRelative.getBearing())); } if (beatStar == null) { SpeedWithBearing beatStarRelative = this.polarData.getAverageSpeedWithBearing(this.boatClass, wind, - LegType.UPWIND, Tack.STARBOARD, true).getObject(); + LegType.UPWIND, Tack.STARBOARD).getObject(); beatStar = new KnotSpeedWithBearingImpl(beatStarRelative.getKnots(), this.wind.getBearing().reverse() .add(beatStarRelative.getBearing())); } @@ -175,13 +175,13 @@ public class PolarDiagramGPSDirect implements PolarDiagram, Serializable { try { if (jibePort == null) { SpeedWithBearing jibePortRelative = this.polarData.getAverageSpeedWithBearing(this.boatClass, wind, - LegType.DOWNWIND, Tack.PORT, true).getObject(); + LegType.DOWNWIND, Tack.PORT).getObject(); jibePort = new KnotSpeedWithBearingImpl(jibePortRelative.getKnots(), this.wind.getBearing().reverse() .add(jibePortRelative.getBearing())); } if (jibeStar == null) { SpeedWithBearing jibeStarRelative = this.polarData.getAverageSpeedWithBearing(this.boatClass, wind, - LegType.DOWNWIND, Tack.STARBOARD, true).getObject(); + LegType.DOWNWIND, Tack.STARBOARD).getObject(); jibeStar = new KnotSpeedWithBearingImpl(jibeStarRelative.getKnots(), this.wind.getBearing().reverse() .add(jibeStarRelative.getBearing())); } From 874e490dc0418b3a0dd340bdcbdced20ced138d1 Mon Sep 17 00:00:00 2001 From: Frederik Petersen Date: Mon, 20 Jul 2015 18:25:08 +0200 Subject: [PATCH 23/31] Master data import now supports device config import fixes bug3151 --- .../masterdataimport/TopLevelMasterData.java | 10 ++++++- .../sailing/gwt/ui/client/SailingService.java | 2 +- .../gwt/ui/client/SailingServiceAsync.java | 2 +- .../sailing/gwt/ui/client/StringMessages.java | 2 ++ .../gwt/ui/client/StringMessages.properties | 4 ++- .../ui/client/StringMessages_de.properties | 4 ++- .../ui/client/StringMessages_ru.properties | 4 ++- .../MasterDataImportPanel.java | 9 +++++- .../gwt/ui/server/SailingServiceImpl.java | 9 +++--- .../gateway/jaxrs/spi/MasterDataResource.java | 21 ++++++++++++-- .../impl/MediaMasterDataExportTest.java | 3 +- .../server/test/MasterDataImportTest.java | 26 ++++++++--------- .../ImportMasterDataOperation.java | 28 +++++++++++++++++++ 13 files changed, 97 insertions(+), 27 deletions(-) diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/masterdataimport/TopLevelMasterData.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/masterdataimport/TopLevelMasterData.java index 165939aefd7..4a461b1dcaa 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/masterdataimport/TopLevelMasterData.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/masterdataimport/TopLevelMasterData.java @@ -23,6 +23,8 @@ import com.sap.sailing.domain.base.Event; import com.sap.sailing.domain.base.Fleet; import com.sap.sailing.domain.base.RaceColumn; import com.sap.sailing.domain.base.Regatta; +import com.sap.sailing.domain.base.configuration.DeviceConfiguration; +import com.sap.sailing.domain.base.configuration.DeviceConfigurationMatcher; import com.sap.sailing.domain.common.RaceIdentifier; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; import com.sap.sailing.domain.common.RegattaIdentifier; @@ -62,10 +64,11 @@ public class TopLevelMasterData implements Serializable { private final Set windTrackMasterData; private final Map> eventForLeaderboardGroup; private final Map> raceLogTrackingFixes; + private final Map deviceConfigurations; public TopLevelMasterData(final Set groupsToExport, final Iterable allEvents, final Map regattaForRaceIdString, final Collection allMediaTracks, - GPSFixStore gpsFixStore, boolean exportWind) { + GPSFixStore gpsFixStore, boolean exportWind, Map deviceConfigurations) { this.raceIdStringsForRegatta = convertToRaceIdStringsForRegattaMap(regattaForRaceIdString); this.leaderboardGroups = groupsToExport; this.raceLogTrackingFixes = getAllRelevantRaceLogTrackingFixes(gpsFixStore); @@ -74,6 +77,7 @@ public class TopLevelMasterData implements Serializable { } else { this.windTrackMasterData = new HashSet(); } + this.deviceConfigurations = deviceConfigurations; this.eventForLeaderboardGroup = createEventMap(groupsToExport, allEvents); this.filteredMediaTracks = new HashSet(); filterMediaTracks(allMediaTracks, this.filteredMediaTracks); @@ -344,4 +348,8 @@ public class TopLevelMasterData implements Serializable { public Map> getRaceLogTrackingFixes() { return raceLogTrackingFixes; } + + public Map getDeviceConfigurations() { + return deviceConfigurations; + } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java index 4b751160c6c..3cbaa3f8e10 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java @@ -407,7 +407,7 @@ public interface SailingService extends RemoteService, FileStorageManagementGwtS List getLeaderboardGroupNamesFromRemoteServer(String host); - UUID importMasterData(String host, String[] groupNames, boolean override, boolean compress, boolean exportWind); + UUID importMasterData(String host, String[] groupNames, boolean override, boolean compress, boolean exportWind, boolean exportDeviceConfigurations); DataImportProgress getImportOperationProgress(UUID id); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java index 1b6a87df0f0..10ad3e1bd81 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java @@ -518,7 +518,7 @@ public interface SailingServiceAsync extends BuildVersionRetriever, FileStorageM void getRegattaLog(String leaderboardName, AsyncCallback callback); void importMasterData(String host, String[] names, boolean override, boolean compress, boolean exportWind, - AsyncCallback asyncCallback); + boolean exportDeviceConfigurations, AsyncCallback asyncCallback); void getImportOperationProgress(UUID id, AsyncCallback asyncCallback); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java index a8a95ad2383..8ea867e7b6e 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java @@ -1050,6 +1050,8 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, c String ratio(); String importWind(); String importWindTooltip(); + String importDeviceConfigurations(); + String importDeviceConfigurationsTooltip(); String authorName(); String authorPriority(); String removeDenotation(); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties index 40726f81e88..4061584d7f0 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties @@ -1018,6 +1018,8 @@ showAddedScores=Show added scores for each entry in leaderboard ratio=ratio importWind=Import Wind importWindTooltip=Unchecking this option will drastically lower the amount of data transfered. +importDeviceConfigurations=Import Device Configurations +importDeviceConfigurationsTooltip=Checking this will import ALL device configurations on the remote server. authorName=Author name authorPriority=Author priority removeDenotation=Remove Denotation @@ -1319,4 +1321,4 @@ degreesToWind={0}° to wind miniLeeaderboardLegendText=Shows the points along with the number of races per competitor currentOfTotal={0,number}/{1,number} noFinishedRaces=There are no finished races yet -racesOverview=Races overview \ No newline at end of file +racesOverview=Races overview diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties index 913466caac2..a665440aebb 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties @@ -1014,6 +1014,8 @@ showAddedScores=Addierte Punkte für jeden Eintrag im Leaderboard anzeigen ratio=Verhältnis importWind=Wind importieren importWindTooltip=Diese Option zu deselektieren führt zu einer wesentlich kleineren übertragenen Datenmenge. +importDeviceConfigurations=Device Configurations importieren +importDeviceConfigurationsTooltip=ALLE device configurations werden importiert. authorName=Benutzername authorPriority=Benutzer-Priorität removeDenotation=Markierung entfernen @@ -1309,4 +1311,4 @@ degreesToWind={0}° zum Wind miniLeeaderboardLegendText=Es werden die Punkte und die Anzahl Rennen je Team angezeigt currentOfTotal={0,number}/{1,number} noFinishedRaces=Es wurden noch keine Wettfahrten beendet. -racesOverview=Wettfahrtübersicht \ No newline at end of file +racesOverview=Wettfahrtübersicht diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties index 5dc7da1844e..68aa8d152bb 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties @@ -974,6 +974,8 @@ showAddedScores=Показать добавленные очки для кажд ratio=коэффициент importWind=Имопрт данных о ветре importWindTooltip=Снятие флажка с этой опции значительно снизит объем передаваемых данных. +importDeviceConfigurations=Конфигурации Импорт устройств +importDeviceConfigurationsTooltip=Все конфигурации устройства ввозятся. authorName=Имя автора authorPriority=Приоритет автора removeDenotation=Remove Denotation @@ -1256,4 +1258,4 @@ degreesToWind={0}° to wind miniLeeaderboardLegendText=Shows points along with the number of races per competitor currentOfTotal={0,number}/{1,number} noFinishedRaces=There are no finished races yet -racesOverview=Races overview \ No newline at end of file +racesOverview=Races overview diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/masterdataimport/MasterDataImportPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/masterdataimport/MasterDataImportPanel.java index 9550c3c641d..2f69d8b9954 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/masterdataimport/MasterDataImportPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/masterdataimport/MasterDataImportPanel.java @@ -55,6 +55,7 @@ public class MasterDataImportPanel extends VerticalPanel { private final LeaderboardGroupsRefresher leaderboardGroupsRefresher; private CheckBox compressSwitch; private CheckBox exportWindSwitch; + private CheckBox exportDeviceConfigsSwitch; private TextBox filterBox; public MasterDataImportPanel(StringMessages stringMessages, SailingServiceAsync sailingService, @@ -131,8 +132,9 @@ public class MasterDataImportPanel extends VerticalPanel { boolean override = overrideSwitch.getValue(); boolean compress = compressSwitch.getValue(); boolean exportWind = exportWindSwitch.getValue(); + boolean exportDeviceConfigs = exportDeviceConfigsSwitch.getValue(); sailingService.importMasterData(currentHost, groupNames, override, compress, exportWind, - new AsyncCallback() { + exportDeviceConfigs, new AsyncCallback() { @Override public void onFailure(Throwable caught) { @@ -341,6 +343,11 @@ public class MasterDataImportPanel extends VerticalPanel { exportWindSwitch.setTitle(stringMessages.importWindTooltip()); exportWindSwitch.setValue(true); contentPanel.add(exportWindSwitch); + + exportDeviceConfigsSwitch = new CheckBox(stringMessages.importDeviceConfigurations()); + exportDeviceConfigsSwitch.setTitle(stringMessages.importDeviceConfigurationsTooltip()); + exportDeviceConfigsSwitch.setValue(false); + contentPanel.add(exportDeviceConfigsSwitch); importLeaderboardGroupsButton = new Button(stringMessages.importSelectedLeaderboardGroups()); importLeaderboardGroupsButton.setEnabled(false); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java index e302311b980..3af984f12fe 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java @@ -4395,7 +4395,7 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S @Override public UUID importMasterData(final String urlAsString, final String[] groupNames, final boolean override, - final boolean compress, final boolean exportWind) { + final boolean compress, final boolean exportWind, final boolean exportDeviceConfigurations) { final UUID importOperationId = UUID.randomUUID(); getService().createOrUpdateDataImportProgressWithReplication(importOperationId, 0.0, "Initializing", 0.0); // Create a progress indicator for as long as the server gets data from the other server. @@ -4412,7 +4412,7 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S int port = hostnameAndPort.getB(); String query; try { - query = createLeaderboardQuery(groupNames, compress, exportWind); + query = createLeaderboardQuery(groupNames, compress, exportWind, exportDeviceConfigurations); } catch (UnsupportedEncodingException e1) { throw new RuntimeException(e1); } @@ -4502,14 +4502,15 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S return 0; } - private String createLeaderboardQuery(String[] groupNames, boolean compress, boolean exportWind) + private String createLeaderboardQuery(String[] groupNames, boolean compress, boolean exportWind, boolean exportDeviceConfigurations) throws UnsupportedEncodingException { StringBuffer queryStringBuffer = new StringBuffer(""); for (int i = 0; i < groupNames.length; i++) { String encodedGroupName = URLEncoder.encode(groupNames[i], "UTF-8"); queryStringBuffer.append("names[]=" + encodedGroupName + "&"); } - queryStringBuffer.append(String.format("compress=%s&exportWind=%s", compress, exportWind)); + queryStringBuffer.append(String.format("compress=%s&exportWind=%s&exportDeviceConfigs=%s", compress, + exportWind, exportDeviceConfigurations)); return queryStringBuffer.toString(); } diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/spi/MasterDataResource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/spi/MasterDataResource.java index aeead5c50eb..76745e0753b 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/spi/MasterDataResource.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/spi/MasterDataResource.java @@ -7,6 +7,7 @@ import java.io.OutputStream; import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.ArrayList; +import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -24,6 +25,8 @@ import javax.ws.rs.core.Response.ResponseBuilder; import javax.ws.rs.core.StreamingOutput; import com.sap.sailing.domain.base.Competitor; +import com.sap.sailing.domain.base.configuration.DeviceConfiguration; +import com.sap.sailing.domain.base.configuration.DeviceConfigurationMatcher; import com.sap.sailing.domain.leaderboard.Leaderboard; import com.sap.sailing.domain.leaderboard.LeaderboardGroup; import com.sap.sailing.domain.masterdataimport.TopLevelMasterData; @@ -37,7 +40,7 @@ public class MasterDataResource extends AbstractSailingServerResource { @GET @Produces("application/x-java-serialized-object") public Response getMasterDataByLeaderboardGroups(@QueryParam("names[]") List leaderboardGroupNames, - @QueryParam("compress") Boolean compress, @QueryParam("exportWind") Boolean exportWind) + @QueryParam("compress") Boolean compress, @QueryParam("exportWind") Boolean exportWind, @QueryParam("exportDeviceConfigs") Boolean exportDeviceConfigs) throws UnsupportedEncodingException { final long startTime = System.currentTimeMillis(); logger.info("Masterdataexport has started"); @@ -47,6 +50,9 @@ public class MasterDataResource extends AbstractSailingServerResource { if (exportWind == null) { exportWind = true; } + if (exportDeviceConfigs == null) { + exportDeviceConfigs = false; + } logger.info(String.format("Masterdataexport gzip compression is turned %s", compress ? "on" : "off")); Map allLeaderboardGroups = getService().getLeaderboardGroups(); @@ -73,9 +79,15 @@ public class MasterDataResource extends AbstractSailingServerResource { } } } + Map deviceConfigurations; + if (exportDeviceConfigs) { + deviceConfigurations = getAllDeviceConfigs(); + } else { + deviceConfigurations = new HashMap<>(); + } final TopLevelMasterData masterData = new TopLevelMasterData(groupsToExport, getService().getAllEvents(), getService().getPersistentRegattasForRaceIDs(), getService() - .getAllMediaTracks(), getService().getGPSFixStore(), exportWind); + .getAllMediaTracks(), getService().getGPSFixStore(), exportWind, deviceConfigurations); final StreamingOutput streamingOutput; if (compress) { streamingOutput= new CompressingStreamingOutput(masterData, competitorIds, startTime); @@ -92,6 +104,11 @@ public class MasterDataResource extends AbstractSailingServerResource { return builtResponse; } + private Map getAllDeviceConfigs() { + Map configs = getService().getAllDeviceConfigurations(); + return configs; + } + private abstract class AbstractStreamingOutput implements StreamingOutput { private final TopLevelMasterData masterData; private final List competitorIds; diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/impl/MediaMasterDataExportTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/impl/MediaMasterDataExportTest.java index 3f3dca1378b..3cf24c8da1f 100644 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/impl/MediaMasterDataExportTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/impl/MediaMasterDataExportTest.java @@ -7,6 +7,7 @@ import java.io.Serializable; import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -164,7 +165,7 @@ public class MediaMasterDataExportTest { Map regattaForRaceIdString = Collections.emptyMap(); GPSFixStore gpsFixStore = mock(GPSFixStore.class); boolean exportWind = false; - TopLevelMasterData topLevelMasterData = new TopLevelMasterData(groupsToExport , allEvents , regattaForRaceIdString, allMediaTracks , gpsFixStore , exportWind); + TopLevelMasterData topLevelMasterData = new TopLevelMasterData(groupsToExport , allEvents , regattaForRaceIdString, allMediaTracks , gpsFixStore , exportWind, new HashMap<>()); return topLevelMasterData; } diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java index 9acf17eff9f..bf2ec6db485 100755 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java @@ -307,7 +307,7 @@ public class MasterDataImportTest { DomainFactory domainFactory; MasterDataResource resource = new MasterDataResource(); MasterDataResource spyResource = spyResource(resource, sourceService); - Response response = spyResource.getMasterDataByLeaderboardGroups(groupNamesToExport, false, true); + Response response = spyResource.getMasterDataByLeaderboardGroups(groupNamesToExport, false, true, false); StreamingOutput streamingOutput = (StreamingOutput) response.getEntity(); ByteArrayOutputStream os = new ByteArrayOutputStream(); UUID randomUUID = UUID.randomUUID(); @@ -514,7 +514,7 @@ public class MasterDataImportTest { DomainFactory domainFactory; MasterDataResource resource = new MasterDataResource(); MasterDataResource spyResource = spyResource(resource, sourceService); - Response response = spyResource.getMasterDataByLeaderboardGroups(groupNamesToExport, false, true); + Response response = spyResource.getMasterDataByLeaderboardGroups(groupNamesToExport, false, true, false); StreamingOutput streamingOutput = (StreamingOutput) response.getEntity(); ByteArrayOutputStream os = new ByteArrayOutputStream(); UUID randomUUID = UUID.randomUUID(); @@ -657,7 +657,7 @@ public class MasterDataImportTest { DomainFactory domainFactory; MasterDataResource resource = new MasterDataResource(); MasterDataResource spyResource = spyResource(resource, sourceService); - Response response = spyResource.getMasterDataByLeaderboardGroups(groupNamesToExport, false, true); + Response response = spyResource.getMasterDataByLeaderboardGroups(groupNamesToExport, false, true, false); StreamingOutput streamingOutput = (StreamingOutput) response.getEntity(); ByteArrayOutputStream os = new ByteArrayOutputStream(); UUID randomUUID = UUID.randomUUID(); @@ -835,7 +835,7 @@ public class MasterDataImportTest { DomainFactory domainFactory; MasterDataResource resource = new MasterDataResource(); MasterDataResource spyResource = spyResource(resource, sourceService); - Response response = spyResource.getMasterDataByLeaderboardGroups(groupNamesToExport, false, true); + Response response = spyResource.getMasterDataByLeaderboardGroups(groupNamesToExport, false, true, false); StreamingOutput streamingOutput = (StreamingOutput) response.getEntity(); ByteArrayOutputStream os = new ByteArrayOutputStream(); UUID randomUUID = UUID.randomUUID(); @@ -997,7 +997,7 @@ public class MasterDataImportTest { DomainFactory domainFactory; MasterDataResource resource = new MasterDataResource(); MasterDataResource spyResource = spyResource(resource, sourceService); - Response response = spyResource.getMasterDataByLeaderboardGroups(groupNamesToExport, false, true); + Response response = spyResource.getMasterDataByLeaderboardGroups(groupNamesToExport, false, true, false); StreamingOutput streamingOutput = (StreamingOutput) response.getEntity(); ByteArrayOutputStream os = new ByteArrayOutputStream(); UUID randomUUID = UUID.randomUUID(); @@ -1196,7 +1196,7 @@ public class MasterDataImportTest { DomainFactory domainFactory; MasterDataResource resource = new MasterDataResource(); MasterDataResource spyResource = spyResource(resource, sourceService); - Response response = spyResource.getMasterDataByLeaderboardGroups(groupNamesToExport, false, true); + Response response = spyResource.getMasterDataByLeaderboardGroups(groupNamesToExport, false, true, false); StreamingOutput streamingOutput = (StreamingOutput) response.getEntity(); ByteArrayOutputStream os = new ByteArrayOutputStream(); UUID randomUUID = UUID.randomUUID(); @@ -1356,7 +1356,7 @@ public class MasterDataImportTest { DomainFactory domainFactory; MasterDataResource resource = new MasterDataResource(); MasterDataResource spyResource = spyResource(resource, sourceService); - Response response = spyResource.getMasterDataByLeaderboardGroups(groupNamesToExport, false, true); + Response response = spyResource.getMasterDataByLeaderboardGroups(groupNamesToExport, false, true, false); StreamingOutput streamingOutput = (StreamingOutput) response.getEntity(); ByteArrayOutputStream os = new ByteArrayOutputStream(); UUID randomUUID = UUID.randomUUID(); @@ -1487,7 +1487,7 @@ public class MasterDataImportTest { DomainFactory domainFactory; MasterDataResource resource = new MasterDataResource(); MasterDataResource spyResource = spyResource(resource, sourceService); - Response response = spyResource.getMasterDataByLeaderboardGroups(groupNamesToExport, false, true); + Response response = spyResource.getMasterDataByLeaderboardGroups(groupNamesToExport, false, true, false); StreamingOutput streamingOutput = (StreamingOutput) response.getEntity(); ByteArrayOutputStream os = new ByteArrayOutputStream(); UUID randomUUID = UUID.randomUUID(); @@ -1623,7 +1623,7 @@ public class MasterDataImportTest { DomainFactory domainFactory; MasterDataResource resource = new MasterDataResource(); MasterDataResource spyResource = spyResource(resource, sourceService); - Response response = spyResource.getMasterDataByLeaderboardGroups(groupNamesToExport, false, true); + Response response = spyResource.getMasterDataByLeaderboardGroups(groupNamesToExport, false, true, false); StreamingOutput streamingOutput = (StreamingOutput) response.getEntity(); ByteArrayOutputStream os = new ByteArrayOutputStream(); UUID randomUUID = UUID.randomUUID(); @@ -1720,7 +1720,7 @@ public class MasterDataImportTest { DomainFactory domainFactory; MasterDataResource resource = new MasterDataResource(); MasterDataResource spyResource = spyResource(resource, sourceService); - Response response = spyResource.getMasterDataByLeaderboardGroups(groupNamesToExport, false, true); + Response response = spyResource.getMasterDataByLeaderboardGroups(groupNamesToExport, false, true, false); StreamingOutput streamingOutput = (StreamingOutput) response.getEntity(); ByteArrayOutputStream os = new ByteArrayOutputStream(); UUID randomUUID = UUID.randomUUID(); @@ -1843,7 +1843,7 @@ public class MasterDataImportTest { DomainFactory domainFactory; MasterDataResource resource = new MasterDataResource(); MasterDataResource spyResource = spyResource(resource, sourceService); - Response response = spyResource.getMasterDataByLeaderboardGroups(groupNamesToExport, false, true); + Response response = spyResource.getMasterDataByLeaderboardGroups(groupNamesToExport, false, true, false); StreamingOutput streamingOutput = (StreamingOutput) response.getEntity(); ByteArrayOutputStream os = new ByteArrayOutputStream(); UUID randomUUID = UUID.randomUUID(); @@ -1914,7 +1914,7 @@ public class MasterDataImportTest { DomainFactory domainFactory; MasterDataResource resource = new MasterDataResource(); MasterDataResource spyResource = spyResource(resource, sourceService); - Response response = spyResource.getMasterDataByLeaderboardGroups(groupNamesToExport, false, true); + Response response = spyResource.getMasterDataByLeaderboardGroups(groupNamesToExport, false, true, false); StreamingOutput streamingOutput = (StreamingOutput) response.getEntity(); ByteArrayOutputStream os = new ByteArrayOutputStream(); UUID randomUUID = UUID.randomUUID(); @@ -2103,7 +2103,7 @@ public class MasterDataImportTest { DomainFactory domainFactory; MasterDataResource resource = new MasterDataResource(); MasterDataResource spyResource = spyResource(resource, sourceService); - Response response = spyResource.getMasterDataByLeaderboardGroups(groupNamesToExport, false, true); + Response response = spyResource.getMasterDataByLeaderboardGroups(groupNamesToExport, false, true, false); StreamingOutput streamingOutput = (StreamingOutput) response.getEntity(); ByteArrayOutputStream os = new ByteArrayOutputStream(); UUID randomUUID = UUID.randomUUID(); diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/ImportMasterDataOperation.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/ImportMasterDataOperation.java index 6b1ad50bed0..58bcc9df1cd 100755 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/ImportMasterDataOperation.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/ImportMasterDataOperation.java @@ -22,6 +22,8 @@ import com.sap.sailing.domain.base.Fleet; import com.sap.sailing.domain.base.RaceColumn; import com.sap.sailing.domain.base.RaceDefinition; import com.sap.sailing.domain.base.Regatta; +import com.sap.sailing.domain.base.configuration.DeviceConfiguration; +import com.sap.sailing.domain.base.configuration.DeviceConfigurationMatcher; import com.sap.sailing.domain.base.impl.RegattaImpl; import com.sap.sailing.domain.common.DataImportProgress; import com.sap.sailing.domain.common.RaceIdentifier; @@ -119,6 +121,7 @@ public class ImportMasterDataOperation extends progress.setCurrentSubProgressPct(0); createWindTracks(toState); importRaceLogTrackingGPSFixes(toState); + importDeviceConfigurations(toState); dataImportLock.getProgress(importOperationId).setResult(creationCount); return creationCount; } catch (Exception e) { @@ -129,6 +132,31 @@ public class ImportMasterDataOperation extends } } + private void importDeviceConfigurations(RacingEventService toState) { + Map existingConfigs = toState.getAllDeviceConfigurations(); + Set existingKeys = existingConfigs.keySet(); + Map newConfigs = masterData.getDeviceConfigurations(); + for(Entry entry : newConfigs.entrySet()) { + DeviceConfigurationMatcher key = entry.getKey(); + DeviceConfiguration value = entry.getValue(); + if (existingKeys.contains(key)) { + if (override) { + logger.info(String.format( + "Device configuration [%s] already exists. Overwrite because override flag is set.", + key.getMatcherIdentifier())); + toState.removeDeviceConfiguration(key); + toState.createOrUpdateDeviceConfiguration(key, value); + } else { + logger.info(String + .format("Device configuration [%s] already exists. Not overwriting because override flag is not set.", + key.getMatcherIdentifier())); + } + } else { + toState.createOrUpdateDeviceConfiguration(key, value); + } + } + } + /** * Ensures that all links from eventReceived to its leaderboard groups are established also on the * local event after import as long as those leaderboard groups are part of the actual import. For this subset of From 64f6ce80ff4e657af3d2669aee7e805346e49cbc Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 20 Jul 2015 20:07:14 +0200 Subject: [PATCH 24/31] let monitoring bundle retry a number of times before deciding that the failing bundle needs a restart; new monitoring property monitor.retrycount with default 5 --- java/com.sap.sailing.gwt.ui/SailingGWT.launch | 152 +++++++++--------- .../monitoring/OSGiRestartingPortMonitor.java | 132 ++++++++------- .../SailingServer (No Proxy).launch | 4 +- 3 files changed, 153 insertions(+), 135 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/SailingGWT.launch b/java/com.sap.sailing.gwt.ui/SailingGWT.launch index 1690e01f416..07ca62c8e6b 100755 --- a/java/com.sap.sailing.gwt.ui/SailingGWT.launch +++ b/java/com.sap.sailing.gwt.ui/SailingGWT.launch @@ -1,76 +1,76 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com.sap.sailing.monitoring/src/com/sap/sailing/monitoring/OSGiRestartingPortMonitor.java b/java/com.sap.sailing.monitoring/src/com/sap/sailing/monitoring/OSGiRestartingPortMonitor.java index 416aca8839e..d269f761f24 100644 --- a/java/com.sap.sailing.monitoring/src/com/sap/sailing/monitoring/OSGiRestartingPortMonitor.java +++ b/java/com.sap.sailing.monitoring/src/com/sap/sailing/monitoring/OSGiRestartingPortMonitor.java @@ -1,5 +1,7 @@ package com.sap.sailing.monitoring; +import java.util.HashMap; +import java.util.Map; import java.util.Properties; import java.util.logging.Level; import java.util.logging.Logger; @@ -29,84 +31,96 @@ import com.sap.sailing.monitoring.sysinfo.SystemInformationImpl; * @since Nov 26, 2012 */ public class OSGiRestartingPortMonitor extends AbstractPortMonitor { - Logger log = Logger.getLogger(OSGiRestartingPortMonitor.class.getName()); + final static private Logger log = Logger.getLogger(OSGiRestartingPortMonitor.class.getName()); + + private final int DEFAULT_RETRY_COUNT_BEFORE_RESTART = 5; + + final int retryCountBeforeRestart; + + final Map failureCount; SystemInformation info = null; public OSGiRestartingPortMonitor(Properties properties) { super(properties); - + failureCount = new HashMap<>(); String[] props_bundles = properties.getProperty("monitor.bundles").split(","); - + retryCountBeforeRestart = Integer.valueOf(properties.getProperty("monitor.retrycount", ""+DEFAULT_RETRY_COUNT_BEFORE_RESTART).trim()); for (int i=0; i retryCountBeforeRestart) { + failureCount.remove(endpoint); + boolean sysinfo_available = true; + if (this.info == null) { + sysinfo_available = false; } - } else { - String info_before_restart = ""; - if (sysinfo_available) { - info_before_restart = info.toString(); - } - if (bundle.getState() == BundleEvent.STARTED || bundle.getState() == BundleEvent.STOPPED || bundle.getState() == 32l) { + + Bundle bundle = getBundleByName(endpoint.getBundleName()); + if (bundle == null) { + log.severe("Couldn't find bundle "+endpoint.getBundleName()+". Cannot restart. Please check monitoring.properties file"); try { - bundle.stop(); - } catch (BundleException e) { - log.severe("Could not stop " + endpoint.getBundleName() + " trying to start anyway."); - } - try { - bundle.start(); - } catch (BundleException e) { - e.printStackTrace(); - log.severe("Could not start " + endpoint.getBundleName() + "! Handler will try again next time"); - } - } else { - log.severe("Bundle " + endpoint.getBundleName() + " not in state STARTED or ACTIVE (State: +"+bundle.getState()+")! Restart not performed."); - } - final String subject = "Bundle " + endpoint.getBundleName() + " restarted"; - log.info(subject); - - /* only send mail if service has not failed before and mailing is enabled */ - if (!endpoint.hasFailed() /* before */ && this.properties.getProperty("mail.enabled", "true").equalsIgnoreCase("true")) { - log.info("Sending mail to " + this.properties.getProperty("mail.to") + " saying that bundle " - + endpoint.getBundleName() + " was restarted"); - try { - String content = "The Bundle " + endpoint.getBundleName() + " has been restarted - check on " - + endpoint + " didn't respond!\n" - + "This Mail won't be sent again if service continues to fail."; - - if (sysinfo_available) { - content += "\n\nSystem Information BEFORE restart:\n" + info_before_restart; - content += "\n\nSystem information AFTER restart:\n" + info.toString(); - } else { - content += "\n\nSystem information NOT available due to an error in the library (in most cases caused by native libs not being available)"; - } - sendMail(endpoint, subject, content); + sendMail(endpoint, "Couldn't find non-responsive bundle "+endpoint.getBundleName(), + "Couldn't find bundle "+endpoint.getBundleName()+". Cannot restart. Please check monitoring.properties file"); } catch (Exception e) { e.printStackTrace(); - log.throwing(getClass().getName(), "handleFailure", e); + log.log(Level.SEVERE, "handleFailure", e); + } + } else { + String info_before_restart = ""; + if (sysinfo_available) { + info_before_restart = info.toString(); + } + if (bundle.getState() == BundleEvent.STARTED || bundle.getState() == BundleEvent.STOPPED || bundle.getState() == 32l) { + try { + bundle.stop(); + } catch (BundleException e) { + log.severe("Could not stop " + endpoint.getBundleName() + " trying to start anyway."); + } + try { + bundle.start(); + } catch (BundleException e) { + e.printStackTrace(); + log.severe("Could not start " + endpoint.getBundleName() + "! Handler will try again next time"); + } + } else { + log.severe("Bundle " + endpoint.getBundleName() + " not in state STARTED or ACTIVE (State: +"+bundle.getState()+")! Restart not performed."); + } + final String subject = "Bundle " + endpoint.getBundleName() + " restarted"; + log.info(subject); + + /* only send mail if service has not failed before and mailing is enabled */ + if (!endpoint.hasFailed() /* before */ && this.properties.getProperty("mail.enabled", "true").equalsIgnoreCase("true")) { + log.info("Sending mail to " + this.properties.getProperty("mail.to") + " saying that bundle " + + endpoint.getBundleName() + " was restarted"); + try { + String content = "The Bundle " + endpoint.getBundleName() + " has been restarted - check on " + + endpoint + " didn't respond!\n" + + "This Mail won't be sent again if service continues to fail."; + + if (sysinfo_available) { + content += "\n\nSystem Information BEFORE restart:\n" + info_before_restart; + content += "\n\nSystem information AFTER restart:\n" + info.toString(); + } else { + content += "\n\nSystem information NOT available due to an error in the library (in most cases caused by native libs not being available)"; + } + sendMail(endpoint, subject, content); + } catch (Exception e) { + e.printStackTrace(); + log.throwing(getClass().getName(), "handleFailure", e); + } } } + } else { + log.info("Endpoint "+endpoint+" failed the "+myFailureCount+"th time since the last success. Trying again."); + failureCount.put(endpoint, myFailureCount); } } @@ -128,6 +142,10 @@ public class OSGiRestartingPortMonitor extends AbstractPortMonitor { @Override public void handleConnection(Endpoint endpoint) { + final Integer previousFailureCount; + if ((previousFailureCount = failureCount.remove(endpoint)) != null) { // endpoint succeeded + log.info("endpoint "+endpoint+" recovered after "+previousFailureCount+" failures"); + } } protected Bundle getBundleByName(String name) { diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy).launch b/java/com.sap.sailing.server/SailingServer (No Proxy).launch index 62feacb163b..204916a0010 100644 --- a/java/com.sap.sailing.server/SailingServer (No Proxy).launch +++ b/java/com.sap.sailing.server/SailingServer (No Proxy).launch @@ -30,9 +30,9 @@ - + - + From bfc1f3f5468ca4b89d6d87bb0dceee5890bf7946 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 20 Jul 2015 20:10:15 +0200 Subject: [PATCH 25/31] added monitor.retrycount to monitor.properties; increased monitoring timeout from 2 to 5 seconds --- java/target/configuration/monitoring.properties | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java/target/configuration/monitoring.properties b/java/target/configuration/monitoring.properties index 284e96f2c4c..0a4f6ca6e1d 100644 --- a/java/target/configuration/monitoring.properties +++ b/java/target/configuration/monitoring.properties @@ -7,8 +7,11 @@ monitor.gracetime = 60000 # time between interval checks, in milliseconds monitor.pause = 1000 +# retry this number of times before deciding that the bundle requires a restart +monitor.retrycount = 5 + # timeout before a port is deemed not responding, in milliseconds -monitor.timeout = 2000 +monitor.timeout = 5000 # how long the monitor should wait before calling # the failure handler for a second failure - this From ca34b7bd2777d952cd02dfaa3097a9c245d0dfa5 Mon Sep 17 00:00:00 2001 From: Frederik Petersen Date: Mon, 20 Jul 2015 20:23:43 +0200 Subject: [PATCH 26/31] Add null check, to keep master data import compatible --- .../operationaltransformation/ImportMasterDataOperation.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/ImportMasterDataOperation.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/ImportMasterDataOperation.java index 58bcc9df1cd..72027280753 100755 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/ImportMasterDataOperation.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/ImportMasterDataOperation.java @@ -121,7 +121,9 @@ public class ImportMasterDataOperation extends progress.setCurrentSubProgressPct(0); createWindTracks(toState); importRaceLogTrackingGPSFixes(toState); - importDeviceConfigurations(toState); + if (masterData.getDeviceConfigurations() != null) { + importDeviceConfigurations(toState); + } dataImportLock.getProgress(importOperationId).setResult(creationCount); return creationCount; } catch (Exception e) { From cb2e19a774cb2e1442bba5a19a4aa4c9e66bbcfd Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 20 Jul 2015 20:58:38 +0200 Subject: [PATCH 27/31] fixing bug 3149: the reverse transformation of the translated position back into the original position was done the wrong way around --- .../shared/racemap/RotateAndTranslateCoordinateSystem.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RotateAndTranslateCoordinateSystem.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RotateAndTranslateCoordinateSystem.java index 2877b970ecf..07f114984ac 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RotateAndTranslateCoordinateSystem.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RotateAndTranslateCoordinateSystem.java @@ -52,7 +52,7 @@ public class RotateAndTranslateCoordinateSystem implements CoordinateSystem { @Override public Position getPosition(LatLng p) { final Position mapped = new DegreePosition(p.getLatitude(), p.getLongitude()); - return mapped.getTargetCoordinates(zeroZero, equator, /* targetOrigin */ ZERO_ZERO, /* targetEquatorBearing */ EQUATOR_BEARING); + return mapped.getTargetCoordinates(/* local origin */ ZERO_ZERO, /* local equator bearing */ EQUATOR_BEARING, zeroZero, equator); } @Override From 6f21b640afbb67c5305266ffb64ed3429244b18b Mon Sep 17 00:00:00 2001 From: Frederik Petersen Date: Mon, 20 Jul 2015 22:07:05 +0200 Subject: [PATCH 28/31] Added polars replicable to env.sh comment --- java/target/env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/target/env.sh b/java/target/env.sh index 80556db3319..cf4752a6702 100644 --- a/java/target/env.sh +++ b/java/target/env.sh @@ -41,7 +41,7 @@ EXPEDITION_PORT=2010 # set the REPLICATE_MASTER_EXCHANGE_NAME variable to the # same channel the master is using in its REPLICATION_CHANNEL variable -# REPLICATE_ON_START=com.sap.sailing.server.impl.RacingEventServiceImpl,com.sap.sse.security.impl.SecurityServiceImpl,com.sap.sse.filestorage.impl.FileStorageManagementServiceImpl,com.sap.sse.mail.impl.MailServiceImpl +# REPLICATE_ON_START=com.sap.sailing.server.impl.RacingEventServiceImpl,com.sap.sse.security.impl.SecurityServiceImpl,com.sap.sse.filestorage.impl.FileStorageManagementServiceImpl,com.sap.sse.mail.impl.MailServiceImpl,com.sap.sailing.polars.impl.PolarDataServiceImpl # Host where the master Java instance is running # Make sure firewall configurations allow access From 901b3cd44d9f7dd350c4cb3850181ab817d6f560 Mon Sep 17 00:00:00 2001 From: Frederik Petersen Date: Mon, 20 Jul 2015 20:10:19 +0000 Subject: [PATCH 29/31] Updated amazon ec2 (markdown) --- wiki/amazon-ec2.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/amazon-ec2.md b/wiki/amazon-ec2.md index bc34153061a..be4c7a3a6dc 100644 --- a/wiki/amazon-ec2.md +++ b/wiki/amazon-ec2.md @@ -72,7 +72,7 @@ INSTALL_FROM_RELEASE=(name-of-release) USE_ENVIRONMENT=live-replica-server REPLICATE_MASTER_SERVLET_HOST=(IP of your master server) REPLICATE_MASTER_EXCHANGE_NAME=myspecificevent -REPLICATE_ON_START=com.sap.sailing.server.impl.RacingEventServiceImpl,com.sap.sse.security.impl.SecurityServiceImpl,com.sap.sse.filestorage.impl.FileStorageManagementServiceImpl,com.sap.sse.mail.impl.MailServiceImpl +REPLICATE_ON_START=com.sap.sailing.server.impl.RacingEventServiceImpl,com.sap.sse.security.impl.SecurityServiceImpl,com.sap.sse.filestorage.impl.FileStorageManagementServiceImpl,com.sap.sse.mail.impl.MailServiceImpl,com.sap.sailing.polars.impl.PolarDataServiceImpl SERVER_NAME=MYSPECIFICEVENT MONGODB_NAME=myspecificevent-replica EVENT_ID=<some-uuid-of-an-event-you-want-to-feature> From 7b4c55c42462d2c6c3474da161c5910d787ee9ec Mon Sep 17 00:00:00 2001 From: Peter Siegmund Date: Tue, 21 Jul 2015 14:32:09 +0200 Subject: [PATCH 30/31] preselect current dependent race --- .../adapters/DependentRaceSpinnerAdapter.java | 11 +++- .../fragments/raceinfo/StartTimeFragment.java | 63 ++++++++++++++++--- 2 files changed, 65 insertions(+), 9 deletions(-) diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/DependentRaceSpinnerAdapter.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/DependentRaceSpinnerAdapter.java index 6fb49c09e5e..6828bdf2539 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/DependentRaceSpinnerAdapter.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/DependentRaceSpinnerAdapter.java @@ -124,23 +124,32 @@ public class DependentRaceSpinnerAdapter implements SpinnerAdapter { return (mData.size() == 0); } - public void add(Util.Pair data) { + public int add(Util.Pair data) { boolean found = false; + int position = -1; + + int counter = 0; for (Util.Pair pair : mData) { if (pair.getA().equals(data.getA())) { if (pair.getB() == null && data.getB() == null) { found = true; + position = counter; break; } if (pair.getB() != null && pair.getB().equals(data.getB())) { found = true; + position = counter; break; } } + counter++; } if (!found) { mData.add(data); + position = mData.size() - 1; } + + return position; } public Util.Pair getSelected() { diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/StartTimeFragment.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/StartTimeFragment.java index 2c8980d8c0c..68a0c489af8 100755 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/StartTimeFragment.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/StartTimeFragment.java @@ -25,6 +25,8 @@ import android.widget.TimePicker; import com.sap.sailing.android.shared.util.ViewHolder; import com.sap.sailing.domain.abstractlog.race.SimpleRaceLogIdentifier; +import com.sap.sailing.domain.abstractlog.race.analyzing.impl.StartTimeFinder; +import com.sap.sailing.domain.abstractlog.race.analyzing.impl.StartTimeFinderResult; import com.sap.sailing.domain.abstractlog.race.impl.SimpleRaceLogIdentifierImpl; import com.sap.sailing.domain.abstractlog.race.state.RaceStateChangedListener; import com.sap.sailing.domain.abstractlog.race.state.ReadonlyRaceState; @@ -35,6 +37,7 @@ import com.sap.sailing.domain.common.racelog.RacingProcedureType; import com.sap.sailing.racecommittee.app.AppConstants; import com.sap.sailing.racecommittee.app.AppPreferences; import com.sap.sailing.racecommittee.app.R; +import com.sap.sailing.racecommittee.app.data.AndroidRaceLogResolver; import com.sap.sailing.racecommittee.app.data.DataStore; import com.sap.sailing.racecommittee.app.data.OnlineDataManager; import com.sap.sailing.racecommittee.app.domain.ManagedRace; @@ -229,6 +232,13 @@ public class StartTimeFragment extends BaseFragment if (frame != null) { frame.setVisibility(View.GONE); } + + StartTimeFinder stf = new StartTimeFinder(new AndroidRaceLogResolver(), getRace().getRaceLog()); + StartTimeFinderResult result = stf.analyze(); + if (result != null && result.isDependentStartTime()) { + mStartTimeOffset = result.getStartTimeDiff(); + mRaceId = Util.get(result.getRacesDependingOn(), 0); + } break; default: // MODE_SETUP @@ -294,9 +304,17 @@ public class StartTimeFragment extends BaseFragment mLeaderBoardAdapter = new DependentRaceSpinnerAdapter(getActivity(), R.layout.dependent_race_item); for (RaceGroupSeriesFleet races : mGroupHeaders.keySet()) { Util.Pair data = new Util.Pair<>(races.getRaceGroup().getName(), races.getRaceGroup().getDisplayName()); - mLeaderBoardAdapter.add(data); - if (leaderBoard == -1 && getRace().getRaceGroup().getName().equals(races.getRaceGroup().getName())) { - leaderBoard = mLeaderBoardAdapter.getCount() - 1; + int position = mLeaderBoardAdapter.add(data); + if (position >= 0) { + if (mRaceId != null) { + if (mRaceId.getRegattaLikeParentName().equals(data.getA())) { + leaderBoard = position; + } + } else { + if (leaderBoard == -1 && getRace().getRaceGroup().getName().equals(races.getRaceGroup().getName())) { + leaderBoard = position; + } + } } } @@ -322,6 +340,7 @@ public class StartTimeFragment extends BaseFragment private void initFleetSpinner() { if (mLeaderBoard != null && mFleet != null) { + int fleet = -1; mFleetAdapter = new DependentRaceSpinnerAdapter(getActivity(), R.layout.dependent_race_item); mFleet.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @Override @@ -338,14 +357,26 @@ public class StartTimeFragment extends BaseFragment for (RaceGroupSeriesFleet races : mGroupHeaders.keySet()) { Util.Pair leaderBoard = mLeaderBoardAdapter.getItem(mLeaderBoard.getSelectedItemPosition()); if (races.getRaceGroup().getName().equals(leaderBoard.getA())) { - mFleetAdapter.add(new Util.Pair(races.getFleet().getName(), null)); + Util.Pair data = new Util.Pair<>(races.getFleet().getName(), null); + int position = mFleetAdapter.add(data); + if (position >= 0) { + if (mRaceId != null) { + if (mRaceId.getFleetName().equals(data.getA())) { + fleet = position; + } + } else { + if (fleet == -1) { //TODO add more heuristic here - to be discussed + fleet = position; + } + } + } } } - mFleet.setSelection(0); if (mFleetAdapter.getCount() > 1 || (mFleetAdapter.getCount() == 1 && !mFleetAdapter.getItem(0).getA() .equals(LeaderboardNameConstants.DEFAULT_FLEET_NAME))) { mFleet.setAdapter(mFleetAdapter); + mFleet.setSelection(fleet); mFleet.setVisibility(View.VISIBLE); } else { mFleet.setAdapter(null); @@ -363,7 +394,8 @@ public class StartTimeFragment extends BaseFragment public void onItemSelected(AdapterView parent, View view, int position, long id) { mRaceAdapter.setSelected(position); String leaderBoard = mLeaderBoardAdapter.getItem(mLeaderBoard.getSelectedItemPosition()).getA(); - @SuppressWarnings("unchecked") Util.Pair fleet = ((Util.Pair) mFleet.getSelectedItem()); + @SuppressWarnings("unchecked") + Util.Pair fleet = ((Util.Pair) mFleet.getSelectedItem()); if (fleet == null) { fleet = new Util.Pair<>(LeaderboardNameConstants.DEFAULT_FLEET_NAME, null); } @@ -378,10 +410,12 @@ public class StartTimeFragment extends BaseFragment } }); + int racePos = -1; for (RaceGroupSeriesFleet races : mGroupHeaders.keySet()) { Util.Pair leaderBoard = mLeaderBoardAdapter.getItem(mLeaderBoard.getSelectedItemPosition()); if (races.getRaceGroup().getName().equals(leaderBoard.getA())) { - @SuppressWarnings("unchecked") Util.Pair fleet = ((Util.Pair) mFleet.getSelectedItem()); + @SuppressWarnings("unchecked") + Util.Pair fleet = ((Util.Pair) mFleet.getSelectedItem()); if (fleet == null) { fleet = new Util.Pair<>(LeaderboardNameConstants.DEFAULT_FLEET_NAME, null); } @@ -389,7 +423,19 @@ public class StartTimeFragment extends BaseFragment .equals(races.getFleet().getName())) { for (ManagedRace race : mGroupHeaders.get(races)) { if (!getRace().equals(race)) { - mRaceAdapter.add(new Util.Pair(race.getRaceName(), null)); + Util.Pair data = new Util.Pair<>(race.getRaceName(), null); + int position = mRaceAdapter.add(data); + if (position >= 0) { + if (mRaceId != null) { + if (mRaceId.getRaceColumnName().equals(data.getA())) { + racePos = position; + } + } else { + if (racePos == -1) { //TODO add more heuristic here - to be discussed + racePos = position; + } + } + } } } } @@ -397,6 +443,7 @@ public class StartTimeFragment extends BaseFragment } mRace.setAdapter(mRaceAdapter); mRace.setVisibility(View.VISIBLE); + mRace.setSelection(racePos); } } From 64308148274938a2ffb683cde6d5bb3bffd488f1 Mon Sep 17 00:00:00 2001 From: Peter Siegmund Date: Tue, 21 Jul 2015 15:08:36 +0200 Subject: [PATCH 31/31] removed unused method --- .../app/ui/adapters/DependentRaceSpinnerAdapter.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/DependentRaceSpinnerAdapter.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/DependentRaceSpinnerAdapter.java index 6828bdf2539..18e3d005ee3 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/DependentRaceSpinnerAdapter.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/DependentRaceSpinnerAdapter.java @@ -152,10 +152,6 @@ public class DependentRaceSpinnerAdapter implements SpinnerAdapter { return position; } - public Util.Pair getSelected() { - return mData.get(mSelectedItem); - } - public void setSelected(int position) { mSelectedItem = position; }