eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-23 14:08:40 +00:00
Code Activity

Merge branch 'master' into bug4444

Browse Source 
Change-Id: I7feeab8eba293be18020bab897422e646b2f89b0
This commit is contained in:
Axel Uhl
2018-02-26 17:03:07 +01:00
parent 088afc1c41 94ffe912cc
commit 335e00a342
20 changed files with 6 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
-9
View File
@@ -42,7 +42,6 @@ import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.CompetitorResult.MergeState;
import com.sap.sailing.domain.abstractlog.race.CompetitorResults;
import com.sap.sailing.domain.abstractlog.race.RaceLog;
import com.sap.sailing.domain.abstractlog.race.RaceLogCourseAreaChangedEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogCourseDesignChangedEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogDependentStartTimeEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogEndOfTrackingEvent;
@@ -65,7 +64,6 @@ import com.sap.sailing.domain.abstractlog.race.RaceLogWindFixEvent;
import com.sap.sailing.domain.abstractlog.race.SimpleRaceLogIdentifier;
import com.sap.sailing.domain.abstractlog.race.impl.CompetitorResultImpl;
import com.sap.sailing.domain.abstractlog.race.impl.CompetitorResultsImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogCourseAreaChangeEventImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogCourseDesignChangedEventImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogDependentStartTimeEventImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEndOfTrackingEventImpl;
@@ -1405,8 +1403,6 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory {
return loadRaceLogFlagEvent(createdAt, author, logicalTimePoint, id, passId, competitors, dbObject);
} else if (eventClass.equals(RaceLogPassChangeEvent.class.getSimpleName())) {
return loadRaceLogPassChangeEvent(createdAt, author, logicalTimePoint, id, passId, competitors);
} else if (eventClass.equals(RaceLogCourseAreaChangedEvent.class.getSimpleName())) {
return loadRaceLogCourseAreaChangedEvent(createdAt, author, logicalTimePoint, id, passId, competitors, dbObject);
} else if (eventClass.equals(RaceLogCourseDesignChangedEvent.class.getSimpleName())) {
return loadRaceLogCourseDesignChangedEvent(createdAt, author, logicalTimePoint, id, passId, competitors, dbObject);
} else if (eventClass.equals(RaceLogFinishPositioningListChangedEvent.class.getSimpleName())) {
@@ -1568,11 +1564,6 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory {
return new RaceLogCourseDesignChangedEventImpl(createdAt, logicalTimePoint, author, id, passId, courseData, courseDesignerMode);
}
private RaceLogCourseAreaChangedEvent loadRaceLogCourseAreaChangedEvent(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, Serializable id, Integer passId, List<Competitor> competitors, DBObject dbObject) {
Serializable courseAreaId = (Serializable) dbObject.get(FieldNames.COURSE_AREA_ID.name());
return new RaceLogCourseAreaChangeEventImpl(createdAt, logicalTimePoint, author, id, passId, courseAreaId);
}
private RaceLogEvent loadRaceLogFixedMarkPassingEvent(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint,
Serializable id, Integer passId, List<Competitor> competitors, DBObject dbObject) {
TimePoint ofFixedPassing = loadTimePoint(dbObject, FieldNames.TIMEPOINT_OF_FIXED_MARKPASSING);
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java
-16
View File
@@ -28,7 +28,6 @@ import com.mongodb.util.JSON;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.race.CompetitorResult;
import com.sap.sailing.domain.abstractlog.race.CompetitorResults;
import com.sap.sailing.domain.abstractlog.race.RaceLogCourseAreaChangedEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogCourseDesignChangedEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogDependentStartTimeEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogEndOfTrackingEvent;
@@ -846,13 +845,6 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory {
return result;
}
public DBObject storeRaceLogEntry(RaceLogIdentifier raceLogIdentifier, RaceLogCourseAreaChangedEvent courseAreaChangedEvent) {
BasicDBObject result = new BasicDBObject();
storeRaceLogIdentifier(raceLogIdentifier, result);
result.put(FieldNames.RACE_LOG_EVENT.name(), storeRaceLogCourseAreaChangedEvent(courseAreaChangedEvent));
return result;
}
public DBObject storeRaceLogEntry(RaceLogIdentifier raceLogIdentifier, RaceLogCourseDesignChangedEvent courseDesignChangedEvent) {
BasicDBObject result = new BasicDBObject();
storeRaceLogIdentifier(raceLogIdentifier, result);
@@ -1180,14 +1172,6 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory {
return result;
}
private DBObject storeRaceLogCourseAreaChangedEvent(RaceLogCourseAreaChangedEvent courseAreaChangedEvent) {
DBObject result = new BasicDBObject();
storeRaceLogEventProperties(courseAreaChangedEvent, result);
result.put(FieldNames.RACE_LOG_EVENT_CLASS.name(), RaceLogCourseAreaChangedEvent.class.getSimpleName());
result.put(FieldNames.COURSE_AREA_ID.name(), courseAreaChangedEvent.getCourseAreaId());
return result;
}
private DBObject storeRaceLogCourseDesignChangedEvent(RaceLogCourseDesignChangedEvent courseDesignChangedEvent) {
DBObject result = new BasicDBObject();
storeRaceLogEventProperties(courseDesignChangedEvent, result);
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoRaceLogStoreVisitor.java
-7
View File
@@ -3,7 +3,6 @@ package com.sap.sailing.domain.persistence.impl;
import java.util.logging.Logger;
import com.mongodb.DBObject;
import com.sap.sailing.domain.abstractlog.race.RaceLogCourseAreaChangedEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogCourseDesignChangedEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogDependentStartTimeEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogEndOfTrackingEvent;
@@ -68,12 +67,6 @@ public class MongoRaceLogStoreVisitor implements RaceLogEventVisitor {
mongoObjectFactory.storeRaceLogEventEvent(startTimeEventTrackEntry);
}
@Override
public void visit(RaceLogCourseAreaChangedEvent event) {
DBObject courseAreaChangedEventTrackEntry = mongoObjectFactory.storeRaceLogEntry(raceLogIdentifier, event);
mongoObjectFactory.storeRaceLogEventEvent(courseAreaChangedEventTrackEntry);
}
@Override
public void visit(RaceLogCourseDesignChangedEvent event) {
DBObject courseDesignChangedEventTrackEntry = mongoObjectFactory.storeRaceLogEntry(raceLogIdentifier, event);
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/RaceLogCourseAreaChangedEvent.java
-9
View File
@@ -1,9 +0,0 @@
package com.sap.sailing.domain.abstractlog.race;
import java.io.Serializable;
public interface RaceLogCourseAreaChangedEvent extends RaceLogEvent {
Serializable getCourseAreaId();
}
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/RaceLogEventVisitor.java
-2
View File
@@ -18,8 +18,6 @@ public interface RaceLogEventVisitor {
public void visit(RaceLogStartTimeEvent event);
public void visit(RaceLogCourseAreaChangedEvent event);
public void visit(RaceLogCourseDesignChangedEvent event);
public void visit(RaceLogFinishPositioningListChangedEvent event);
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/AbstractRaceLogChangedVisitor.java
-5
View File
@@ -1,6 +1,5 @@
package com.sap.sailing.domain.abstractlog.race.impl;
import com.sap.sailing.domain.abstractlog.race.RaceLogCourseAreaChangedEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogCourseDesignChangedEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogDependentStartTimeEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogEndOfTrackingEvent;
@@ -46,10 +45,6 @@ public abstract class AbstractRaceLogChangedVisitor implements RaceLogEventVisit
notifyListenerAboutEventAdded(event);
}
public void visit(RaceLogCourseAreaChangedEvent event) {
notifyListenerAboutEventAdded(event);
}
public void visit(RaceLogCourseDesignChangedEvent event) {
notifyListenerAboutEventAdded(event);
}
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/BaseRaceLogEventVisitor.java
-6
View File
@@ -1,6 +1,5 @@
package com.sap.sailing.domain.abstractlog.race.impl;
import com.sap.sailing.domain.abstractlog.race.RaceLogCourseAreaChangedEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogCourseDesignChangedEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogDependentStartTimeEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogEndOfTrackingEvent;
@@ -51,11 +50,6 @@ public abstract class BaseRaceLogEventVisitor implements RaceLogEventVisitor {
}
@Override
public void visit(RaceLogCourseAreaChangedEvent event) {
}
@Override
public void visit(RaceLogCourseDesignChangedEvent event) {
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/RaceLogCourseAreaChangeEventImpl.java
-36
View File
@@ -1,36 +0,0 @@
package com.sap.sailing.domain.abstractlog.race.impl;
import java.io.Serializable;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.race.RaceLogCourseAreaChangedEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogEventVisitor;
import com.sap.sse.common.TimePoint;
public class RaceLogCourseAreaChangeEventImpl extends RaceLogEventImpl implements RaceLogCourseAreaChangedEvent {
private static final long serialVersionUID = -3943108136024977860L;
private final Serializable courseAreaId;
public RaceLogCourseAreaChangeEventImpl(TimePoint createdAt, TimePoint pTimePoint, AbstractLogEventAuthor author,
Serializable pId, int pPassId, Serializable courseAreaId) {
super(createdAt, pTimePoint, author, pId, pPassId);
this.courseAreaId = courseAreaId;
}
public RaceLogCourseAreaChangeEventImpl(TimePoint logicalTimePoint, AbstractLogEventAuthor author, int pPassId,
Serializable courseAreaId) {
this(now(), logicalTimePoint, author, randId(), pPassId, courseAreaId);
}
@Override
public Serializable getCourseAreaId() {
return courseAreaId;
}
@Override
public void accept(RaceLogEventVisitor visitor) {
visitor.visit(this);
}
}
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RaceColumnRaceLogReplicator.java
-6
View File
@@ -2,7 +2,6 @@ package com.sap.sailing.domain.base.impl;
import java.io.Serializable;
import com.sap.sailing.domain.abstractlog.race.RaceLogCourseAreaChangedEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogCourseDesignChangedEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogDependentStartTimeEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogEndOfTrackingEvent;
@@ -49,11 +48,6 @@ public class RaceColumnRaceLogReplicator implements RaceLogEventVisitor, Seriali
event);
}
@Override
public void visit(RaceLogCourseAreaChangedEvent event) {
notifyOnAdd(event);
}
@Override
public void visit(RaceLogStartTimeEvent event) {
notifyOnAdd(event);
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
-8
View File
@@ -65,7 +65,6 @@ import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.impl.AllEventsOfTypeFinder;
import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.RaceLog;
import com.sap.sailing.domain.abstractlog.race.RaceLogCourseAreaChangedEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogCourseDesignChangedEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogDependentStartTimeEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogEndOfTrackingEvent;
@@ -93,7 +92,6 @@ import com.sap.sailing.domain.abstractlog.race.analyzing.impl.StartTimeFinderRes
import com.sap.sailing.domain.abstractlog.race.analyzing.impl.TrackingTimesEventFinder;
import com.sap.sailing.domain.abstractlog.race.analyzing.impl.TrackingTimesFinder;
import com.sap.sailing.domain.abstractlog.race.impl.BaseRaceLogEventVisitor;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogCourseAreaChangeEventImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogCourseDesignChangedEventImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogDependentStartTimeEventImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEndOfTrackingEventImpl;
@@ -7192,12 +7190,6 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
}
}
@Override
public void visit(RaceLogCourseAreaChangedEvent event) {
raceLog.add(new RaceLogCourseAreaChangeEventImpl(event.getCreatedAt(), event.getLogicalTimePoint(),
event.getAuthor(), UUID.randomUUID(), raceLog.getCurrentPassId(), event.getCourseAreaId()));
}
@Override
public void visit(RaceLogStartProcedureChangedEvent event) {
if (hasStartTime && isLatestPass(event)) {
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadRaceLogEventsTest.java
-16
View File
@@ -20,14 +20,12 @@ import com.mongodb.DBObject;
import com.mongodb.MongoException;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.RaceLogCourseAreaChangedEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogFlagEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogPassChangeEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogRaceStatusEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogRevokeEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogStartTimeEvent;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogCourseAreaChangeEventImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogFlagEventImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogPassChangeEventImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogRaceStatusEventImpl;
@@ -120,20 +118,6 @@ public class StoreAndLoadRaceLogEventsTest extends AbstractMongoDBTest {
assertEquals(isDisplayed, actualEvent.isDisplayed());
}
@Test
public void testStoreAndLoadCourseAreaChangedEvent() {
Serializable courseAreaId = UUID.randomUUID();
RaceLogCourseAreaChangedEvent expectedEvent = new RaceLogCourseAreaChangeEventImpl(MillisecondsTimePoint.now(),
expectedEventTime, author, expectedId, expectedPassId, courseAreaId);
DBObject dbObject = mongoFactory.storeRaceLogEntry(logIdentifier, expectedEvent);
RaceLogCourseAreaChangedEvent actualEvent = loadEvent(dbObject);
assertBaseFields(expectedEvent, actualEvent);
assertEquals(courseAreaId, actualEvent.getCourseAreaId());
}
@Test
public void testStoreAndLoadPassChangeEvent() {
RaceLogPassChangeEvent expectedEvent = new RaceLogPassChangeEventImpl(MillisecondsTimePoint.now(),
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInLeaderboards.java
-23
View File
@@ -24,7 +24,6 @@ import com.sap.sailing.domain.abstractlog.race.CompetitorResult;
import com.sap.sailing.domain.abstractlog.race.CompetitorResult.MergeState;
import com.sap.sailing.domain.abstractlog.race.CompetitorResults;
import com.sap.sailing.domain.abstractlog.race.RaceLog;
import com.sap.sailing.domain.abstractlog.race.RaceLogCourseAreaChangedEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogCourseDesignChangedEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogDependentStartTimeEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogEvent;
@@ -42,7 +41,6 @@ import com.sap.sailing.domain.abstractlog.race.RaceLogWindFixEvent;
import com.sap.sailing.domain.abstractlog.race.SimpleRaceLogIdentifier;
import com.sap.sailing.domain.abstractlog.race.impl.CompetitorResultImpl;
import com.sap.sailing.domain.abstractlog.race.impl.CompetitorResultsImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogCourseAreaChangeEventImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogCourseDesignChangedEventImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogDependentStartTimeEventImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventComparator;
@@ -430,27 +428,6 @@ public class TestStoringAndRetrievingRaceLogInLeaderboards extends RaceLogMongoD
}
}
@Test
public void testStoreAndRetrieveSimpleLeaderboardWithRaceLogCourseAreaChangeEvent() {
final UUID uuid = UUID.randomUUID();
RaceLogCourseAreaChangedEvent event = new RaceLogCourseAreaChangeEventImpl(now, author, 0, uuid);
addAndStoreRaceLogEvent(leaderboard, raceColumnName, event);
RaceLog loadedRaceLog = retrieveRaceLog();
loadedRaceLog.lockForRead();
try {
RaceLogEvent loadedEvent = loadedRaceLog.getFirstRawFix();
RaceLogCourseAreaChangedEvent courseAreaEvent = (RaceLogCourseAreaChangedEvent) loadedEvent;
assertEquals(event.getCreatedAt(), courseAreaEvent.getCreatedAt());
assertEquals(event.getLogicalTimePoint(), courseAreaEvent.getLogicalTimePoint());
assertEquals(event.getPassId(), courseAreaEvent.getPassId());
assertEquals(event.getId(), courseAreaEvent.getId());
assertEquals(event.getCourseAreaId(), courseAreaEvent.getCourseAreaId());
assertEquals(1, Util.size(loadedRaceLog.getFixes()));
} finally {
loadedRaceLog.unlockAfterRead();
}
}
@Test
public void testStoreAndRetrieveSimpleLeaderboardWithRaceLogRaceStatusEvent() {
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInRegatta.java
-25
View File
@@ -17,7 +17,6 @@ import com.mongodb.MongoException;
import com.sap.sailing.domain.abstractlog.race.CompetitorResult.MergeState;
import com.sap.sailing.domain.abstractlog.race.CompetitorResults;
import com.sap.sailing.domain.abstractlog.race.RaceLog;
import com.sap.sailing.domain.abstractlog.race.RaceLogCourseAreaChangedEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogCourseDesignChangedEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogFinishPositioningConfirmedEvent;
@@ -33,7 +32,6 @@ import com.sap.sailing.domain.abstractlog.race.RaceLogStartTimeEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogWindFixEvent;
import com.sap.sailing.domain.abstractlog.race.impl.CompetitorResultImpl;
import com.sap.sailing.domain.abstractlog.race.impl.CompetitorResultsImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogCourseAreaChangeEventImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogCourseDesignChangedEventImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogFinishPositioningConfirmedEventImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogFinishPositioningListChangedEventImpl;
@@ -298,29 +296,6 @@ public class TestStoringAndRetrievingRaceLogInRegatta extends AbstractTestStorin
MongoObjectFactoryImpl factoryImpl = (MongoObjectFactoryImpl) mongoObjectFactory;
factoryImpl.getRaceLogCollection().insert(raceLogResult);
}
@Test
public void testStoreAndRetrieveRegattaWithRaceLogCourseAreaChangeEvent() {
final UUID uuid = UUID.randomUUID();
RaceLogCourseAreaChangedEvent event = new RaceLogCourseAreaChangeEventImpl(now, author, 0, uuid);
addAndStoreRaceLogEvent(regatta, raceColumnName, event);
RaceLog loadedRaceLog = retrieveRaceLog();
loadedRaceLog.lockForRead();
try {
RaceLogEvent loadedEvent = loadedRaceLog.getFirstRawFix();
RaceLogCourseAreaChangedEvent courseAreaEvent = (RaceLogCourseAreaChangedEvent) loadedEvent;
assertEquals(event.getLogicalTimePoint(), courseAreaEvent.getLogicalTimePoint());
assertEquals(event.getPassId(), courseAreaEvent.getPassId());
assertEquals(event.getId(), courseAreaEvent.getId());
assertEquals(event.getCourseAreaId(), courseAreaEvent.getCourseAreaId());
assertEquals(1, Util.size(loadedRaceLog.getFixes()));
} finally {
loadedRaceLog.unlockAfterRead();
}
}
@Test
public void testStoreAndRetrieveRegattaWithRaceLogRaceStatusEvent() {
java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/RaceLogCourseAreaChangedEventDeserializer.java
-32
View File
@@ -1,32 +0,0 @@
package com.sap.sailing.server.gateway.deserialization.racelog.impl;
import java.io.Serializable;
import java.util.List;
import org.json.simple.JSONObject;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.race.RaceLogEvent;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogCourseAreaChangeEventImpl;
import com.sap.sailing.domain.base.Competitor;
import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException;
import com.sap.sailing.server.gateway.deserialization.JsonDeserializer;
import com.sap.sailing.server.gateway.deserialization.impl.Helpers;
import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogCourseAreaChangedEventSerializer;
import com.sap.sse.common.TimePoint;
public class RaceLogCourseAreaChangedEventDeserializer extends BaseRaceLogEventDeserializer {
public RaceLogCourseAreaChangedEventDeserializer(JsonDeserializer<Competitor> competitorDeserializer) {
super(competitorDeserializer);
}
@Override
protected RaceLogEvent deserialize(JSONObject object, Serializable id, TimePoint createdAt, AbstractLogEventAuthor author, TimePoint timePoint, int passId, List<Competitor> competitors)
throws JsonDeserializationException {
Serializable courseAreaId = (Serializable) object.get(RaceLogCourseAreaChangedEventSerializer.FIELD_COURSE_AREA_ID);
return new RaceLogCourseAreaChangeEventImpl(createdAt, timePoint, author, id,
passId, Helpers.tryUuidConversion(courseAreaId));
}
}
java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/RaceLogEventDeserializer.java
-7
View File
@@ -20,7 +20,6 @@ import com.sap.sailing.server.gateway.deserialization.impl.PositionJsonDeseriali
import com.sap.sailing.server.gateway.deserialization.impl.WindJsonDeserializer;
import com.sap.sailing.server.gateway.serialization.racelog.impl.BaseRaceLogEventSerializer;
import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogAdditionalScoringInformationSerializer;
import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogCourseAreaChangedEventSerializer;
import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogCourseDesignChangedEventSerializer;
import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogDenoteForTrackingEventSerializer;
import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogDependentStartTimeEventSerializer;
@@ -61,7 +60,6 @@ public class RaceLogEventDeserializer implements JsonDeserializer<RaceLogEvent>
new RaceLogStartTimeEventDeserializer(competitorDeserializer),
new RaceLogDependentStartTimeEventDeserializer(competitorDeserializer),
new RaceLogRaceStatusEventDeserializer(competitorDeserializer),
new RaceLogCourseAreaChangedEventDeserializer(competitorDeserializer),
new RaceLogCourseDesignChangedEventDeserializer(competitorDeserializer,
new CourseBaseDeserializer(
new WaypointDeserializer(
@@ -93,7 +91,6 @@ public class RaceLogEventDeserializer implements JsonDeserializer<RaceLogEvent>
protected final JsonDeserializer<RaceLogEvent> startTimeEventDeserializer;
protected final JsonDeserializer<RaceLogEvent> dependentStartTimeEventDeserializer;
protected final JsonDeserializer<RaceLogEvent> raceStatusEventDeserializer;
protected final JsonDeserializer<RaceLogEvent> courseAreaChangedEventDeserializer;
protected final JsonDeserializer<RaceLogEvent> courseDesignChangedEventDeserializer;
protected final JsonDeserializer<RaceLogEvent> finishPositioningListChangedEventDeserializer;
protected final JsonDeserializer<RaceLogEvent> finishPositioningConfirmedEventDeserializer;
@@ -118,7 +115,6 @@ public class RaceLogEventDeserializer implements JsonDeserializer<RaceLogEvent>
JsonDeserializer<RaceLogEvent> startTimeEventDeserializer,
JsonDeserializer<RaceLogEvent> dependentStartTimeEventDeserializer,
JsonDeserializer<RaceLogEvent> raceStatusEventDeserializer,
JsonDeserializer<RaceLogEvent> courseAreaChangedEventDeserializer,
JsonDeserializer<RaceLogEvent> courseDesignChangedEventDeserializer,
JsonDeserializer<RaceLogEvent> finishPositioningListChangedEventDeserializer,
JsonDeserializer<RaceLogEvent> finishPositioningConfirmedEventDeserializer,
@@ -142,7 +138,6 @@ public class RaceLogEventDeserializer implements JsonDeserializer<RaceLogEvent>
this.startTimeEventDeserializer = startTimeEventDeserializer;
this.dependentStartTimeEventDeserializer = dependentStartTimeEventDeserializer;
this.raceStatusEventDeserializer = raceStatusEventDeserializer;
this.courseAreaChangedEventDeserializer = courseAreaChangedEventDeserializer;
this.courseDesignChangedEventDeserializer = courseDesignChangedEventDeserializer;
this.finishPositioningListChangedEventDeserializer = finishPositioningListChangedEventDeserializer;
this.finishPositioningConfirmedEventDeserializer = finishPositioningConfirmedEventDeserializer;
@@ -177,8 +172,6 @@ public class RaceLogEventDeserializer implements JsonDeserializer<RaceLogEvent>
return raceStatusEventDeserializer;
} else if (type.equals(RaceLogPassChangeEventSerializer.VALUE_CLASS)) {
return passChangeEventDeserializer;
} else if (type.equals(RaceLogCourseAreaChangedEventSerializer.VALUE_CLASS)) {
return courseAreaChangedEventDeserializer;
} else if (type.equals(RaceLogCourseDesignChangedEventSerializer.VALUE_CLASS)) {
return courseDesignChangedEventDeserializer;
} else if (type.equals(RaceLogFinishPositioningListChangedEventSerializer.VALUE_CLASS)) {
java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogCourseAreaChangedEventSerializer.java
-35
View File
@@ -1,35 +0,0 @@
package com.sap.sailing.server.gateway.serialization.racelog.impl;
import org.json.simple.JSONObject;
import com.sap.sailing.domain.abstractlog.race.RaceLogCourseAreaChangedEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogEvent;
import com.sap.sailing.domain.base.Competitor;
import com.sap.sailing.server.gateway.serialization.JsonSerializer;
public class RaceLogCourseAreaChangedEventSerializer extends BaseRaceLogEventSerializer {
public static final String VALUE_CLASS = RaceLogCourseAreaChangedEvent.class.getSimpleName();
public static final String FIELD_COURSE_AREA_ID = "courseAreaId";
public RaceLogCourseAreaChangedEventSerializer(
JsonSerializer<Competitor> competitorSerializer) {
super(competitorSerializer);
}
@Override
protected String getClassFieldValue() {
return VALUE_CLASS;
}
@Override
public JSONObject serialize(RaceLogEvent object) {
RaceLogCourseAreaChangedEvent caChangedEvent = (RaceLogCourseAreaChangedEvent) object;
JSONObject result = super.serialize(caChangedEvent);
result.put(FIELD_COURSE_AREA_ID, caChangedEvent.getCourseAreaId().toString());
return result;
}
}
java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogEventSerializer.java
-10
View File
@@ -2,7 +2,6 @@ package com.sap.sailing.server.gateway.serialization.racelog.impl;
import org.json.simple.JSONObject;
import com.sap.sailing.domain.abstractlog.race.RaceLogCourseAreaChangedEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogCourseDesignChangedEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogDependentStartTimeEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogEndOfTrackingEvent;
@@ -54,7 +53,6 @@ public class RaceLogEventSerializer implements JsonSerializer<RaceLogEvent>, Rac
new RaceLogFlagEventSerializer(competitorSerializer),
new RaceLogStartTimeEventSerializer(competitorSerializer),
new RaceLogRaceStatusEventSerializer(competitorSerializer),
new RaceLogCourseAreaChangedEventSerializer(competitorSerializer),
new RaceLogPassChangeEventSerializer(competitorSerializer),
new RaceLogCourseDesignChangedEventSerializer(competitorSerializer,
new CourseBaseJsonSerializer(
@@ -87,7 +85,6 @@ public class RaceLogEventSerializer implements JsonSerializer<RaceLogEvent>, Rac
private final JsonSerializer<RaceLogEvent> flagEventSerializer;
private final JsonSerializer<RaceLogEvent> startTimeSerializer;
private final JsonSerializer<RaceLogEvent> raceStatusSerializer;
private final JsonSerializer<RaceLogEvent> courseAreaChangedEventSerializer;
private final JsonSerializer<RaceLogEvent> passChangedEventSerializer;
private final JsonSerializer<RaceLogEvent> courseDesignChangedEventSerializer;
private final JsonSerializer<RaceLogEvent> finishPositioningListChangedEventSerializer;
@@ -116,7 +113,6 @@ public class RaceLogEventSerializer implements JsonSerializer<RaceLogEvent>, Rac
JsonSerializer<RaceLogEvent> flagEventSerializer,
JsonSerializer<RaceLogEvent> startTimeSerializer,
JsonSerializer<RaceLogEvent> raceStatusSerializer,
JsonSerializer<RaceLogEvent> courseAreaChangedEventSerializer,
JsonSerializer<RaceLogEvent> passChangedEventSerializer,
JsonSerializer<RaceLogEvent> courseDesignChangedEventSerializer,
JsonSerializer<RaceLogEvent> finishPositioningListChangedEventSerializer,
@@ -140,7 +136,6 @@ public class RaceLogEventSerializer implements JsonSerializer<RaceLogEvent>, Rac
this.flagEventSerializer = flagEventSerializer;
this.startTimeSerializer = startTimeSerializer;
this.raceStatusSerializer = raceStatusSerializer;
this.courseAreaChangedEventSerializer = courseAreaChangedEventSerializer;
this.passChangedEventSerializer = passChangedEventSerializer;
this.courseDesignChangedEventSerializer = courseDesignChangedEventSerializer;
this.finishPositioningListChangedEventSerializer = finishPositioningListChangedEventSerializer;
@@ -201,11 +196,6 @@ public class RaceLogEventSerializer implements JsonSerializer<RaceLogEvent>, Rac
chosenSerializer = startTimeSerializer;
}
@Override
public void visit(RaceLogCourseAreaChangedEvent event) {
chosenSerializer = courseAreaChangedEventSerializer;
}
@Override
public void visit(RaceLogCourseDesignChangedEvent event) {
chosenSerializer = courseDesignChangedEventSerializer;
java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/CourseAreaChangedEventSerializerTest.java
-53
View File
@@ -1,53 +0,0 @@
package com.sap.sailing.server.gateway.serialization.test.racelog;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.io.Serializable;
import java.util.UUID;
import org.json.simple.JSONObject;
import org.junit.Before;
import org.junit.Test;
import com.sap.sailing.domain.abstractlog.race.RaceLogCourseAreaChangedEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogEvent;
import com.sap.sailing.domain.base.Competitor;
import com.sap.sailing.server.gateway.serialization.JsonSerializer;
import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogCourseAreaChangedEventSerializer;
public class CourseAreaChangedEventSerializerTest extends AbstractEventSerializerTest<RaceLogCourseAreaChangedEvent> {
private Serializable expectedCourseAreaId;
@Before
public void setUp() {
expectedCourseAreaId = UUID.randomUUID();
super.setUp();
}
@Override
protected RaceLogCourseAreaChangedEvent createMockEvent() {
RaceLogCourseAreaChangedEvent event = mock(RaceLogCourseAreaChangedEvent.class);
when(event.getCourseAreaId()).thenReturn(expectedCourseAreaId);
return event;
}
@Override
protected JsonSerializer<RaceLogEvent> createSerializer(JsonSerializer<Competitor> competitorSerializer) {
return new RaceLogCourseAreaChangedEventSerializer(competitorSerializer);
}
@Test
public void testCourseAreaId() {
JSONObject result = serializer.serialize(event);
assertEquals(
expectedCourseAreaId.toString(),
result.get(RaceLogCourseAreaChangedEventSerializer.FIELD_COURSE_AREA_ID).toString());
}
}
java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogEventSerializerTest.java
+1 -12
View File
@@ -11,7 +11,6 @@ import org.junit.Test;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.RaceLogEvent;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogCourseAreaChangeEventImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogCourseDesignChangedEventImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogFinishPositioningConfirmedEventImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogFinishPositioningListChangedEventImpl;
@@ -44,7 +43,6 @@ public class RaceLogEventSerializerTest {
private JsonSerializer<RaceLogEvent> flagEventSerializer;
private JsonSerializer<RaceLogEvent> startTimeSerializer;
private JsonSerializer<RaceLogEvent> raceStatusSerializer;
private JsonSerializer<RaceLogEvent> courseAreaChangedEventSerializer;
private JsonSerializer<RaceLogEvent> passChangedSerializer;
private JsonSerializer<RaceLogEvent> courseDesignChangedEventSerializer;
private JsonSerializer<RaceLogEvent> finishPositioningListChangedEventSerializer;
@@ -74,7 +72,6 @@ public class RaceLogEventSerializerTest {
flagEventSerializer = mock(JsonSerializer.class);
startTimeSerializer = mock(JsonSerializer.class);
raceStatusSerializer = mock(JsonSerializer.class);
courseAreaChangedEventSerializer = mock(JsonSerializer.class);
passChangedSerializer = mock(JsonSerializer.class);
courseDesignChangedEventSerializer = mock(JsonSerializer.class);
finishPositioningListChangedEventSerializer = mock(JsonSerializer.class);
@@ -97,7 +94,7 @@ public class RaceLogEventSerializerTest {
endOfTrackingEventSerializer = mock(JsonSerializer.class);
serializer = new RaceLogEventSerializer(flagEventSerializer, startTimeSerializer, raceStatusSerializer,
courseAreaChangedEventSerializer, passChangedSerializer, courseDesignChangedEventSerializer,
passChangedSerializer, courseDesignChangedEventSerializer,
finishPositioningListChangedEventSerializer, finishPositioningConfirmedEventSerializer,
pathfinderEventSerializer, gateLineOpeningTimeEventSerializer,
startProcedureTypeChangedEventSerializer, protestStartTimeEventSerializer, windFixEventSerializer,
@@ -132,14 +129,6 @@ public class RaceLogEventSerializerTest {
verify(raceStatusSerializer).serialize(event);
}
@Test
public void testChoosesCourseAreaChangedSerializer() {
// we use the real event type here because we do not want to re-implement the dispatching.
RaceLogEvent event = new RaceLogCourseAreaChangeEventImpl(null, author, 0, null);
serializer.serialize(event);
verify(courseAreaChangedEventSerializer).serialize(event);
}
@Test
public void testChoosesPassChangedSerializer() {
// we use the real event type here because we do not want to re-implement the dispatching.
java/target/refreshInstance.sh
+5 -1
View File
@@ -143,15 +143,17 @@ install_environment ()
load_from_release_file ()
{
if [[ $INSTALL_FROM_RELEASE != "" ]]; then
echo "Build/Deployment process has been started - it can take 5 to 20 minutes until your instance is ready. " | mail -r simon.marcel.pamies@sap.com -s "Build or Deployment of $INSTANCE_ID starting" $BUILD_COMPLETE_NOTIFY
echo "Build/Deployment process has been started - it can take 5 to 20 minutes until your instance is ready. " | mail -r simon.marcel.pamies@sap.com -s "Build or Deployment of $INSTANCE_ID to $SERVER_HOME for server $SERVER_NAME starting" $BUILD_COMPLETE_NOTIFY
cd $SERVER_HOME
rm -f $SERVER_HOME/$INSTALL_FROM_RELEASE.tar.gz*
rm -rf plugins start stop status native-libraries org.eclipse.osgi *.tar.gz
echo "Loading from release file http://releases.sapsailing.com/$INSTALL_FROM_RELEASE/$INSTALL_FROM_RELEASE.tar.gz"
wget http://releases.sapsailing.com/$INSTALL_FROM_RELEASE/$INSTALL_FROM_RELEASE.tar.gz
mv env.sh env.sh.preserved
mv configuration/mail.properties configuration/mail.properties.preserved
tar xvzf $INSTALL_FROM_RELEASE.tar.gz
mv env.sh.preserved env.sh
mv configuration/mail.properties.preserved configuration/mail.properties
echo "Configuration for this server is unchanged - just binaries have been changed."
else
echo "The variable INSTALL_FROM_RELEASE has not been set therefore no release file will be installed!"
@@ -165,8 +167,10 @@ load_from_local_release_file ()
rm -rf plugins start stop status native-libraries org.eclipse.osgi
echo "Loading from release file $INSTALL_FROM_RELEASE"
mv env.sh env.sh.preserved
mv configuration/mail.properties configuration/mail.properties.preserved
tar xvzf $INSTALL_FROM_RELEASE
mv env.sh.preserved env.sh
mv configuration/mail.properties.preserved configuration/mail.properties
echo "Configuration for this server is unchanged - just binaries have been changed."
else
echo "The variable INSTALL_FROM_RELEASE has not been set therefore no release file will be installed!"