move ObjectInputStreamResolvingAgainstCache to com.sap.sse and let com.sap.sse depend on com.sap.sse.common which has the IsManaagedByCache interface

This commit is contained in:
Axel Uhl committed 2015-01-14 13:54:45 +01:00
1 parent c13325e1b3
commit 7f7eb10256
9 files changed
+12 -8

No files matched your search

@@ -18,6 +18,7 @@ Require-Bundle: com.sap.sailing.domain,
org.junit4;bundle-version="4.8.2",
org.json.simple;bundle-version="1.1.0",
com.sap.sse.common,
com.sap.sse.replication
com.sap.sse.replication,
com.sap.sse
Export-Package: com.sap.sailing.domain.test,
com.sap.sailing.domain.test.mock
@@ -22,8 +22,8 @@ import com.sap.sailing.domain.tracking.MarkPassing;
import com.sap.sailing.domain.tracking.TrackedRace;
import com.sap.sailing.domain.tracking.TrackedRegattaRegistry;
import com.sap.sse.common.IsManagedByCache;
import com.sap.sse.common.ObjectInputStreamResolvingAgainstCache;
import com.sap.sse.common.TimePoint;
import com.sap.sse.util.ObjectInputStreamResolvingAgainstCache;
public interface DomainFactory extends SharedDomainFactory {
/**
@@ -57,10 +57,10 @@ import com.sap.sailing.domain.tracking.TrackedRegattaRegistry;
import com.sap.sailing.domain.tracking.impl.MarkPassingImpl;
import com.sap.sailing.domain.tracking.impl.TrackedRaceImpl;
import com.sap.sailing.geocoding.ReverseGeocoder;
import com.sap.sse.common.ObjectInputStreamResolvingAgainstCache;
import com.sap.sse.common.TimePoint;
import com.sap.sse.common.Util;
import com.sap.sse.common.impl.MillisecondsTimePoint;
import com.sap.sse.util.ObjectInputStreamResolvingAgainstCache;
public class DomainFactoryImpl extends SharedDomainFactoryImpl implements DomainFactory {
private static Logger logger = Logger.getLogger(DomainFactoryImpl.class.getName());
@@ -4,7 +4,7 @@ import java.io.IOException;
import java.io.InputStream;
import com.sap.sailing.domain.base.DomainFactory;
import com.sap.sse.common.ObjectInputStreamResolvingAgainstCache;
import com.sap.sse.util.ObjectInputStreamResolvingAgainstCache;
public class ObjectInputStreamResolvingAgainstDomainFactoryImpl extends ObjectInputStreamResolvingAgainstCache<DomainFactory> {
ObjectInputStreamResolvingAgainstDomainFactoryImpl(InputStream in, DomainFactory domainFactory) throws IOException {
@@ -19,7 +19,7 @@ import com.sap.sailing.domain.persistence.MongoRaceLogStoreFactory;
import com.sap.sailing.domain.racelog.RaceLogStore;
import com.sap.sailing.server.RacingEventService;
import com.sap.sailing.server.operationaltransformation.ImportMasterDataOperation;
import com.sap.sse.common.ObjectInputStreamResolvingAgainstCache;
import com.sap.sse.util.ObjectInputStreamResolvingAgainstCache;
public class MasterDataImporter {
private final DomainFactory baseDomainFactory;
@@ -10,11 +10,11 @@ import java.util.logging.Logger;
import org.osgi.framework.BundleContext;
import com.sap.sse.common.ObjectInputStreamResolvingAgainstCache;
import com.sap.sse.common.WithID;
import com.sap.sse.operationaltransformation.Operation;
import com.sap.sse.operationaltransformation.OperationWithTransformationSupport;
import com.sap.sse.replication.impl.OperationWithResultWithIdWrapper;
import com.sap.sse.util.ObjectInputStreamResolvingAgainstCache;
/**
* Represents a replicable part of an application. Such a replicable part is usually holder of application state and a
@@ -3,8 +3,8 @@ package com.sap.sse.security.impl;
import java.io.IOException;
import java.io.InputStream;
import com.sap.sse.common.ObjectInputStreamResolvingAgainstCache;
import com.sap.sse.security.UserStore;
import com.sap.sse.util.ObjectInputStreamResolvingAgainstCache;
public class ObjectInputStreamResolvingAgainstSecurityCache extends ObjectInputStreamResolvingAgainstCache<UserStore> {
ObjectInputStreamResolvingAgainstSecurityCache(InputStream in, UserStore cache) throws IOException {
+1
View File
@@ -9,3 +9,4 @@ Export-Package: com.sap.sse,
com.sap.sse.util,
com.sap.sse.util.impl
Bundle-ActivationPolicy: lazy
Require-Bundle: com.sap.sse.common
@@ -1,10 +1,12 @@
package com.sap.sse.common;
package com.sap.sse.util;
import java.io.IOException;
import java.io.InputStream;
import java.io.ObjectInputStream;
import java.io.ObjectStreamClass;
import com.sap.sse.common.IsManagedByCache;
/**
* During de-serialization, resolves objects managed by a cache of type <C> using a cache of that type passed to the
* constructor. Objects are identified as being managed by such a cache by means of the marker interface