You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2011/05/03 08:33:49 UTC
svn commit: r1098939 [3/11] - in /incubator/isis/trunk/runtimes/dflt:
profilestores/dflt/src/main/java/org/apache/isis/runtimes/dflt/profilestores/dflt/
profilestores/xml/src/main/java/org/apache/isis/runtimes/dflt/profilestores/xml/
profilestores/xml/...
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/client/persistence/PersistenceSessionProxy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/client/persistence/PersistenceSessionProxy.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/client/persistence/PersistenceSessionProxy.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/client/persistence/PersistenceSessionProxy.java Tue May 3 06:33:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.runtimes.dflt.remoting.common.client.persistence;
import java.util.ArrayList;
@@ -25,6 +24,19 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.commons.components.ApplicationScopedComponent;
+import org.apache.isis.core.commons.components.SessionScopedComponent;
+import org.apache.isis.core.commons.debug.DebugBuilder;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapterFactory;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacetUtils;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.runtimes.dflt.remoting.common.data.Data;
import org.apache.isis.runtimes.dflt.remoting.common.data.common.IdentityData;
import org.apache.isis.runtimes.dflt.remoting.common.data.common.ObjectData;
@@ -43,19 +55,6 @@ import org.apache.isis.runtimes.dflt.rem
import org.apache.isis.runtimes.dflt.remoting.common.exchange.ResolveObjectResponse;
import org.apache.isis.runtimes.dflt.remoting.common.facade.ServerFacade;
import org.apache.isis.runtimes.dflt.remoting.common.protocol.ObjectEncoderDecoder;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-import org.apache.isis.core.commons.components.SessionScopedComponent;
-import org.apache.isis.core.commons.debug.DebugBuilder;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapterFactory;
-import org.apache.isis.core.metamodel.adapter.ResolveState;
-import org.apache.isis.core.metamodel.adapter.oid.Oid;
-import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacetUtils;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSessionAbstract;
import org.apache.isis.runtimes.dflt.runtime.persistence.adaptermanager.AdapterManagerExtended;
import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.PersistenceSessionObjectStore;
@@ -71,7 +70,6 @@ import org.apache.isis.runtimes.dflt.run
import org.apache.isis.runtimes.dflt.runtime.transaction.TransactionalClosureWithReturnAbstract;
import org.apache.log4j.Logger;
-
public class PersistenceSessionProxy extends PersistenceSessionAbstract {
final static Logger LOG = Logger.getLogger(PersistenceSessionProxy.class);
@@ -83,35 +81,27 @@ public class PersistenceSessionProxy ext
* Keyed on an adapter wrapping a <tt>java.util.List</tt> (or equiv), ie with a {@link CollectionFacet}.
*/
private final Map<ObjectSpecification, ObjectAdapter> cache = new HashMap<ObjectSpecification, ObjectAdapter>();
- private HashMap<String, Oid> serviceOidByNameCache = new HashMap<String, Oid>();
-
+ private final HashMap<String, Oid> serviceOidByNameCache = new HashMap<String, Oid>();
- //////////////////////////////////////////////////////////////////
+ // ////////////////////////////////////////////////////////////////
// Constructor
- //////////////////////////////////////////////////////////////////
+ // ////////////////////////////////////////////////////////////////
- public PersistenceSessionProxy(
- final PersistenceSessionFactory persistenceSessionFactory,
- final ObjectAdapterFactory adapterFactory,
- final ObjectFactory objectFactory,
- final ServicesInjector containerInjector,
- final OidGenerator oidGenerator,
- final AdapterManagerExtended adapterManager,
- final ServerFacade serverFacade,
- final ObjectEncoderDecoder encoder) {
+ public PersistenceSessionProxy(final PersistenceSessionFactory persistenceSessionFactory,
+ final ObjectAdapterFactory adapterFactory, final ObjectFactory objectFactory,
+ final ServicesInjector containerInjector, final OidGenerator oidGenerator,
+ final AdapterManagerExtended adapterManager, final ServerFacade serverFacade, final ObjectEncoderDecoder encoder) {
super(persistenceSessionFactory, adapterFactory, objectFactory, containerInjector, oidGenerator, adapterManager);
this.serverFacade = serverFacade;
this.encoderDecoder = encoder;
}
-
- //////////////////////////////////////////////////////////////////
+ // ////////////////////////////////////////////////////////////////
// init, shutdown, reset, isInitialized
- //////////////////////////////////////////////////////////////////
+ // ////////////////////////////////////////////////////////////////
/**
- * TODO: mismatch between {@link SessionScopedComponent} (open) and
- * {@link ApplicationScopedComponent} (init).
+ * TODO: mismatch between {@link SessionScopedComponent} (open) and {@link ApplicationScopedComponent} (init).
*/
@Override
public void doOpen() {
@@ -119,28 +109,27 @@ public class PersistenceSessionProxy ext
}
/**
- * TODO: mismatch between {@link SessionScopedComponent} (open) and
- * {@link ApplicationScopedComponent} (init).
+ * TODO: mismatch between {@link SessionScopedComponent} (open) and {@link ApplicationScopedComponent} (init).
*/
+ @Override
public void doClose() {
serverFacade.shutdown();
}
-
/**
* No need to install fixtures, rely on server-side to do the right thing.
*/
+ @Override
public boolean isFixturesInstalled() {
return true;
}
-
- //////////////////////////////////////////////////////////////////
+ // ////////////////////////////////////////////////////////////////
// loadObject, reload
- //////////////////////////////////////////////////////////////////
+ // ////////////////////////////////////////////////////////////////
- public synchronized ObjectAdapter loadObject(
- final Oid oid, final ObjectSpecification hintSpec) {
+ @Override
+ public synchronized ObjectAdapter loadObject(final Oid oid, final ObjectSpecification hintSpec) {
final ObjectAdapter adapter = getAdapterManager().getAdapterFor(oid);
if (adapter != null) {
return adapter;
@@ -148,71 +137,73 @@ public class PersistenceSessionProxy ext
return loadObjectFromPersistenceLayer(oid, hintSpec);
}
+ private ObjectAdapter loadObjectFromPersistenceLayer(final Oid oid, final ObjectSpecification specHint) {
+ return getTransactionManager().executeWithinTransaction(
+ new TransactionalClosureWithReturnAbstract<ObjectAdapter>() {
+ @Override
+ public ObjectAdapter execute() {
+ // NB: I think that the auth session must be null because we may not yet have logged in if
+ // retrieving the services.
+ final GetObjectRequest request = new GetObjectRequest(null, oid, specHint.getFullIdentifier());
+ final GetObjectResponse response = serverFacade.getObject(request);
+ final ObjectData data = response.getObjectData();
+ return encoderDecoder.decode(data);
+ }
+ });
+ }
- private ObjectAdapter loadObjectFromPersistenceLayer(final Oid oid,
- final ObjectSpecification specHint) {
- return getTransactionManager().executeWithinTransaction(
- new TransactionalClosureWithReturnAbstract<ObjectAdapter>(){
- public ObjectAdapter execute() {
- // NB: I think that the auth session must be null because we may not yet have logged in if retrieving the services.
- GetObjectRequest request = new GetObjectRequest(null, oid, specHint.getFullIdentifier());
- GetObjectResponse response = serverFacade.getObject(request);
- final ObjectData data = response.getObjectData();
- return encoderDecoder.decode(data);
- }});
- }
-
+ @Override
public void reload(final ObjectAdapter object) {
final IdentityData identityData = encoderDecoder.encodeIdentityData(object);
reloadFromPersistenceLayer(identityData);
}
+ private void reloadFromPersistenceLayer(final IdentityData identityData) {
+ getTransactionManager().executeWithinTransaction(new TransactionalClosureAbstract() {
+ @Override
+ public void execute() {
+ final ResolveObjectRequest request = new ResolveObjectRequest(getAuthenticationSession(), identityData);
+ final ResolveObjectResponse response = serverFacade.resolveImmediately(request);
+ final ObjectData update = response.getObjectData();
+ encoderDecoder.decode(update);
+ }
+ });
+ }
- private void reloadFromPersistenceLayer(final IdentityData identityData) {
- getTransactionManager().executeWithinTransaction(
- new TransactionalClosureAbstract() {
- public void execute() {
- ResolveObjectRequest request = new ResolveObjectRequest(getAuthenticationSession(), identityData);
- ResolveObjectResponse response = serverFacade.resolveImmediately(request);
- final ObjectData update = response.getObjectData();
- encoderDecoder.decode(update);
- }});
- }
-
-
- //////////////////////////////////////////////////////////////////
+ // ////////////////////////////////////////////////////////////////
// resolveImmediately, resolveField
- //////////////////////////////////////////////////////////////////
+ // ////////////////////////////////////////////////////////////////
+ @Override
public synchronized void resolveImmediately(final ObjectAdapter adapter) {
- final ResolveState resolveState = adapter.getResolveState();
- if (!resolveState.canChangeTo(ResolveState.RESOLVING)) {
- return;
- }
- final Oid oid = adapter.getOid();
- if (LOG.isDebugEnabled()) {
- LOG.debug("resolve object (remotely from server)" + oid);
- }
-
- resolveImmediatelyFromPersistenceLayer(adapter);
- }
-
- private void resolveImmediatelyFromPersistenceLayer(final ObjectAdapter adapter) {
- final IdentityData adapterData = encoderDecoder.encodeIdentityData(adapter);
- getTransactionManager().executeWithinTransaction(new TransactionalClosureAbstract(){
- public void execute() {
- ResolveObjectRequest request = new ResolveObjectRequest(
- getAuthenticationSession(), adapterData);
- // unlike the server-side implementation we don't invoke the callbacks
- // for loading and loaded (they will already have been called in the server)
- ResolveObjectResponse response = serverFacade.resolveImmediately(
- request);
- final ObjectData data = response.getObjectData();
- encoderDecoder.decode(data);
- }
- });
- }
+ final ResolveState resolveState = adapter.getResolveState();
+ if (!resolveState.canChangeTo(ResolveState.RESOLVING)) {
+ return;
+ }
+ final Oid oid = adapter.getOid();
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("resolve object (remotely from server)" + oid);
+ }
+
+ resolveImmediatelyFromPersistenceLayer(adapter);
+ }
+
+ private void resolveImmediatelyFromPersistenceLayer(final ObjectAdapter adapter) {
+ final IdentityData adapterData = encoderDecoder.encodeIdentityData(adapter);
+ getTransactionManager().executeWithinTransaction(new TransactionalClosureAbstract() {
+ @Override
+ public void execute() {
+ final ResolveObjectRequest request = new ResolveObjectRequest(getAuthenticationSession(), adapterData);
+ // unlike the server-side implementation we don't invoke the callbacks
+ // for loading and loaded (they will already have been called in the server)
+ final ResolveObjectResponse response = serverFacade.resolveImmediately(request);
+ final ObjectData data = response.getObjectData();
+ encoderDecoder.decode(data);
+ }
+ });
+ }
+ @Override
public void resolveField(final ObjectAdapter adapter, final ObjectAssociation field) {
if (field.getSpecification().isCollectionOrIsAggregated()) {
return;
@@ -225,99 +216,101 @@ public class PersistenceSessionProxy ext
return;
}
if (LOG.isInfoEnabled()) {
- LOG.info("resolveField on server: " + adapter + "/" + field.getId());
+ LOG.info("resolveField on server: " + adapter + "/" + field.getId());
}
resolveFieldFromPersistenceLayer(adapter, field);
}
+ private void resolveFieldFromPersistenceLayer(final ObjectAdapter adapter, final ObjectAssociation field) {
+ final IdentityData adapterData = encoderDecoder.encodeIdentityData(adapter);
+ final String fieldId = field.getId();
+ getTransactionManager().executeWithinTransaction(new TransactionalClosureAbstract() {
+ @Override
+ public void execute() {
+ final ResolveFieldRequest request =
+ new ResolveFieldRequest(getAuthenticationSession(), adapterData, fieldId);
+ final ResolveFieldResponse response = serverFacade.resolveField(request);
+ final Data data = response.getData();
+ encoderDecoder.decode(data);
+ }
+ });
+ }
- private void resolveFieldFromPersistenceLayer(final ObjectAdapter adapter,
- final ObjectAssociation field) {
- final IdentityData adapterData = encoderDecoder.encodeIdentityData(adapter);
- final String fieldId = field.getId();
- getTransactionManager().executeWithinTransaction(new TransactionalClosureAbstract() {
- public void execute() {
- ResolveFieldRequest request = new ResolveFieldRequest(getAuthenticationSession(), adapterData, fieldId);
- ResolveFieldResponse response = serverFacade.resolveField(
- request);
- final Data data = response.getData();
- encoderDecoder.decode(data);
- }});
- }
-
-
- //////////////////////////////////////////////////////////////////
+ // ////////////////////////////////////////////////////////////////
// makePersistent
- //////////////////////////////////////////////////////////////////
+ // ////////////////////////////////////////////////////////////////
/**
- * REVIEW: we should perhaps have a little more symmetry here, and
- * have the {@link ServerFacade} callback to the {@link PersistenceSession}
- * (the <tt>PersistenceSessionPersist</tt> API) to handle remapping
- * of adapters.
+ * REVIEW: we should perhaps have a little more symmetry here, and have the {@link ServerFacade} callback to the
+ * {@link PersistenceSession} (the <tt>PersistenceSessionPersist</tt> API) to handle remapping of adapters.
*/
+ @Override
public synchronized void makePersistent(final ObjectAdapter object) {
if (LOG.isDebugEnabled()) {
LOG.debug("makePersistent " + object);
}
// TODO: the PSOS has more checks; should we do the same?
- makePersistentInPersistenceLayer(object);
+ makePersistentInPersistenceLayer(object);
}
- protected void makePersistentInPersistenceLayer(final ObjectAdapter object) {
- getTransactionManager().executeWithinTransaction(new TransactionalClosureAbstract(){
- public void execute() {
-
- // the two implementations (proxy vs object store) vary here.
- // the object store does not make this call directly, it
- // instead delegates to the PersistAlgorithm that makes a
- // callback to the PersistenceSessionPersist API,
- // which in turn calls remaps the adapters.
- //
- // the proxy persistor on the other hand does nothing here.
- // instead we remap the adapter in distribution code,
- // processing the handling of the returned results.
- //
- // (see REVIEW comment above)
-
- getTransactionManager().addMakePersistent(object);
- }});
- }
-
+ protected void makePersistentInPersistenceLayer(final ObjectAdapter object) {
+ getTransactionManager().executeWithinTransaction(new TransactionalClosureAbstract() {
+ @Override
+ public void execute() {
+
+ // the two implementations (proxy vs object store) vary here.
+ // the object store does not make this call directly, it
+ // instead delegates to the PersistAlgorithm that makes a
+ // callback to the PersistenceSessionPersist API,
+ // which in turn calls remaps the adapters.
+ //
+ // the proxy persistor on the other hand does nothing here.
+ // instead we remap the adapter in distribution code,
+ // processing the handling of the returned results.
+ //
+ // (see REVIEW comment above)
+
+ getTransactionManager().addMakePersistent(object);
+ }
+ });
+ }
- //////////////////////////////////////////////////////////////////
+ // ////////////////////////////////////////////////////////////////
// objectChanged
- //////////////////////////////////////////////////////////////////
+ // ////////////////////////////////////////////////////////////////
+ @Override
public void objectChanged(final ObjectAdapter adapter) {
if (adapter.isTransient()) {
addObjectChangedToPresentationLayer(adapter);
return;
}
if (adapter.getResolveState().respondToChangesInPersistentObjects()) {
- if (isImmutable(adapter)) {
- return;
- }
- addObjectChangedToPersistenceLayer(adapter);
- }
+ if (isImmutable(adapter)) {
+ return;
+ }
+ addObjectChangedToPersistenceLayer(adapter);
+ }
}
private void addObjectChangedToPresentationLayer(final ObjectAdapter adapter) {
- getUpdateNotifier().addChangedObject(adapter);
- }
-
- private void addObjectChangedToPersistenceLayer(final ObjectAdapter adapter) {
- getTransactionManager().executeWithinTransaction(new TransactionalClosureAbstract(){
- public void execute() {
- getTransactionManager().addObjectChanged(adapter);
- }});
- }
+ getUpdateNotifier().addChangedObject(adapter);
+ }
+ private void addObjectChangedToPersistenceLayer(final ObjectAdapter adapter) {
+ getTransactionManager().executeWithinTransaction(new TransactionalClosureAbstract() {
+ @Override
+ public void execute() {
+ getTransactionManager().addObjectChanged(adapter);
+ }
+ });
+ }
- //////////////////////////////////////////////////////////////////
+ // ////////////////////////////////////////////////////////////////
// destroy
- //////////////////////////////////////////////////////////////////
+ // ////////////////////////////////////////////////////////////////
+ @Override
public synchronized void destroyObject(final ObjectAdapter object) {
if (LOG.isDebugEnabled()) {
LOG.debug("destroyObject " + object);
@@ -328,90 +321,89 @@ public class PersistenceSessionProxy ext
// Isis.getObjectLoader().unloaded(object);
}
+ protected void destroyObjectInPersistenceLayer(final ObjectAdapter object) {
+ getTransactionManager().executeWithinTransaction(new TransactionalClosureAbstract() {
+ @Override
+ public void execute() {
+ getTransactionManager().addDestroyObject(object);
+ }
+ });
+ }
- protected void destroyObjectInPersistenceLayer(final ObjectAdapter object) {
- getTransactionManager().executeWithinTransaction(new TransactionalClosureAbstract(){
- public void execute() {
- getTransactionManager().addDestroyObject(object);
- }
- });
- }
-
- //////////////////////////////////////////////////////////////////
+ // ////////////////////////////////////////////////////////////////
// getInstances
- //////////////////////////////////////////////////////////////////
+ // ////////////////////////////////////////////////////////////////
@Override
protected ObjectAdapter[] getInstances(final PersistenceQuery persistenceQuery) {
final ObjectSpecification noSpec = persistenceQuery.getSpecification();
if (LOG.isDebugEnabled()) {
- LOG.debug("getInstances of " + noSpec + " with " + persistenceQuery);
+ LOG.debug("getInstances of " + noSpec + " with " + persistenceQuery);
}
if (canSatisfyFromCache(persistenceQuery)) {
- return getInstancesFromCache(persistenceQuery);
+ return getInstancesFromCache(persistenceQuery);
}
return findInstancesFromPersistenceLayer(persistenceQuery);
}
- private boolean canSatisfyFromCache(final PersistenceQuery persistenceQuery) {
- final ObjectSpecification noSpec = persistenceQuery.getSpecification();
- return cache.containsKey(noSpec) &&
- persistenceQuery instanceof PersistenceQueryBuiltIn;
- }
-
- /**
- * TODO: this code is not currently in use because there is no way to
- * set up the cache. We may want to change what the cache is keyed on.
- */
- private ObjectAdapter[] getInstancesFromCache(
- PersistenceQuery persistenceQuery) {
- final ObjectSpecification noSpec = persistenceQuery.getSpecification();
- PersistenceQueryBuiltIn builtIn = (PersistenceQueryBuiltIn) persistenceQuery;
- final ObjectAdapter collection = cache.get(noSpec);
+ private boolean canSatisfyFromCache(final PersistenceQuery persistenceQuery) {
+ final ObjectSpecification noSpec = persistenceQuery.getSpecification();
+ return cache.containsKey(noSpec) && persistenceQuery instanceof PersistenceQueryBuiltIn;
+ }
+
+ /**
+ * TODO: this code is not currently in use because there is no way to set up the cache. We may want to change what
+ * the cache is keyed on.
+ */
+ private ObjectAdapter[] getInstancesFromCache(final PersistenceQuery persistenceQuery) {
+ final ObjectSpecification noSpec = persistenceQuery.getSpecification();
+ final PersistenceQueryBuiltIn builtIn = (PersistenceQueryBuiltIn) persistenceQuery;
+ final ObjectAdapter collection = cache.get(noSpec);
if (!collection.getSpecification().isCollection()) {
- return new ObjectAdapter[0];
+ return new ObjectAdapter[0];
}
final CollectionFacet facet = CollectionFacetUtils.getCollectionFacetFromSpec(collection);
- final List<ObjectAdapter> instances = new ArrayList<ObjectAdapter>();
- for (ObjectAdapter instance : facet.iterable(collection)) {
- if (builtIn.matches(instance)) {
- instances.add(instance);
- }
- }
- return (ObjectAdapter[]) instances.toArray(new ObjectAdapter[instances.size()]);
- }
-
+ final List<ObjectAdapter> instances = new ArrayList<ObjectAdapter>();
+ for (final ObjectAdapter instance : facet.iterable(collection)) {
+ if (builtIn.matches(instance)) {
+ instances.add(instance);
+ }
+ }
+ return instances.toArray(new ObjectAdapter[instances.size()]);
+ }
- private ObjectAdapter[] findInstancesFromPersistenceLayer(
- final PersistenceQuery persistenceQuery) {
- final PersistenceQueryData criteriaData = encoderDecoder.encodePersistenceQuery(persistenceQuery);
+ private ObjectAdapter[] findInstancesFromPersistenceLayer(final PersistenceQuery persistenceQuery) {
+ final PersistenceQueryData criteriaData = encoderDecoder.encodePersistenceQuery(persistenceQuery);
return getTransactionManager().executeWithinTransaction(
- new TransactionalClosureWithReturnAbstract<ObjectAdapter[]>(){
- public ObjectAdapter[] execute() {
- FindInstancesRequest request = new FindInstancesRequest(getAuthenticationSession(), criteriaData);
- FindInstancesResponse response = serverFacade.findInstances(request);
- final ObjectData[] instancesAsObjectData = response.getInstances();
- final ObjectAdapter[] instances = new ObjectAdapter[instancesAsObjectData.length];
- for (int i = 0; i < instancesAsObjectData.length; i++) {
- instances[i] = encoderDecoder.decode(instancesAsObjectData[i]);
- }
- return instances;
- }
- @Override
- public void onSuccess() {
- clearAllDirty();
- }
- });
- }
-
+ new TransactionalClosureWithReturnAbstract<ObjectAdapter[]>() {
+ @Override
+ public ObjectAdapter[] execute() {
+ final FindInstancesRequest request =
+ new FindInstancesRequest(getAuthenticationSession(), criteriaData);
+ final FindInstancesResponse response = serverFacade.findInstances(request);
+ final ObjectData[] instancesAsObjectData = response.getInstances();
+ final ObjectAdapter[] instances = new ObjectAdapter[instancesAsObjectData.length];
+ for (int i = 0; i < instancesAsObjectData.length; i++) {
+ instances[i] = encoderDecoder.decode(instancesAsObjectData[i]);
+ }
+ return instances;
+ }
+
+ @Override
+ public void onSuccess() {
+ clearAllDirty();
+ }
+ });
+ }
- //////////////////////////////////////////////////////////////////
+ // ////////////////////////////////////////////////////////////////
// hasInstances
- //////////////////////////////////////////////////////////////////
+ // ////////////////////////////////////////////////////////////////
+ @Override
public boolean hasInstances(final ObjectSpecification specification) {
if (LOG.isDebugEnabled()) {
LOG.debug("hasInstances of " + specification);
@@ -422,39 +414,34 @@ public class PersistenceSessionProxy ext
return hasInstancesFromPersistenceLayer(specification);
}
+ private boolean hasInstancesFromCache(final ObjectSpecification specification) {
+ final ObjectAdapter collection = cache.get(specification);
+ final CollectionFacet facet = CollectionFacetUtils.getCollectionFacetFromSpec(collection);
+ if (facet == null) {
+ return false;
+ }
+ return facet.size(collection) > 0;
+ }
- private boolean hasInstancesFromCache(
- final ObjectSpecification specification) {
- final ObjectAdapter collection = (ObjectAdapter) cache.get(specification);
- final CollectionFacet facet = CollectionFacetUtils.getCollectionFacetFromSpec(collection);
- if (facet == null) {
- return false;
- }
- return facet.size(collection) > 0;
- }
-
-
- private boolean hasInstancesFromPersistenceLayer(
- final ObjectSpecification specification) {
- final String specFullName = specification.getFullIdentifier();
- return getTransactionManager().executeWithinTransaction(
- new TransactionalClosureWithReturnAbstract<Boolean>(){
- public Boolean execute() {
- HasInstancesRequest request = new HasInstancesRequest(getAuthenticationSession(), specFullName);
- HasInstancesResponse response = serverFacade.hasInstances(request);
- return response.hasInstances();
- }});
- }
-
+ private boolean hasInstancesFromPersistenceLayer(final ObjectSpecification specification) {
+ final String specFullName = specification.getFullIdentifier();
+ return getTransactionManager().executeWithinTransaction(new TransactionalClosureWithReturnAbstract<Boolean>() {
+ @Override
+ public Boolean execute() {
+ final HasInstancesRequest request = new HasInstancesRequest(getAuthenticationSession(), specFullName);
+ final HasInstancesResponse response = serverFacade.hasInstances(request);
+ return response.hasInstances();
+ }
+ });
+ }
- //////////////////////////////////////////////////////////////////
+ // ////////////////////////////////////////////////////////////////
// Services
- //////////////////////////////////////////////////////////////////
+ // ////////////////////////////////////////////////////////////////
- /**
- * TODO: not symmetric with {@link PersistenceSessionObjectStore}; we have
- * a cache but it does not?
- */
+ /**
+ * TODO: not symmetric with {@link PersistenceSessionObjectStore}; we have a cache but it does not?
+ */
@Override
public Oid getOidForService(final String name) {
Oid oid = serviceOidByNameCache.get(name);
@@ -465,38 +452,36 @@ public class PersistenceSessionProxy ext
return oid;
}
- private Oid getOidForServiceFromPersistenceLayer(final String serviceId) {
- OidForServiceRequest request = new OidForServiceRequest(getAuthenticationSession(), serviceId);
- OidForServiceResponse response = serverFacade.oidForService(request);
- final IdentityData data = response.getOidData();
- return data.getOid();
- }
-
- /**
- * TODO: not symmetric with {@link PersistenceSessionObjectStore}; we have
- * a cache but it does not?
- */
+ private Oid getOidForServiceFromPersistenceLayer(final String serviceId) {
+ final OidForServiceRequest request = new OidForServiceRequest(getAuthenticationSession(), serviceId);
+ final OidForServiceResponse response = serverFacade.oidForService(request);
+ final IdentityData data = response.getOidData();
+ return data.getOid();
+ }
+
+ /**
+ * TODO: not symmetric with {@link PersistenceSessionObjectStore}; we have a cache but it does not?
+ */
@Override
public void registerService(final String name, final Oid oid) {
serviceOidByNameCache.put(name, oid);
}
-
- // ///////////////////////////////////////////////////////////////////////////
- // TransactionManager
- // ///////////////////////////////////////////////////////////////////////////
+ // ///////////////////////////////////////////////////////////////////////////
+ // TransactionManager
+ // ///////////////////////////////////////////////////////////////////////////
/**
* Just downcasts.
*/
+ @Override
public ClientSideTransactionManager getTransactionManager() {
return (ClientSideTransactionManager) super.getTransactionManager();
}
-
- //////////////////////////////////////////////////////////////////
+ // ////////////////////////////////////////////////////////////////
// Debugging
- //////////////////////////////////////////////////////////////////
+ // ////////////////////////////////////////////////////////////////
@Override
public void debugData(final DebugBuilder debug) {
@@ -504,14 +489,14 @@ public class PersistenceSessionProxy ext
debug.appendln("Server Facade", serverFacade);
}
+ @Override
public String debugTitle() {
return "Proxy Persistence Sessino";
}
-
- //////////////////////////////////////////////////////////////////
+ // ////////////////////////////////////////////////////////////////
// Dependencies (from context)
- //////////////////////////////////////////////////////////////////
+ // ////////////////////////////////////////////////////////////////
private static AuthenticationSession getAuthenticationSession() {
return IsisContext.getAuthenticationSession();
@@ -521,6 +506,4 @@ public class PersistenceSessionProxy ext
return IsisContext.getUpdateNotifier();
}
-
-
}
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/client/persistence/ProxyPersistenceSessionFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/client/persistence/ProxyPersistenceSessionFactory.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/client/persistence/ProxyPersistenceSessionFactory.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/client/persistence/ProxyPersistenceSessionFactory.java Tue May 3 06:33:43 2011
@@ -17,21 +17,17 @@
* under the License.
*/
+package org.apache.isis.runtimes.dflt.remoting.common.client.persistence;
-package org.apache.isis.runtimes.dflt.remoting.common.client.persistence;
-
import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSessionFactoryDelegate;
import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSessionFactoryDelegating;
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
-
-public class ProxyPersistenceSessionFactory extends PersistenceSessionFactoryDelegating {
-
- public ProxyPersistenceSessionFactory(
- final DeploymentType deploymentType,
- final PersistenceSessionFactoryDelegate persistenceSessionFactoryDelegate) {
- super(deploymentType, persistenceSessionFactoryDelegate);
- }
-
-}
-
-
+
+public class ProxyPersistenceSessionFactory extends PersistenceSessionFactoryDelegating {
+
+ public ProxyPersistenceSessionFactory(final DeploymentType deploymentType,
+ final PersistenceSessionFactoryDelegate persistenceSessionFactoryDelegate) {
+ super(deploymentType, persistenceSessionFactoryDelegate);
+ }
+
+}
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/client/transaction/ClientSideTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/client/transaction/ClientSideTransaction.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/client/transaction/ClientSideTransaction.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/client/transaction/ClientSideTransaction.java Tue May 3 06:33:43 2011
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.runtimes.dflt.remoting.common.client.transaction;
-package org.apache.isis.runtimes.dflt.remoting.common.client.transaction;
-
import java.util.ArrayList;
import java.util.List;
@@ -28,119 +27,103 @@ import org.apache.isis.runtimes.dflt.run
import org.apache.isis.runtimes.dflt.runtime.system.transaction.MessageBroker;
import org.apache.isis.runtimes.dflt.runtime.system.transaction.UpdateNotifier;
import org.apache.isis.runtimes.dflt.runtime.transaction.IsisTransactionAbstract;
-
-
-/**
- * Encapsulates a transaction occurring on the client, where each of the actions (add, remove and change) are
- * then passed to the server as an atomic unit.
- *
- * <p>
- * Each action is captured as an {@link ClientTransactionEvent} object.
- */
-public class ClientSideTransaction extends IsisTransactionAbstract {
-
- private final List<ClientTransactionEvent> transactionEvents = new ArrayList<ClientTransactionEvent>();
-
-
- ////////////////////////////////////////////////////////////////
- // Constructor
- ////////////////////////////////////////////////////////////////
-
- public ClientSideTransaction(
- IsisTransactionManager transactionManager,
- MessageBroker messageBroker,
- UpdateNotifier updateNotifier) {
- super(transactionManager, messageBroker, updateNotifier);
- }
-
-
-
- ////////////////////////////////////////////////////////////////
- // create (makePersistent)
- ////////////////////////////////////////////////////////////////
-
- /**
- * Add an event to transaction for the adding of the specified object.
- */
- public void addMakePersistent(final ObjectAdapter object) {
- add(new ClientTransactionEvent(object, ClientTransactionEvent.ADD));
- }
-
-
- ////////////////////////////////////////////////////////////////
- // modify (objectChanged)
- ////////////////////////////////////////////////////////////////
-
- /**
- * Add an event to transaction for the updating of the specified object.
- */
- public void addObjectChanged(final ObjectAdapter object) {
- add(new ClientTransactionEvent(object, ClientTransactionEvent.CHANGE));
- }
-
-
- ////////////////////////////////////////////////////////////////
- // delete (destroy)
- ////////////////////////////////////////////////////////////////
-
- /**
- * Add an event to transaction for the destruction of the specified object.
- */
- public void addDestroyObject(final ObjectAdapter object) {
- add(new ClientTransactionEvent(object, ClientTransactionEvent.DELETE));
- }
-
-
-
- ////////////////////////////////////////////////////////////////
- // Entries
- ////////////////////////////////////////////////////////////////
-
-
- /**
- * Return all the events for the transaction.
- */
- public ClientTransactionEvent[] getEntries() {
- return transactionEvents.toArray(new ClientTransactionEvent[]{});
- }
-
- /**
- * Returns true if there are no entries, hence the transaction is not used.
- */
- public boolean isEmpty() {
- return transactionEvents.size() == 0;
- }
-
-
- ////////////////////////////////////////////////////////////////
- // commit, abort
- ////////////////////////////////////////////////////////////////
-
- @Override
- protected void doFlush() {
- // nothing to do
- }
-
-
- /**
- * TODO: need to restore the state of all involved objects
- */
- @Override
- public void doAbort() {
-
- }
-
-
- ////////////////////////////////////////////////////////////////
- // Helpers
- ////////////////////////////////////////////////////////////////
-
- private void add(final ClientTransactionEvent entry) {
- if (!transactionEvents.contains(entry)) {
- transactionEvents.add(entry);
- }
- }
-
-
-
-}
+
+/**
+ * Encapsulates a transaction occurring on the client, where each of the actions (add, remove and change) are then
+ * passed to the server as an atomic unit.
+ *
+ * <p>
+ * Each action is captured as an {@link ClientTransactionEvent} object.
+ */
+public class ClientSideTransaction extends IsisTransactionAbstract {
+
+ private final List<ClientTransactionEvent> transactionEvents = new ArrayList<ClientTransactionEvent>();
+
+ // //////////////////////////////////////////////////////////////
+ // Constructor
+ // //////////////////////////////////////////////////////////////
+
+ public ClientSideTransaction(final IsisTransactionManager transactionManager, final MessageBroker messageBroker,
+ final UpdateNotifier updateNotifier) {
+ super(transactionManager, messageBroker, updateNotifier);
+ }
+
+ // //////////////////////////////////////////////////////////////
+ // create (makePersistent)
+ // //////////////////////////////////////////////////////////////
+
+ /**
+ * Add an event to transaction for the adding of the specified object.
+ */
+ public void addMakePersistent(final ObjectAdapter object) {
+ add(new ClientTransactionEvent(object, ClientTransactionEvent.ADD));
+ }
+
+ // //////////////////////////////////////////////////////////////
+ // modify (objectChanged)
+ // //////////////////////////////////////////////////////////////
+
+ /**
+ * Add an event to transaction for the updating of the specified object.
+ */
+ public void addObjectChanged(final ObjectAdapter object) {
+ add(new ClientTransactionEvent(object, ClientTransactionEvent.CHANGE));
+ }
+
+ // //////////////////////////////////////////////////////////////
+ // delete (destroy)
+ // //////////////////////////////////////////////////////////////
+
+ /**
+ * Add an event to transaction for the destruction of the specified object.
+ */
+ public void addDestroyObject(final ObjectAdapter object) {
+ add(new ClientTransactionEvent(object, ClientTransactionEvent.DELETE));
+ }
+
+ // //////////////////////////////////////////////////////////////
+ // Entries
+ // //////////////////////////////////////////////////////////////
+
+ /**
+ * Return all the events for the transaction.
+ */
+ public ClientTransactionEvent[] getEntries() {
+ return transactionEvents.toArray(new ClientTransactionEvent[] {});
+ }
+
+ /**
+ * Returns true if there are no entries, hence the transaction is not used.
+ */
+ public boolean isEmpty() {
+ return transactionEvents.size() == 0;
+ }
+
+ // //////////////////////////////////////////////////////////////
+ // commit, abort
+ // //////////////////////////////////////////////////////////////
+
+ @Override
+ protected void doFlush() {
+ // nothing to do
+ }
+
+ /**
+ * TODO: need to restore the state of all involved objects
+ */
+ @Override
+ public void doAbort() {
+
+ }
+
+ // //////////////////////////////////////////////////////////////
+ // Helpers
+ // //////////////////////////////////////////////////////////////
+
+ private void add(final ClientTransactionEvent entry) {
+ if (!transactionEvents.contains(entry)) {
+ transactionEvents.add(entry);
+ }
+ }
+
+}
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/client/transaction/ClientTransactionEvent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/client/transaction/ClientTransactionEvent.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/client/transaction/ClientTransactionEvent.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/client/transaction/ClientTransactionEvent.java Tue May 3 06:33:43 2011
@@ -17,12 +17,10 @@
* under the License.
*/
-
package org.apache.isis.runtimes.dflt.remoting.common.client.transaction;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-
public class ClientTransactionEvent {
private final ObjectAdapter object;
private final int type;
@@ -64,4 +62,3 @@ public class ClientTransactionEvent {
return type;
}
}
-
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/Data.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/Data.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/Data.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/Data.java Tue May 3 06:33:43 2011
@@ -17,12 +17,10 @@
* under the License.
*/
-
package org.apache.isis.runtimes.dflt.remoting.common.data;
import java.io.Serializable;
-
public interface Data extends Serializable {
String getType();
}
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/DataFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/DataFactory.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/DataFactory.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/DataFactory.java Tue May 3 06:33:43 2011
@@ -17,40 +17,32 @@
* under the License.
*/
+package org.apache.isis.runtimes.dflt.remoting.common.data;
-package org.apache.isis.runtimes.dflt.remoting.common.data;
-
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.version.Version;
import org.apache.isis.runtimes.dflt.remoting.common.data.common.CollectionData;
import org.apache.isis.runtimes.dflt.remoting.common.data.common.EncodableObjectData;
import org.apache.isis.runtimes.dflt.remoting.common.data.common.IdentityData;
import org.apache.isis.runtimes.dflt.remoting.common.data.common.NullData;
import org.apache.isis.runtimes.dflt.remoting.common.data.common.ObjectData;
import org.apache.isis.runtimes.dflt.remoting.common.data.common.ReferenceData;
-import org.apache.isis.core.metamodel.adapter.oid.Oid;
-import org.apache.isis.core.metamodel.adapter.version.Version;
-
-
-/**
- * Create serializable objects that are used to carry messages across the network. This assumes that the Oid
- * and Version implementations are also serializable.
- */
-public interface DataFactory {
-
- CollectionData createCollectionData(
- String collectionType,
- String elementType,
- Oid oid,
- ReferenceData[] elements,
- boolean hasAllElements,
- Version version);
-
- NullData createNullData(String type);
-
- ObjectData createObjectData(String type, Oid oid, boolean hasCompleteData, Version version);
-
- IdentityData createIdentityData(String type, Oid oid, Version version);
-
- EncodableObjectData createValueData(String fullName, String encodedValue);
-
-
-}
+
+/**
+ * Create serializable objects that are used to carry messages across the network. This assumes that the Oid and Version
+ * implementations are also serializable.
+ */
+public interface DataFactory {
+
+ CollectionData createCollectionData(String collectionType, String elementType, Oid oid, ReferenceData[] elements,
+ boolean hasAllElements, Version version);
+
+ NullData createNullData(String type);
+
+ ObjectData createObjectData(String type, Oid oid, boolean hasCompleteData, Version version);
+
+ IdentityData createIdentityData(String type, Oid oid, Version version);
+
+ EncodableObjectData createValueData(String fullName, String encodedValue);
+
+}
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/DataFactoryDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/DataFactoryDefault.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/DataFactoryDefault.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/DataFactoryDefault.java Tue May 3 06:33:43 2011
@@ -17,9 +17,10 @@
* under the License.
*/
-
package org.apache.isis.runtimes.dflt.remoting.common.data;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.version.Version;
import org.apache.isis.runtimes.dflt.remoting.common.data.common.CollectionData;
import org.apache.isis.runtimes.dflt.remoting.common.data.common.CollectionDataImpl;
import org.apache.isis.runtimes.dflt.remoting.common.data.common.EncodableObjectData;
@@ -31,36 +32,34 @@ import org.apache.isis.runtimes.dflt.rem
import org.apache.isis.runtimes.dflt.remoting.common.data.common.ObjectData;
import org.apache.isis.runtimes.dflt.remoting.common.data.common.ObjectDataImpl;
import org.apache.isis.runtimes.dflt.remoting.common.data.common.ReferenceData;
-import org.apache.isis.core.metamodel.adapter.oid.Oid;
-import org.apache.isis.core.metamodel.adapter.version.Version;
public class DataFactoryDefault implements DataFactory {
+ @Override
public NullData createNullData(final String type) {
return new NullDataImpl(type);
}
+ @Override
public IdentityData createIdentityData(final String type, final Oid oid, final Version version) {
- return new IdentityDataImpl(type, oid, version);
+ return new IdentityDataImpl(type, oid, version);
}
-
+
+ @Override
public EncodableObjectData createValueData(final String type, final String encodedValue) {
- return new EncodableObjectDataImpl(type, encodedValue);
+ return new EncodableObjectDataImpl(type, encodedValue);
}
-
- public ObjectData createObjectData(final String type, final Oid oid, final boolean hasCompleteData, final Version version) {
+
+ @Override
+ public ObjectData createObjectData(final String type, final Oid oid, final boolean hasCompleteData,
+ final Version version) {
return new ObjectDataImpl(oid, type, hasCompleteData, version);
}
- public CollectionData createCollectionData(
- final String collectionType,
- final String elementType,
- final Oid oid,
- final ReferenceData[] elements,
- final boolean hasAllElements,
- final Version version) {
- return new CollectionDataImpl(oid, collectionType, elementType, elements, hasAllElements, version);
+ @Override
+ public CollectionData createCollectionData(final String collectionType, final String elementType, final Oid oid,
+ final ReferenceData[] elements, final boolean hasAllElements, final Version version) {
+ return new CollectionDataImpl(oid, collectionType, elementType, elements, hasAllElements, version);
}
-
}
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/CollectionData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/CollectionData.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/CollectionData.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/CollectionData.java Tue May 3 06:33:43 2011
@@ -17,13 +17,12 @@
* under the License.
*/
+package org.apache.isis.runtimes.dflt.remoting.common.data.common;
-package org.apache.isis.runtimes.dflt.remoting.common.data.common;
-
-public interface CollectionData extends ReferenceData {
- ReferenceData[] getElements();
-
- boolean hasAllElements();
-
- String getElementype();
-}
+public interface CollectionData extends ReferenceData {
+ ReferenceData[] getElements();
+
+ boolean hasAllElements();
+
+ String getElementype();
+}
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/CollectionDataImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/CollectionDataImpl.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/CollectionDataImpl.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/CollectionDataImpl.java Tue May 3 06:33:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.runtimes.dflt.remoting.common.data.common;
import java.io.IOException;
@@ -40,13 +39,8 @@ public class CollectionDataImpl implemen
private final boolean hasAllElements;
private final String elementType;
- public CollectionDataImpl(
- final Oid oid,
- final String collectionType,
- final String elementType,
- final ReferenceData[] elements,
- final boolean hasAllElements,
- final Version version) {
+ public CollectionDataImpl(final Oid oid, final String collectionType, final String elementType,
+ final ReferenceData[] elements, final boolean hasAllElements, final Version version) {
this.collectionType = collectionType;
this.elementType = elementType;
this.oid = oid;
@@ -66,6 +60,7 @@ public class CollectionDataImpl implemen
initialized();
}
+ @Override
public void encode(final DataOutputExtended output) throws IOException {
output.writeUTF(collectionType);
output.writeUTF(elementType);
@@ -76,33 +71,39 @@ public class CollectionDataImpl implemen
}
private void initialized() {
- // nothing to do
+ // nothing to do
}
- /////////////////////////////////////////////////////////
+ // ///////////////////////////////////////////////////////
//
- /////////////////////////////////////////////////////////
+ // ///////////////////////////////////////////////////////
+ @Override
public ReferenceData[] getElements() {
return elements;
}
+ @Override
public String getElementype() {
return elementType;
}
+ @Override
public Oid getOid() {
return oid;
}
+ @Override
public String getType() {
return collectionType;
}
+ @Override
public Version getVersion() {
return version;
}
+ @Override
public boolean hasAllElements() {
return hasAllElements;
}
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/EncodableObjectData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/EncodableObjectData.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/EncodableObjectData.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/EncodableObjectData.java Tue May 3 06:33:43 2011
@@ -17,22 +17,19 @@
* under the License.
*/
-
package org.apache.isis.runtimes.dflt.remoting.common.data.common;
-import org.apache.isis.runtimes.dflt.remoting.common.data.Data;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
-
+import org.apache.isis.runtimes.dflt.remoting.common.data.Data;
/**
- * The data transfer object that contains the data for an encodeable object (ie one that has an
- * {@link EncodableFacet}) in a form that can be passed over the network between a client and a server.
+ * The data transfer object that contains the data for an encodeable object (ie one that has an {@link EncodableFacet})
+ * in a form that can be passed over the network between a client and a server.
*/
public interface EncodableObjectData extends Data {
/**
- * Ultimately derived from
- * {@link EncodableFacet#toEncodedString(org.apache.isis.noa.adapter.ObjectAdapter)}.
+ * Ultimately derived from {@link EncodableFacet#toEncodedString(org.apache.isis.noa.adapter.ObjectAdapter)}.
*/
String getEncodedObjectData();
}
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/EncodableObjectDataImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/EncodableObjectDataImpl.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/EncodableObjectDataImpl.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/EncodableObjectDataImpl.java Tue May 3 06:33:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.runtimes.dflt.remoting.common.data.common;
import java.io.IOException;
@@ -29,7 +28,7 @@ import org.apache.isis.core.commons.enco
import org.apache.isis.core.commons.lang.ToString;
public class EncodableObjectDataImpl implements EncodableObjectData, Encodable, Serializable {
-
+
private static final long serialVersionUID = 1L;
private final String type;
private final String objectAsString;
@@ -46,24 +45,26 @@ public class EncodableObjectDataImpl imp
initialized();
}
+ @Override
public void encode(final DataOutputExtended output) throws IOException {
output.writeUTF(type);
output.writeUTF(objectAsString);
}
- private void initialized() {
- // nothing to do
- }
+ private void initialized() {
+ // nothing to do
+ }
- /////////////////////////////////////////////////////////
+ // ///////////////////////////////////////////////////////
//
- /////////////////////////////////////////////////////////
-
+ // ///////////////////////////////////////////////////////
+ @Override
public String getEncodedObjectData() {
return objectAsString;
}
+ @Override
public String getType() {
return type.equals("s") ? String.class.getName() : type;
}
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/IdentityData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/IdentityData.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/IdentityData.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/IdentityData.java Tue May 3 06:33:43 2011
@@ -17,7 +17,7 @@
* under the License.
*/
+package org.apache.isis.runtimes.dflt.remoting.common.data.common;
-package org.apache.isis.runtimes.dflt.remoting.common.data.common;
-
-public interface IdentityData extends ReferenceData {}
+public interface IdentityData extends ReferenceData {
+}
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/IdentityDataImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/IdentityDataImpl.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/IdentityDataImpl.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/IdentityDataImpl.java Tue May 3 06:33:43 2011
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.runtimes.dflt.remoting.common.data.common;
-package org.apache.isis.runtimes.dflt.remoting.common.data.common;
-
import java.io.IOException;
import org.apache.isis.core.commons.encoding.DataInputExtended;
@@ -28,61 +27,64 @@ import org.apache.isis.core.commons.enco
import org.apache.isis.core.commons.lang.ToString;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.version.Version;
-
-public class IdentityDataImpl implements IdentityData, Encodable {
-
- private static final long serialVersionUID = 1L;
- private final Oid oid;
- private final String type;
- private final Version version;
-
- public IdentityDataImpl(final String type, final Oid oid, final Version version) {
- this.type = type;
- this.oid = oid;
- this.version = version;
- initialized();
- }
-
- public IdentityDataImpl(final DataInputExtended input) throws IOException {
- this.type = input.readUTF();
- this.oid = input.readEncodable(Oid.class);
- this.version = input.readEncodable(Version.class);
- initialized();
- }
-
- public void encode(final DataOutputExtended output) throws IOException {
- output.writeUTF(type);
- output.writeEncodable(oid);
- output.writeEncodable(version);
- }
-
- private void initialized() {
- // nothing to do
- }
-
- /////////////////////////////////////////////////////////
- //
- /////////////////////////////////////////////////////////
-
-
- public Oid getOid() {
- return oid;
- }
-
- public String getType() {
- return type;
- }
-
- public Version getVersion() {
- return version;
- }
-
- @Override
- public String toString() {
- final ToString str = new ToString(this);
- str.append("type", type);
- str.append("oid", oid);
- str.append("version", version);
- return str.toString();
- }
-}
+
+public class IdentityDataImpl implements IdentityData, Encodable {
+
+ private static final long serialVersionUID = 1L;
+ private final Oid oid;
+ private final String type;
+ private final Version version;
+
+ public IdentityDataImpl(final String type, final Oid oid, final Version version) {
+ this.type = type;
+ this.oid = oid;
+ this.version = version;
+ initialized();
+ }
+
+ public IdentityDataImpl(final DataInputExtended input) throws IOException {
+ this.type = input.readUTF();
+ this.oid = input.readEncodable(Oid.class);
+ this.version = input.readEncodable(Version.class);
+ initialized();
+ }
+
+ @Override
+ public void encode(final DataOutputExtended output) throws IOException {
+ output.writeUTF(type);
+ output.writeEncodable(oid);
+ output.writeEncodable(version);
+ }
+
+ private void initialized() {
+ // nothing to do
+ }
+
+ // ///////////////////////////////////////////////////////
+ //
+ // ///////////////////////////////////////////////////////
+
+ @Override
+ public Oid getOid() {
+ return oid;
+ }
+
+ @Override
+ public String getType() {
+ return type;
+ }
+
+ @Override
+ public Version getVersion() {
+ return version;
+ }
+
+ @Override
+ public String toString() {
+ final ToString str = new ToString(this);
+ str.append("type", type);
+ str.append("oid", oid);
+ str.append("version", version);
+ return str.toString();
+ }
+}
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/NullData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/NullData.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/NullData.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/NullData.java Tue May 3 06:33:43 2011
@@ -17,12 +17,10 @@
* under the License.
*/
+package org.apache.isis.runtimes.dflt.remoting.common.data.common;
-package org.apache.isis.runtimes.dflt.remoting.common.data.common;
-
import org.apache.isis.runtimes.dflt.remoting.common.data.Data;
-
-
-public interface NullData extends Data {
-
-}
+
+public interface NullData extends Data {
+
+}
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/NullDataImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/NullDataImpl.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/NullDataImpl.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/NullDataImpl.java Tue May 3 06:33:43 2011
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.runtimes.dflt.remoting.common.data.common;
-package org.apache.isis.runtimes.dflt.remoting.common.data.common;
-
import java.io.IOException;
import java.io.Serializable;
@@ -27,43 +26,44 @@ import org.apache.isis.core.commons.enco
import org.apache.isis.core.commons.encoding.DataOutputExtended;
import org.apache.isis.core.commons.encoding.Encodable;
import org.apache.isis.core.commons.lang.ToString;
-
-public class NullDataImpl implements NullData, Encodable, Serializable {
-
- private static final long serialVersionUID = 1L;
- private final String type;
-
- public NullDataImpl(final String type) {
- this.type = type;
- initialized();
- }
-
- public NullDataImpl(final DataInputExtended input) throws IOException {
- this.type = input.readUTF();
- initialized();
- }
-
- public void encode(final DataOutputExtended output) throws IOException {
- output.writeUTF(type);
- }
-
- private void initialized() {
- // nothing to do
- }
-
- /////////////////////////////////////////////////////////
- //
- /////////////////////////////////////////////////////////
-
-
- public String getType() {
- return type;
- }
-
- @Override
- public String toString() {
- final ToString str = new ToString(this);
- str.append("type", type);
- return str.toString();
- }
-}
+
+public class NullDataImpl implements NullData, Encodable, Serializable {
+
+ private static final long serialVersionUID = 1L;
+ private final String type;
+
+ public NullDataImpl(final String type) {
+ this.type = type;
+ initialized();
+ }
+
+ public NullDataImpl(final DataInputExtended input) throws IOException {
+ this.type = input.readUTF();
+ initialized();
+ }
+
+ @Override
+ public void encode(final DataOutputExtended output) throws IOException {
+ output.writeUTF(type);
+ }
+
+ private void initialized() {
+ // nothing to do
+ }
+
+ // ///////////////////////////////////////////////////////
+ //
+ // ///////////////////////////////////////////////////////
+
+ @Override
+ public String getType() {
+ return type;
+ }
+
+ @Override
+ public String toString() {
+ final ToString str = new ToString(this);
+ str.append("type", type);
+ return str.toString();
+ }
+}
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/ObjectData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/ObjectData.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/ObjectData.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/ObjectData.java Tue May 3 06:33:43 2011
@@ -17,15 +17,13 @@
* under the License.
*/
-
package org.apache.isis.runtimes.dflt.remoting.common.data.common;
import org.apache.isis.runtimes.dflt.remoting.common.data.Data;
-
/**
- * ObjectData is data transfer object that contains all the data for an object in a form that can be passed
- * over the network between a client and a server.
+ * ObjectData is data transfer object that contains all the data for an object in a form that can be passed over the
+ * network between a client and a server.
*/
public interface ObjectData extends ReferenceData {
Data[] getFieldContent();
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/ObjectDataImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/ObjectDataImpl.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/ObjectDataImpl.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/ObjectDataImpl.java Tue May 3 06:33:43 2011
@@ -17,21 +17,20 @@
* under the License.
*/
-
package org.apache.isis.runtimes.dflt.remoting.common.data.common;
import java.io.IOException;
-import org.apache.isis.runtimes.dflt.remoting.common.data.Data;
import org.apache.isis.core.commons.encoding.DataInputExtended;
import org.apache.isis.core.commons.encoding.DataOutputExtended;
import org.apache.isis.core.commons.encoding.Encodable;
import org.apache.isis.core.commons.lang.ToString;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.version.Version;
+import org.apache.isis.runtimes.dflt.remoting.common.data.Data;
public class ObjectDataImpl implements ObjectData, Encodable {
-
+
private static final long serialVersionUID = 1L;
private final Oid oid;
private final boolean isResolved;
@@ -39,8 +38,7 @@ public class ObjectDataImpl implements O
private final Version version;
private Data fieldContent[];
- public ObjectDataImpl(
- final Oid oid, final String type, final boolean resolved, final Version version) {
+ public ObjectDataImpl(final Oid oid, final String type, final boolean resolved, final Version version) {
this.type = type;
this.oid = oid;
this.version = version;
@@ -58,6 +56,7 @@ public class ObjectDataImpl implements O
initialized();
}
+ @Override
public void encode(final DataOutputExtended output) throws IOException {
output.writeUTF(type);
output.writeEncodable(oid);
@@ -66,35 +65,40 @@ public class ObjectDataImpl implements O
output.writeEncodables(fieldContent);
}
- private void initialized() {
- // nothing to do
- }
+ private void initialized() {
+ // nothing to do
+ }
- /////////////////////////////////////////////////////////
+ // ///////////////////////////////////////////////////////
//
- /////////////////////////////////////////////////////////
-
+ // ///////////////////////////////////////////////////////
+ @Override
public Data[] getFieldContent() {
return fieldContent;
}
+ @Override
public Oid getOid() {
return oid;
}
+ @Override
public String getType() {
return type;
}
+ @Override
public Version getVersion() {
return version;
}
+ @Override
public boolean hasCompleteData() {
return isResolved;
}
+ @Override
public void setFieldContent(final Data[] fieldContent) {
this.fieldContent = fieldContent;
}
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/ReferenceData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/ReferenceData.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/ReferenceData.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/common/ReferenceData.java Tue May 3 06:33:43 2011
@@ -17,18 +17,16 @@
* under the License.
*/
+package org.apache.isis.runtimes.dflt.remoting.common.data.common;
-package org.apache.isis.runtimes.dflt.remoting.common.data.common;
-
import java.io.Serializable;
-import org.apache.isis.runtimes.dflt.remoting.common.data.Data;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.version.Version;
-
-
-public interface ReferenceData extends Data, Serializable {
- Oid getOid();
-
- Version getVersion();
-}
+import org.apache.isis.runtimes.dflt.remoting.common.data.Data;
+
+public interface ReferenceData extends Data, Serializable {
+ Oid getOid();
+
+ Version getVersion();
+}
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/query/PersistenceQueryData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/query/PersistenceQueryData.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/query/PersistenceQueryData.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/query/PersistenceQueryData.java Tue May 3 06:33:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.runtimes.dflt.remoting.common.data.query;
import org.apache.isis.runtimes.dflt.remoting.common.data.Data;
@@ -27,6 +26,5 @@ import org.apache.isis.runtimes.dflt.run
* Serializable representation of {@link PersistenceQuery}.
*/
public interface PersistenceQueryData extends Data {
- Class<?> getPersistenceQueryClass();
+ Class<?> getPersistenceQueryClass();
}
-
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/query/PersistenceQueryDataAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/query/PersistenceQueryDataAbstract.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/query/PersistenceQueryDataAbstract.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/query/PersistenceQueryDataAbstract.java Tue May 3 06:33:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.runtimes.dflt.remoting.common.data.query;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -26,12 +25,12 @@ public abstract class PersistenceQueryDa
private static final long serialVersionUID = 1L;
private final String specification;
- public PersistenceQueryDataAbstract(ObjectSpecification noSpec) {
+ public PersistenceQueryDataAbstract(final ObjectSpecification noSpec) {
specification = noSpec.getFullIdentifier();
}
+ @Override
public String getType() {
return specification;
}
}
-
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/query/PersistenceQueryFindAllInstancesData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/query/PersistenceQueryFindAllInstancesData.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/query/PersistenceQueryFindAllInstancesData.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/query/PersistenceQueryFindAllInstancesData.java Tue May 3 06:33:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.runtimes.dflt.remoting.common.data.query;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -33,8 +32,8 @@ public class PersistenceQueryFindAllInst
super(objectSpecification);
}
+ @Override
public Class<?> getPersistenceQueryClass() {
return PersistenceQueryFindAllInstances.class;
}
}
-
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/query/PersistenceQueryFindByPatternData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/query/PersistenceQueryFindByPatternData.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/query/PersistenceQueryFindByPatternData.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/query/PersistenceQueryFindByPatternData.java Tue May 3 06:33:43 2011
@@ -17,23 +17,21 @@
* under the License.
*/
-
package org.apache.isis.runtimes.dflt.remoting.common.data.query;
-import org.apache.isis.runtimes.dflt.remoting.common.data.common.ObjectData;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.runtimes.dflt.remoting.common.data.common.ObjectData;
import org.apache.isis.runtimes.dflt.runtime.persistence.query.PersistenceQueryFindByPattern;
/**
* Serializable representation of {@link PersistenceQueryFindByPattern}.
*/
public class PersistenceQueryFindByPatternData extends PersistenceQueryDataAbstract {
-
+
private static final long serialVersionUID = 1L;
private final ObjectData patternData;
- public PersistenceQueryFindByPatternData(
- final ObjectSpecification noSpec, final ObjectData patternData) {
+ public PersistenceQueryFindByPatternData(final ObjectSpecification noSpec, final ObjectData patternData) {
super(noSpec);
this.patternData = patternData;
}
@@ -42,8 +40,8 @@ public class PersistenceQueryFindByPatte
return patternData;
}
+ @Override
public Class<?> getPersistenceQueryClass() {
return PersistenceQueryFindByPattern.class;
}
}
-
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/query/PersistenceQueryFindByTitleData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/query/PersistenceQueryFindByTitleData.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/query/PersistenceQueryFindByTitleData.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/query/PersistenceQueryFindByTitleData.java Tue May 3 06:33:43 2011
@@ -17,21 +17,18 @@
* under the License.
*/
-
package org.apache.isis.runtimes.dflt.remoting.common.data.query;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.runtimes.dflt.runtime.persistence.query.PersistenceQueryFindByTitle;
public class PersistenceQueryFindByTitleData extends PersistenceQueryDataAbstract {
-
+
private static final long serialVersionUID = 1L;
-
+
private final String title;
- public PersistenceQueryFindByTitleData(
- final ObjectSpecification noSpec,
- final String title) {
+ public PersistenceQueryFindByTitleData(final ObjectSpecification noSpec, final String title) {
super(noSpec);
this.title = title;
}
@@ -40,8 +37,8 @@ public class PersistenceQueryFindByTitle
return title;
}
+ @Override
public Class<?> getPersistenceQueryClass() {
return PersistenceQueryFindByTitle.class;
}
}
-
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/query/PersistenceQueryFindUsingApplibQueryDefaultData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/query/PersistenceQueryFindUsingApplibQueryDefaultData.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/query/PersistenceQueryFindUsingApplibQueryDefaultData.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/data/query/PersistenceQueryFindUsingApplibQueryDefaultData.java Tue May 3 06:33:43 2011
@@ -17,52 +17,48 @@
* under the License.
*/
-
package org.apache.isis.runtimes.dflt.remoting.common.data.query;
import java.util.Map;
-import org.apache.isis.runtimes.dflt.remoting.common.data.common.ObjectData;
import org.apache.isis.core.metamodel.services.container.query.QueryCardinality;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.runtimes.dflt.remoting.common.data.common.ObjectData;
import org.apache.isis.runtimes.dflt.runtime.persistence.query.PersistenceQueryFindUsingApplibQueryDefault;
/**
* Serializable representation of {@link PersistenceQueryFindUsingApplibQueryDefault}.
*/
public class PersistenceQueryFindUsingApplibQueryDefaultData extends PersistenceQueryDataAbstract {
-
+
private static final long serialVersionUID = 1L;
private final Map<String, ObjectData> argumentDatasByParameterName;
- private final QueryCardinality cardinality;
- private final String queryName;
-
- public PersistenceQueryFindUsingApplibQueryDefaultData(
- final ObjectSpecification noSpec,
- final String queryName,
- final Map<String, ObjectData> argumentDatasByParameterName,
- final QueryCardinality cardinality) {
+ private final QueryCardinality cardinality;
+ private final String queryName;
+
+ public PersistenceQueryFindUsingApplibQueryDefaultData(final ObjectSpecification noSpec, final String queryName,
+ final Map<String, ObjectData> argumentDatasByParameterName, final QueryCardinality cardinality) {
super(noSpec);
this.queryName = queryName;
this.argumentDatasByParameterName = argumentDatasByParameterName;
this.cardinality = cardinality;
}
- public String getQueryName() {
- return queryName;
- }
-
- public Map<String, ObjectData> getArgumentDatasByParameterName() {
- return argumentDatasByParameterName;
- }
-
- public QueryCardinality getCardinality() {
- return cardinality;
- }
-
- public Class<?> getPersistenceQueryClass() {
- return PersistenceQueryFindUsingApplibQueryDefault.class;
- }
-
-}
+ public String getQueryName() {
+ return queryName;
+ }
+ public Map<String, ObjectData> getArgumentDatasByParameterName() {
+ return argumentDatasByParameterName;
+ }
+
+ public QueryCardinality getCardinality() {
+ return cardinality;
+ }
+
+ @Override
+ public Class<?> getPersistenceQueryClass() {
+ return PersistenceQueryFindUsingApplibQueryDefault.class;
+ }
+
+}