From 3d2639987a603cf3871b5781502cb5162aecda6e Mon Sep 17 00:00:00 2001 From: Fredrik Teschke Date: Thu, 4 Dec 2014 11:15:20 +0100 Subject: [PATCH] pass null as RegattaLogStore for now --- .../src/com/sap/sailing/autoload/TracTrac.java | 5 +++-- .../domain/persistence/impl/DomainObjectFactoryImpl.java | 5 +++-- .../com/sap/sailing/gwt/ui/server/SailingServiceImpl.java | 5 +++-- .../com/sap/sailing/mongodb/test/RaceLogMongoDBTest.java | 3 ++- .../sap/sailing/server/impl/RacingEventServiceImpl.java | 7 ++----- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/java/com.sap.sailing.autoload/src/com/sap/sailing/autoload/TracTrac.java b/java/com.sap.sailing.autoload/src/com/sap/sailing/autoload/TracTrac.java index fccab83a27d..f385a35e47c 100644 --- a/java/com.sap.sailing.autoload/src/com/sap/sailing/autoload/TracTrac.java +++ b/java/com.sap.sailing.autoload/src/com/sap/sailing/autoload/TracTrac.java @@ -81,8 +81,9 @@ public class TracTrac { } RaceLogStore raceLogStore = MongoRaceLogStoreFactory.INSTANCE.getMongoRaceLogStore(getService() .getMongoObjectFactory(), getService().getDomainObjectFactory()); - RegattaLogStore regattaLogStore = MongoRegattaLogStoreFactory.INSTANCE.getMongoRegattaLogStore( - getService().getMongoObjectFactory(), getService().getDomainObjectFactory()); + RegattaLogStore regattaLogStore = null; + //TODO MongoRegattaLogStoreFactory.INSTANCE.getMongoRegattaLogStore( + //getService().getMongoObjectFactory(), getService().getDomainObjectFactory()); getTracTracAdapter().addTracTracRace( (TrackerManager) getService(), regattaForRaceRecord, diff --git a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java index c75f2774525..33246c2bc00 100755 --- a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java +++ b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java @@ -472,8 +472,9 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory { } private RegattaLogStore getRegattaLogStore() { - return MongoRegattaLogStoreFactory.INSTANCE.getMongoRegattaLogStore( - new MongoObjectFactoryImpl(database, serviceFinderFactory), this); + return null; + //TODO MongoRegattaLogStoreFactory.INSTANCE.getMongoRegattaLogStore( +// new MongoObjectFactoryImpl(database, serviceFinderFactory), this); } private FlexibleLeaderboard loadFlexibleLeaderboard(DBObject dbLeaderboard, 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 7d5364e0aaf..13d20b2e39e 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 @@ -2626,8 +2626,9 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S } private RegattaLogStore getRegattaLogStore() { - return MongoRegattaLogStoreFactory.INSTANCE.getMongoRegattaLogStore( - mongoObjectFactory, domainObjectFactory); + return null; +// TODO MongoRegattaLogStoreFactory.INSTANCE.getMongoRegattaLogStore( +// mongoObjectFactory, domainObjectFactory); } @Override diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/RaceLogMongoDBTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/RaceLogMongoDBTest.java index 1f6174ef155..4e1580bac2a 100644 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/RaceLogMongoDBTest.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/RaceLogMongoDBTest.java @@ -115,7 +115,8 @@ public abstract class RaceLogMongoDBTest extends AbstractMongoDBTest { } protected RegattaLogStore getRegattaLogStore() { - return MongoRegattaLogStoreFactory.INSTANCE.getMongoRegattaLogStore(mongoObjectFactory, domainObjectFactory); + return null; + //TODO MongoRegattaLogStoreFactory.INSTANCE.getMongoRegattaLogStore(mongoObjectFactory, domainObjectFactory); } } 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 f062ba39838..094e73487f0 100755 --- 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 @@ -1046,7 +1046,8 @@ public class RacingEventServiceImpl implements RacingEventService, ClearStateTes } private RegattaLogStore getRegattaLogStore() { - return MongoRegattaLogStoreFactory.INSTANCE.getMongoRegattaLogStore(mongoObjectFactory, domainObjectFactory); + return null; + //TODO MongoRegattaLogStoreFactory.INSTANCE.getMongoRegattaLogStore(mongoObjectFactory, domainObjectFactory); } @Override @@ -2110,10 +2111,6 @@ public class RacingEventServiceImpl implements RacingEventService, ClearStateTes return scheduler; } - /** - * The operation is executed by immediately {@link Operation#internalApplyTo(Object) applying} it to this - * service object. It is then replicated to all replicas. - */ @Override public ObjectInputStream createObjectInputStreamResolvingAgainstCache(InputStream is) throws IOException { return getBaseDomainFactory().createObjectInputStreamResolvingAgainstThisFactory(is);