eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-18 18:20:58 +00:00
Code Activity

Merge branch 'racecommittee_app'

Browse Source
This commit is contained in:
Axel Uhl committed 2013-09-20 09:59:17 +02:00
2 parents 5ff3576978 5bcf0f6193
commit 873d5344fc
6 files changed
+15 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
+2 -5
View File
@@ -1009,11 +1009,8 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory {
query.put(FieldNames.RACE_LOG_IDENTIFIER.name(), TripleSerializer.serialize(identifier.getIdentifier()));
loadRaceLogEvents(result, query);
// query for obsolete events
query.put(FieldNames.RACE_LOG_IDENTIFIER.name(), MongoUtils.escapeDollarAndDot(String.format("%s.%s.%s",
identifier.getTemplate().getParentObjectName(),
identifier.getRaceColumnName(),
identifier.getFleetName())));
// query for events with deprecated identifier format
query.put(FieldNames.RACE_LOG_IDENTIFIER.name(), MongoUtils.escapeDollarAndDot(identifier.getDeprecatedIdentifier()));
loadRaceLogEvents(result, query);
} catch (Throwable t) {
// something went wrong during DB access; report, then use empty new race log
java/com.sap.sailing.domain/src/com/sap/sailing/domain/racelog/RaceLogIdentifier.java
+2
View File
@@ -12,6 +12,8 @@ public interface RaceLogIdentifier extends Serializable {
Triple<String, String, String> getIdentifier();
String getDeprecatedIdentifier();
RaceLogIdentifierTemplate getTemplate();
}
java/com.sap.sailing.domain/src/com/sap/sailing/domain/racelog/impl/RaceLogIdentifierImpl.java
+8
View File
@@ -25,6 +25,14 @@ public class RaceLogIdentifierImpl implements RaceLogIdentifier {
return new Util.Triple<String, String, String>(template.getParentObjectName(), raceColumnName, fleetName);
}
@Override
public String getDeprecatedIdentifier() {
return String.format("%s.%s.%s",
this.getTemplate().getParentObjectName(),
this.getRaceColumnName(),
this.getFleetName());
}
@Override
public RaceLogIdentifierTemplate getTemplate() {
return template;
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadRaceLogsTest.java
+1 -1
View File
@@ -108,7 +108,7 @@ public class StoreAndLoadRaceLogsTest extends AbstractMongoDBTest {
}
@Test
public void testdLoadObsoleteAndNewIdentifier() {
public void testLoadObsoleteAndNewIdentifier() {
// event1 stored with obsolete identifier
DBObject dbEvent1 = (DBObject) com.mongodb.util.JSON.parse(createOldFormatRaceLogEventJson(UUID.randomUUID()));
mongoFactory.getRaceLogCollection().insert(dbEvent1);
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInLeaderboards.java
+1 -1
View File
@@ -270,7 +270,7 @@ public class TestStoringAndRetrievingRaceLogInLeaderboards extends RaceLogMongoD
result.put(FieldNames.RACE_LOG_EVENT_CLASS.name(), RaceLogFinishPositioningConfirmedEvent.class.getSimpleName());
DBObject raceLogResult = new BasicDBObject();
raceLogResult.put(FieldNames.RACE_LOG_IDENTIFIER.name(), MongoUtils.escapeDollarAndDot(raceColumn.getRaceLogIdentifier(defaultFleet).getIdentifier().toString()));
raceLogResult.put(FieldNames.RACE_LOG_IDENTIFIER.name(), MongoUtils.escapeDollarAndDot(raceColumn.getRaceLogIdentifier(defaultFleet).getDeprecatedIdentifier()));
raceLogResult.put(FieldNames.RACE_LOG_EVENT.name(), result);
MongoObjectFactoryImpl factoryImpl = (MongoObjectFactoryImpl) mongoObjectFactory;
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInRegatta.java
+1 -1
View File
@@ -337,7 +337,7 @@ public class TestStoringAndRetrievingRaceLogInRegatta extends RaceLogMongoDBTest
result.put(FieldNames.RACE_LOG_EVENT_CLASS.name(), RaceLogFinishPositioningConfirmedEvent.class.getSimpleName());
DBObject raceLogResult = new BasicDBObject();
raceLogResult.put(FieldNames.RACE_LOG_IDENTIFIER.name(), MongoUtils.escapeDollarAndDot(raceColumn.getRaceLogIdentifier(fleet).getIdentifier().toString()));
raceLogResult.put(FieldNames.RACE_LOG_IDENTIFIER.name(), MongoUtils.escapeDollarAndDot(raceColumn.getRaceLogIdentifier(fleet).getDeprecatedIdentifier()));
raceLogResult.put(FieldNames.RACE_LOG_EVENT.name(), result);
MongoObjectFactoryImpl factoryImpl = (MongoObjectFactoryImpl) mongoObjectFactory;