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

Merge branch 'master' into bug5085

Browse Source 
Conflicts:
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/FieldNames.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/Mark.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/MarkImpl.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
This commit is contained in:
Steffen Schaefer
2019-11-04 13:08:42 +01:00
parent 9daa9f8ee3 b67b9ad378
commit 7b143f372c
254 changed files with 3747 additions and 667 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/deserialization/test/racelog/RaceLogEventDeserializerTest.java
+3 -1
View File
@@ -37,6 +37,7 @@ import com.sap.sailing.server.gateway.deserialization.racelog.impl.RaceLogEndOfT
import com.sap.sailing.server.gateway.deserialization.racelog.impl.RaceLogEventDeserializer;
import com.sap.sailing.server.gateway.deserialization.racelog.impl.RaceLogFlagEventDeserializer;
import com.sap.sailing.server.gateway.deserialization.racelog.impl.RaceLogORCCertificateAssignmentEventDeserializer;
import com.sap.sailing.server.gateway.deserialization.racelog.impl.RaceLogORCImpliedWindSourceEventDeserializer;
import com.sap.sailing.server.gateway.deserialization.racelog.impl.RaceLogORCLegDataEventDeserializer;
import com.sap.sailing.server.gateway.deserialization.racelog.impl.RaceLogTagEventDeserializer;
import com.sap.sailing.server.gateway.deserialization.racelog.impl.RaceLogUseCompetitorsFromRaceLogEventDeserializer;
@@ -61,7 +62,8 @@ public class RaceLogEventDeserializerTest {
mockitoRaceLogUseCompetitorsFromRaceLogEventDeserializer,
mockitoRaceLogEndOfTrackingEventDeserializer, mockitoRaceLogTagEventDeserializer,
new RaceLogORCLegDataEventDeserializer(competitorDeserializer),
null, new RaceLogORCCertificateAssignmentEventDeserializer(competitorDeserializer));
null, new RaceLogORCCertificateAssignmentEventDeserializer(competitorDeserializer),
new RaceLogORCImpliedWindSourceEventDeserializer(competitorDeserializer));
}
}
java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogCourseDesignChangedEventSerializerTest.java
+1 -1
View File
@@ -55,7 +55,7 @@ public class RaceLogCourseDesignChangedEventSerializerTest {
@Before
public void setUp() {
SharedDomainFactory factory = DomainFactory.INSTANCE;
SharedDomainFactory<?> factory = DomainFactory.INSTANCE;
serializer = new RaceLogCourseDesignChangedEventSerializer(CompetitorJsonSerializer.create(), new CourseBaseJsonSerializer(
new WaypointJsonSerializer(new ControlPointJsonSerializer(new MarkJsonSerializer(),
new GateJsonSerializer(new MarkJsonSerializer())))));
java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogEventSerializerTest.java
+4 -1
View File
@@ -74,6 +74,7 @@ public class RaceLogEventSerializerTest {
private JsonSerializer<RaceLogEvent> orcLegDataEventSerializer;
private JsonSerializer<RaceLogEvent> orcCertificateAssignmentEventSerializer;
private JsonSerializer<RaceLogEvent> orcScratchBoatEventSerializer;
private JsonSerializer<RaceLogEvent> orcSetImpliedWindEventSerializer;
private AbstractLogEventAuthor author = new LogEventAuthorImpl("Test Author", 1);
@@ -108,6 +109,7 @@ public class RaceLogEventSerializerTest {
orcLegDataEventSerializer = mock(JsonSerializer.class);
orcCertificateAssignmentEventSerializer = mock(JsonSerializer.class);
orcScratchBoatEventSerializer = mock(JsonSerializer.class);
orcSetImpliedWindEventSerializer = mock(JsonSerializer.class);
serializer = new RaceLogEventSerializer(flagEventSerializer, startTimeSerializer, raceStatusSerializer,
passChangedSerializer, courseDesignChangedEventSerializer,
@@ -120,7 +122,8 @@ public class RaceLogEventSerializerTest {
additionalScoringInformationSerializer, dependentStartTimeEventSerializer,
startOfTrackingEventSerializer, useCompetitorsFromRaceLogEventSerializer,
endOfTrackingEventSerializer, tagEventSerializer, orcLegDataEventSerializer,
orcCertificateAssignmentEventSerializer, orcScratchBoatEventSerializer);
orcCertificateAssignmentEventSerializer, orcScratchBoatEventSerializer,
orcSetImpliedWindEventSerializer);
}
@Test
java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogFinishPositioningConfirmedEventSerializerTest.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class RaceLogFinishPositioningConfirmedEventSerializerTest {
@Before
public void setUp() {
SharedDomainFactory factory = DomainFactory.INSTANCE;
SharedDomainFactory<?> factory = DomainFactory.INSTANCE;
serializer = new RaceLogFinishPositioningConfirmedEventSerializer(new CompetitorJsonSerializer(
new TeamJsonSerializer(new PersonJsonSerializer(new NationalityJsonSerializer())), new BoatJsonSerializer(new BoatClassJsonSerializer()), /* serializeNonPublicFields */ false));
deserializer = new RaceLogFinishPositioningConfirmedEventDeserializer(new CompetitorJsonDeserializer(factory.getCompetitorAndBoatStore(), /* team deserializer */ null, /* boat deserializer */ null));
java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogWindFixEventSerializerTest.java
+1 -1
View File
@@ -49,7 +49,7 @@ public class RaceLogWindFixEventSerializerTest {
@Before
public void setUp() {
SharedDomainFactory factory = DomainFactory.INSTANCE;
SharedDomainFactory<?> factory = DomainFactory.INSTANCE;
serializer = new RaceLogWindFixEventSerializer(new CompetitorJsonSerializer(new TeamJsonSerializer(
new PersonJsonSerializer(new NationalityJsonSerializer())), new BoatJsonSerializer(new BoatClassJsonSerializer()), /* serializeNonPublicFields */ false), new WindJsonSerializer(
new PositionJsonSerializer()));