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 [7/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/protocol/internal/ObjectEncoderDecoderDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/protocol/internal/ObjectEncoderDecoderDefault.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/protocol/internal/ObjectEncoderDecoderDefault.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/protocol/internal/ObjectEncoderDecoderDefault.java Tue May 3 06:33:43 2011
@@ -23,6 +23,18 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.commons.ensure.Assert;
+import org.apache.isis.core.commons.exceptions.UnknownTypeException;
+import org.apache.isis.core.commons.factory.InstanceUtil;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.version.Version;
+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.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.runtimes.dflt.remoting.common.IsisRemoteException;
import org.apache.isis.runtimes.dflt.remoting.common.client.facets.ActionInvocationFacetWrapProxy;
import org.apache.isis.runtimes.dflt.remoting.common.client.facets.PropertySetterFacetWrapProxy;
@@ -56,18 +68,6 @@ import org.apache.isis.runtimes.dflt.rem
import org.apache.isis.runtimes.dflt.remoting.common.protocol.ObjectEncoderDecoder;
import org.apache.isis.runtimes.dflt.remoting.common.protocol.PersistenceQueryEncoder;
import org.apache.isis.runtimes.dflt.remoting.common.protocol.ProtocolConstants;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.ensure.Assert;
-import org.apache.isis.core.commons.exceptions.UnknownTypeException;
-import org.apache.isis.core.commons.factory.InstanceUtil;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.ResolveState;
-import org.apache.isis.core.metamodel.adapter.oid.Oid;
-import org.apache.isis.core.metamodel.adapter.version.Version;
-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.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.runtimes.dflt.runtime.persistence.PersistorUtil;
import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceQuery;
@@ -106,19 +106,18 @@ public class ObjectEncoderDecoderDefault
*/
public static ObjectEncoderDecoderDefault create(final IsisConfiguration configuration) {
- ObjectEncoderDecoderDefault encoderDecoder = new ObjectEncoderDecoderDefault();
+ final ObjectEncoderDecoderDefault encoderDecoder = new ObjectEncoderDecoderDefault();
addPersistenceEncoders(configuration, encoderDecoder, ProtocolConstants.ENCODER_CLASS_NAME_LIST);
- addPersistenceEncoders(configuration, encoderDecoder,
- ProtocolConstants.ENCODER_CLASS_NAME_LIST_DEPRECATED);
+ addPersistenceEncoders(configuration, encoderDecoder, ProtocolConstants.ENCODER_CLASS_NAME_LIST_DEPRECATED);
return encoderDecoder;
}
private static void addPersistenceEncoders(final IsisConfiguration configuration,
- final ObjectEncoderDecoderDefault encoder, String encoderClassNameList) {
- String[] encoders = configuration.getList(encoderClassNameList);
- for (int i = 0; i < encoders.length; i++) {
+ final ObjectEncoderDecoderDefault encoder, final String encoderClassNameList) {
+ final String[] encoders = configuration.getList(encoderClassNameList);
+ for (final String encoder2 : encoders) {
final PersistenceQueryEncoder encoding =
- InstanceUtil.createInstance(encoders[i], PersistenceQueryEncoder.class);
+ InstanceUtil.createInstance(encoder2, PersistenceQueryEncoder.class);
encoder.addPersistenceQueryEncoder(encoding);
}
}
@@ -270,11 +269,11 @@ public class ObjectEncoderDecoderDefault
@Override
public void decode(final ObjectData[] dataArray) {
- for (int i = 0; i < dataArray.length; i++) {
+ for (final ObjectData element : dataArray) {
if (LOG.isDebugEnabled()) {
- LOG.debug("update " + dataArray[i].getOid());
+ LOG.debug("update " + element.getOid());
}
- this.decode(dataArray[i]);
+ this.decode(element);
}
}
@@ -318,7 +317,7 @@ public class ObjectEncoderDecoderDefault
// /////////////////////////////////////////////////////////
@Override
- public AuthorizationResponse encodeAuthorizeResponse(boolean authorized) {
+ public AuthorizationResponse encodeAuthorizeResponse(final boolean authorized) {
return new AuthorizationResponse(authorized);
}
@@ -357,12 +356,12 @@ public class ObjectEncoderDecoderDefault
* Called server-side only:
* <ul>
* <li>by {@link ServerFacadeImpl#getObject(GetObjectRequest)}
- * <li>by {@link ServerFacadeImpl#clearAssociation(ClearAssociationRequest) <li><li> by
- * {@link ServerFacadeImpl#clearValue(ClearValueRequest) <li><li> by
- * {@link ServerFacadeImpl#executeClientAction(ExecuteClientActionRequest) <li><li> by
- * {@link ServerFacadeImpl#executeServerAction(ExecuteServerActionRequest) <li><li> by
- * {@link ServerFacadeImpl#setAssociation(SetAssociationRequest) <li><li> by
- * {@link ServerFacadeImpl#setValue(SetValueRequest) </ul>
+ * <li>by {@link ServerFacadeImpl#clearAssociation(ClearAssociationRequest) <li><li> by<li> {
+ * @link ServerFacadeImpl#clearValue(ClearValueRequest) <li><li> by<li> {
+ * @link ServerFacadeImpl#executeClientAction(ExecuteClientActionRequest) <li><li> by<li> {
+ * @link ServerFacadeImpl#executeServerAction(ExecuteServerActionRequest) <li><li> by<li> {
+ * @link ServerFacadeImpl#setAssociation(SetAssociationRequest) <li><li> by<li> {
+ * @link ServerFacadeImpl#setValue(SetValueRequest) </ul>
*/
@Override
public ObjectData encodeForUpdate(final ObjectAdapter object) {
@@ -540,11 +539,11 @@ public class ObjectEncoderDecoderDefault
}
}
- private ObjectData encode(final ObjectAdapter adapter, int depth) {
+ private ObjectData encode(final ObjectAdapter adapter, final int depth) {
return (ObjectData) encode(adapter, depth, new KnownObjectsRequest());
}
- private ReferenceData encode(final ObjectAdapter adapter, int depth, final KnownObjectsRequest knownObjects) {
+ private ReferenceData encode(final ObjectAdapter adapter, final int depth, final KnownObjectsRequest knownObjects) {
return serializer.serializeAdapter(adapter, depth, knownObjects);
}
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/protocol/internal/ObjectSerializer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/protocol/internal/ObjectSerializer.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/protocol/internal/ObjectSerializer.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/protocol/internal/ObjectSerializer.java Tue May 3 06:33:43 2011
@@ -21,13 +21,6 @@ package org.apache.isis.runtimes.dflt.re
import java.util.Enumeration;
-import org.apache.isis.runtimes.dflt.remoting.common.data.Data;
-import org.apache.isis.runtimes.dflt.remoting.common.data.DataFactory;
-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.ObjectData;
-import org.apache.isis.runtimes.dflt.remoting.common.data.common.ReferenceData;
-import org.apache.isis.runtimes.dflt.remoting.common.exchange.KnownObjectsRequest;
import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.exceptions.UnknownTypeException;
@@ -39,6 +32,13 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
import org.apache.isis.core.metamodel.facets.typeof.TypeOfFacet;
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.DataFactory;
+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.ObjectData;
+import org.apache.isis.runtimes.dflt.remoting.common.data.common.ReferenceData;
+import org.apache.isis.runtimes.dflt.remoting.common.exchange.KnownObjectsRequest;
import org.apache.isis.runtimes.dflt.runtime.persistence.PersistorUtil;
/**
@@ -74,18 +74,19 @@ public final class ObjectSerializer {
Assert.assertNotNull(adapter);
final ResolveState resolveState = adapter.getResolveState();
- boolean isTransient = adapter.isTransient();
+ final boolean isTransient = adapter.isTransient();
if (!isTransient && (resolveState.isSerializing() || resolveState.isGhost() || graphDepth <= 0)) {
Assert.assertNotNull("OID needed for reference", adapter, adapter.getOid());
- return this.dataFactory.createIdentityData(adapter.getSpecification().getFullIdentifier(), adapter.getOid(),
- adapter.getVersion());
+ return this.dataFactory.createIdentityData(adapter.getSpecification().getFullIdentifier(),
+ adapter.getOid(), adapter.getVersion());
}
if (isTransient && knownObjects.containsKey(adapter)) {
return knownObjects.get(adapter);
}
- boolean withCompleteData = resolveState == ResolveState.TRANSIENT || resolveState == ResolveState.RESOLVED;
+ final boolean withCompleteData =
+ resolveState == ResolveState.TRANSIENT || resolveState == ResolveState.RESOLVED;
final String type = adapter.getSpecification().getFullIdentifier();
final Oid oid = adapter.getOid();
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/protocol/internal/PersistenceQueryEncoderAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/protocol/internal/PersistenceQueryEncoderAbstract.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/protocol/internal/PersistenceQueryEncoderAbstract.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/protocol/internal/PersistenceQueryEncoderAbstract.java Tue May 3 06:33:43 2011
@@ -17,18 +17,17 @@
* under the License.
*/
-
package org.apache.isis.runtimes.dflt.remoting.protocol.internal;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.runtimes.dflt.remoting.common.data.Data;
import org.apache.isis.runtimes.dflt.remoting.common.data.common.ObjectData;
import org.apache.isis.runtimes.dflt.remoting.common.data.query.PersistenceQueryData;
import org.apache.isis.runtimes.dflt.remoting.common.exchange.KnownObjectsRequest;
import org.apache.isis.runtimes.dflt.remoting.common.protocol.ObjectEncoderDecoder;
import org.apache.isis.runtimes.dflt.remoting.common.protocol.PersistenceQueryEncoder;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceQuery;
@@ -36,68 +35,60 @@ public abstract class PersistenceQueryEn
private ObjectEncoderDecoder objectEncoder;
- public PersistenceQuery decode(
- final PersistenceQueryData persistenceQueryData) {
- String typeName = persistenceQueryData.getType();
- return doDecode(loadSpecification(typeName), persistenceQueryData);
+ @Override
+ public PersistenceQuery decode(final PersistenceQueryData persistenceQueryData) {
+ final String typeName = persistenceQueryData.getType();
+ return doDecode(loadSpecification(typeName), persistenceQueryData);
}
- protected abstract PersistenceQuery doDecode(
- ObjectSpecification specification,
- PersistenceQueryData persistenceQueryData);
+ protected abstract PersistenceQuery doDecode(ObjectSpecification specification,
+ PersistenceQueryData persistenceQueryData);
- private ObjectSpecification loadSpecification(String typeName) {
- return getSpecificationLoader().loadSpecification(
- typeName);
+ private ObjectSpecification loadSpecification(final String typeName) {
+ return getSpecificationLoader().loadSpecification(typeName);
}
-
-
/**
- * Convenience method for any implementations that need to map over
- * {@link ObjectAdapter}s.
+ * Convenience method for any implementations that need to map over {@link ObjectAdapter}s.
*
* @see #decodeObject(ObjectData)
*/
- protected ObjectData encodeObject(final ObjectAdapter adapter) {
- // REVIEW: this implementation is a bit of a hack...
- Data[] datas = getObjectEncoder().encodeActionParameters(
- new ObjectSpecification[] { adapter.getSpecification() },
- new ObjectAdapter[] { adapter },
- new KnownObjectsRequest());
- return (ObjectData) datas[0];
- }
-
- /**
- * Convenience method for any implementations that need to map over
- * {@link ObjectAdapter}s.
+ protected ObjectData encodeObject(final ObjectAdapter adapter) {
+ // REVIEW: this implementation is a bit of a hack...
+ final Data[] datas =
+ getObjectEncoder().encodeActionParameters(new ObjectSpecification[] { adapter.getSpecification() },
+ new ObjectAdapter[] { adapter }, new KnownObjectsRequest());
+ return (ObjectData) datas[0];
+ }
+
+ /**
+ * Convenience method for any implementations that need to map over {@link ObjectAdapter}s.
*
* @see #encodeObject(ObjectAdapter)
- */
- protected ObjectAdapter decodeObject(final ObjectData objectData) {
- return getObjectEncoder().decode(objectData);
- }
-
+ */
+ protected ObjectAdapter decodeObject(final ObjectData objectData) {
+ return getObjectEncoder().decode(objectData);
+ }
- /////////////////////////////////////////////////////////////////////
+ // ///////////////////////////////////////////////////////////////////
// Dependencies (injected)
- /////////////////////////////////////////////////////////////////////
+ // ///////////////////////////////////////////////////////////////////
protected ObjectEncoderDecoder getObjectEncoder() {
- return objectEncoder;
- }
- public void setObjectEncoder(ObjectEncoderDecoder objectEncoder) {
- this.objectEncoder = objectEncoder;
- }
-
- /////////////////////////////////////////////////////////////////////
+ return objectEncoder;
+ }
+
+ @Override
+ public void setObjectEncoder(final ObjectEncoderDecoder objectEncoder) {
+ this.objectEncoder = objectEncoder;
+ }
+
+ // ///////////////////////////////////////////////////////////////////
// Dependencies (from context)
- /////////////////////////////////////////////////////////////////////
-
- private static SpecificationLoader getSpecificationLoader() {
- return IsisContext.getSpecificationLoader();
- }
+ // ///////////////////////////////////////////////////////////////////
+ private static SpecificationLoader getSpecificationLoader() {
+ return IsisContext.getSpecificationLoader();
+ }
}
-
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/protocol/internal/PersistenceQueryFindAllInstancesEncoder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/protocol/internal/PersistenceQueryFindAllInstancesEncoder.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/protocol/internal/PersistenceQueryFindAllInstancesEncoder.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/protocol/internal/PersistenceQueryFindAllInstancesEncoder.java Tue May 3 06:33:43 2011
@@ -17,38 +17,34 @@
* under the License.
*/
-
package org.apache.isis.runtimes.dflt.remoting.protocol.internal;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.runtimes.dflt.remoting.common.data.query.PersistenceQueryData;
import org.apache.isis.runtimes.dflt.remoting.common.data.query.PersistenceQueryFindAllInstancesData;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.runtimes.dflt.runtime.persistence.query.PersistenceQueryFindAllInstances;
import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceQuery;
public class PersistenceQueryFindAllInstancesEncoder extends PersistenceQueryEncoderAbstract {
- public Class<?> getPersistenceQueryClass() {
+ @Override
+ public Class<?> getPersistenceQueryClass() {
return PersistenceQueryFindAllInstances.class;
}
- public PersistenceQueryData encode(
- final PersistenceQuery persistenceQuery) {
+ @Override
+ public PersistenceQueryData encode(final PersistenceQuery persistenceQuery) {
return new PersistenceQueryFindAllInstancesData(persistenceQuery.getSpecification());
}
@Override
- protected PersistenceQuery doDecode(
- final ObjectSpecification specification,
- final PersistenceQueryData persistenceQueryData) {
+ protected PersistenceQuery doDecode(final ObjectSpecification specification,
+ final PersistenceQueryData persistenceQueryData) {
return new PersistenceQueryFindAllInstances(specification);
}
- private PersistenceQueryFindAllInstances downcast(
- final PersistenceQuery persistenceQuery) {
- return (PersistenceQueryFindAllInstances) persistenceQuery;
- }
-
+ private PersistenceQueryFindAllInstances downcast(final PersistenceQuery persistenceQuery) {
+ return (PersistenceQueryFindAllInstances) persistenceQuery;
+ }
}
-
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/protocol/internal/PersistenceQueryFindByPatternEncoder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/protocol/internal/PersistenceQueryFindByPatternEncoder.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/protocol/internal/PersistenceQueryFindByPatternEncoder.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/protocol/internal/PersistenceQueryFindByPatternEncoder.java Tue May 3 06:33:43 2011
@@ -17,25 +17,25 @@
* under the License.
*/
-
package org.apache.isis.runtimes.dflt.remoting.protocol.internal;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+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.remoting.common.data.query.PersistenceQueryData;
import org.apache.isis.runtimes.dflt.remoting.common.data.query.PersistenceQueryFindByPatternData;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.runtimes.dflt.runtime.persistence.query.PersistenceQueryFindByPattern;
import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceQuery;
public class PersistenceQueryFindByPatternEncoder extends PersistenceQueryEncoderAbstract {
+ @Override
public Class<?> getPersistenceQueryClass() {
return PersistenceQueryFindByPattern.class;
}
-
- public PersistenceQueryData encode(
- final PersistenceQuery persistenceQuery) {
+
+ @Override
+ public PersistenceQueryData encode(final PersistenceQuery persistenceQuery) {
final PersistenceQueryFindByPattern patternPersistenceQuery = downcast(persistenceQuery);
final ObjectAdapter pattern = patternPersistenceQuery.getPattern();
final ObjectData objectData = encodeObject(pattern);
@@ -43,24 +43,19 @@ public class PersistenceQueryFindByPatte
}
@Override
- protected PersistenceQuery doDecode(
- final ObjectSpecification specification,
- final PersistenceQueryData persistenceQueryData) {
+ protected PersistenceQuery doDecode(final ObjectSpecification specification,
+ final PersistenceQueryData persistenceQueryData) {
final ObjectData patternData = downcast(persistenceQueryData).getPatternData();
final ObjectAdapter patternObject = decodeObject(patternData);
return new PersistenceQueryFindByPattern(specification, patternObject);
}
- private PersistenceQueryFindByPattern downcast(
- final PersistenceQuery persistenceQuery) {
- return (PersistenceQueryFindByPattern) persistenceQuery;
- }
-
- private PersistenceQueryFindByPatternData downcast(
- final PersistenceQueryData persistenceQueryData) {
- return (PersistenceQueryFindByPatternData)persistenceQueryData;
- }
+ private PersistenceQueryFindByPattern downcast(final PersistenceQuery persistenceQuery) {
+ return (PersistenceQueryFindByPattern) persistenceQuery;
+ }
+ private PersistenceQueryFindByPatternData downcast(final PersistenceQueryData persistenceQueryData) {
+ return (PersistenceQueryFindByPatternData) persistenceQueryData;
+ }
}
-
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/protocol/internal/PersistenceQueryFindByTitleEncoder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/protocol/internal/PersistenceQueryFindByTitleEncoder.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/protocol/internal/PersistenceQueryFindByTitleEncoder.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/protocol/internal/PersistenceQueryFindByTitleEncoder.java Tue May 3 06:33:43 2011
@@ -17,46 +17,40 @@
* under the License.
*/
-
package org.apache.isis.runtimes.dflt.remoting.protocol.internal;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.runtimes.dflt.remoting.common.data.query.PersistenceQueryData;
import org.apache.isis.runtimes.dflt.remoting.common.data.query.PersistenceQueryFindByTitleData;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.runtimes.dflt.runtime.persistence.query.PersistenceQueryFindByTitle;
import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceQuery;
public class PersistenceQueryFindByTitleEncoder extends PersistenceQueryEncoderAbstract {
+ @Override
public Class<?> getPersistenceQueryClass() {
return PersistenceQueryFindByTitle.class;
}
- public PersistenceQueryData encode(
- final PersistenceQuery persistenceQuery) {
- PersistenceQueryFindByTitle queryByTitle = downcast(persistenceQuery);
- return new PersistenceQueryFindByTitleData(
- persistenceQuery.getSpecification(),
- queryByTitle.getTitle());
+ @Override
+ public PersistenceQueryData encode(final PersistenceQuery persistenceQuery) {
+ final PersistenceQueryFindByTitle queryByTitle = downcast(persistenceQuery);
+ return new PersistenceQueryFindByTitleData(persistenceQuery.getSpecification(), queryByTitle.getTitle());
}
@Override
- protected PersistenceQuery doDecode(
- final ObjectSpecification specification,
- final PersistenceQueryData persistenceQueryData) {
+ protected PersistenceQuery doDecode(final ObjectSpecification specification,
+ final PersistenceQueryData persistenceQueryData) {
final String title = (downcast(persistenceQueryData)).getTitle();
return new PersistenceQueryFindByTitle(specification, title);
}
- private PersistenceQueryFindByTitle downcast(
- final PersistenceQuery persistenceQuery) {
- return (PersistenceQueryFindByTitle) persistenceQuery;
- }
-
- private PersistenceQueryFindByTitleData downcast(
- final PersistenceQueryData persistenceQueryData) {
- return (PersistenceQueryFindByTitleData) persistenceQueryData;
- }
+ private PersistenceQueryFindByTitle downcast(final PersistenceQuery persistenceQuery) {
+ return (PersistenceQueryFindByTitle) persistenceQuery;
+ }
-}
+ private PersistenceQueryFindByTitleData downcast(final PersistenceQueryData persistenceQueryData) {
+ return (PersistenceQueryFindByTitleData) persistenceQueryData;
+ }
+}
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/protocol/internal/PersistenceQueryFindUsingApplibQueryDefaultEncoder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/protocol/internal/PersistenceQueryFindUsingApplibQueryDefaultEncoder.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/protocol/internal/PersistenceQueryFindUsingApplibQueryDefaultEncoder.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/protocol/internal/PersistenceQueryFindUsingApplibQueryDefaultEncoder.java Tue May 3 06:33:43 2011
@@ -17,83 +17,69 @@
* under the License.
*/
-
package org.apache.isis.runtimes.dflt.remoting.protocol.internal;
import java.util.HashMap;
import java.util.Map;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+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.remoting.common.data.query.PersistenceQueryData;
import org.apache.isis.runtimes.dflt.remoting.common.data.query.PersistenceQueryFindUsingApplibQueryDefaultData;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.services.container.query.QueryCardinality;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.runtimes.dflt.runtime.persistence.query.PersistenceQueryFindByTitle;
import org.apache.isis.runtimes.dflt.runtime.persistence.query.PersistenceQueryFindUsingApplibQueryDefault;
import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceQuery;
public class PersistenceQueryFindUsingApplibQueryDefaultEncoder extends PersistenceQueryEncoderAbstract {
+ @Override
public Class<?> getPersistenceQueryClass() {
return PersistenceQueryFindByTitle.class;
}
- public PersistenceQueryData encode(
- final PersistenceQuery persistenceQuery) {
- PersistenceQueryFindUsingApplibQueryDefault findByQuery = downcast(persistenceQuery);
- return new PersistenceQueryFindUsingApplibQueryDefaultData(
- findByQuery.getSpecification(),
- findByQuery.getQueryName(),
- encode(findByQuery.getArgumentsAdaptersByParameterName()),
- findByQuery.getCardinality());
+ @Override
+ public PersistenceQueryData encode(final PersistenceQuery persistenceQuery) {
+ final PersistenceQueryFindUsingApplibQueryDefault findByQuery = downcast(persistenceQuery);
+ return new PersistenceQueryFindUsingApplibQueryDefaultData(findByQuery.getSpecification(),
+ findByQuery.getQueryName(), encode(findByQuery.getArgumentsAdaptersByParameterName()),
+ findByQuery.getCardinality());
}
@Override
- protected PersistenceQuery doDecode(
- final ObjectSpecification specification,
- final PersistenceQueryData persistenceQueryData) {
- PersistenceQueryFindUsingApplibQueryDefaultData findByQueryData = downcast(persistenceQueryData);
- return new PersistenceQueryFindUsingApplibQueryDefault(
- specification,
- findByQueryData.getQueryName(),
- decode(findByQueryData.getArgumentDatasByParameterName()),
- ((QueryCardinality) findByQueryData.getCardinality()));
+ protected PersistenceQuery doDecode(final ObjectSpecification specification,
+ final PersistenceQueryData persistenceQueryData) {
+ final PersistenceQueryFindUsingApplibQueryDefaultData findByQueryData = downcast(persistenceQueryData);
+ return new PersistenceQueryFindUsingApplibQueryDefault(specification, findByQueryData.getQueryName(),
+ decode(findByQueryData.getArgumentDatasByParameterName()), (findByQueryData.getCardinality()));
}
+ private Map<String, ObjectData> encode(final Map<String, ObjectAdapter> argumentsAdaptersByParameterName) {
+ final Map<String, ObjectData> argumentDatasByParameterName = new HashMap<String, ObjectData>();
+ for (final Map.Entry<String, ObjectAdapter> entry : argumentsAdaptersByParameterName.entrySet()) {
+ final String parameterName = entry.getKey();
+ final ObjectAdapter adapter = entry.getValue();
+ argumentDatasByParameterName.put(parameterName, encodeObject(adapter));
+ }
+ return argumentDatasByParameterName;
+ }
- private Map<String, ObjectData> encode(
- Map<String, ObjectAdapter> argumentsAdaptersByParameterName) {
- Map<String, ObjectData> argumentDatasByParameterName = new HashMap<String, ObjectData>();
- for(Map.Entry<String,ObjectAdapter> entry: argumentsAdaptersByParameterName.entrySet()) {
- String parameterName = entry.getKey();
- ObjectAdapter adapter = entry.getValue();
- argumentDatasByParameterName.put(parameterName, encodeObject(adapter));
- }
- return argumentDatasByParameterName;
- }
-
- private Map<String, ObjectAdapter> decode(
- Map<String, ObjectData> argumentDatasByParameterName) {
- Map<String, ObjectAdapter> argumentAdaptersByParameterName = new HashMap<String, ObjectAdapter>();
- for(Map.Entry<String, ObjectData> entry: argumentDatasByParameterName.entrySet()) {
- String parameterName = entry.getKey();
- ObjectData data = entry.getValue();
- argumentAdaptersByParameterName.put(parameterName, decodeObject(data));
- }
- return argumentAdaptersByParameterName;
- }
-
-
- private PersistenceQueryFindUsingApplibQueryDefault downcast(
- final PersistenceQuery persistenceQuery) {
- return (PersistenceQueryFindUsingApplibQueryDefault) persistenceQuery;
- }
-
- private PersistenceQueryFindUsingApplibQueryDefaultData downcast(
- final PersistenceQueryData persistenceQueryData) {
- return (PersistenceQueryFindUsingApplibQueryDefaultData) persistenceQueryData;
- }
+ private Map<String, ObjectAdapter> decode(final Map<String, ObjectData> argumentDatasByParameterName) {
+ final Map<String, ObjectAdapter> argumentAdaptersByParameterName = new HashMap<String, ObjectAdapter>();
+ for (final Map.Entry<String, ObjectData> entry : argumentDatasByParameterName.entrySet()) {
+ final String parameterName = entry.getKey();
+ final ObjectData data = entry.getValue();
+ argumentAdaptersByParameterName.put(parameterName, decodeObject(data));
+ }
+ return argumentAdaptersByParameterName;
+ }
-}
+ private PersistenceQueryFindUsingApplibQueryDefault downcast(final PersistenceQuery persistenceQuery) {
+ return (PersistenceQueryFindUsingApplibQueryDefault) persistenceQuery;
+ }
+ private PersistenceQueryFindUsingApplibQueryDefaultData downcast(final PersistenceQueryData persistenceQueryData) {
+ return (PersistenceQueryFindUsingApplibQueryDefaultData) persistenceQueryData;
+ }
+
+}
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/protocol/internal/PersistenceQueryFindUsingApplibQuerySerializableEncoder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/protocol/internal/PersistenceQueryFindUsingApplibQuerySerializableEncoder.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/protocol/internal/PersistenceQueryFindUsingApplibQuerySerializableEncoder.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/protocol/internal/PersistenceQueryFindUsingApplibQuerySerializableEncoder.java Tue May 3 06:33:43 2011
@@ -17,53 +17,47 @@
* under the License.
*/
-
package org.apache.isis.runtimes.dflt.remoting.protocol.internal;
-import org.apache.isis.runtimes.dflt.remoting.common.data.query.PersistenceQueryData;
-import org.apache.isis.runtimes.dflt.remoting.common.data.query.PersistenceQueryFindUsingApplibQuerySerializableData;
import org.apache.isis.applib.query.Query;
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.query.PersistenceQueryData;
+import org.apache.isis.runtimes.dflt.remoting.common.data.query.PersistenceQueryFindUsingApplibQuerySerializableData;
import org.apache.isis.runtimes.dflt.runtime.persistence.query.PersistenceQueryFindByTitle;
import org.apache.isis.runtimes.dflt.runtime.persistence.query.PersistenceQueryFindUsingApplibQuerySerializable;
import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceQuery;
public class PersistenceQueryFindUsingApplibQuerySerializableEncoder extends PersistenceQueryEncoderAbstract {
+ @Override
public Class<?> getPersistenceQueryClass() {
return PersistenceQueryFindByTitle.class;
}
-
- public PersistenceQueryData encode(
- final PersistenceQuery persistenceQuery) {
- PersistenceQueryFindUsingApplibQuerySerializable query =
- downcast(persistenceQuery);
- return new PersistenceQueryFindUsingApplibQuerySerializableData(
- query.getSpecification(),
- query.getApplibQuery(),
- query.getCardinality());
+
+ @Override
+ public PersistenceQueryData encode(final PersistenceQuery persistenceQuery) {
+ final PersistenceQueryFindUsingApplibQuerySerializable query = downcast(persistenceQuery);
+ return new PersistenceQueryFindUsingApplibQuerySerializableData(query.getSpecification(),
+ query.getApplibQuery(), query.getCardinality());
}
@Override
- protected PersistenceQuery doDecode(
- final ObjectSpecification specification,
- final PersistenceQueryData persistenceQueryData) {
- PersistenceQueryFindUsingApplibQuerySerializableData data = downcast(persistenceQueryData);
- final Query query = (Query) data.getApplibQuerySerializable();
- final QueryCardinality cardinality = (QueryCardinality) data.getCardinality();
+ protected PersistenceQuery doDecode(final ObjectSpecification specification,
+ final PersistenceQueryData persistenceQueryData) {
+ final PersistenceQueryFindUsingApplibQuerySerializableData data = downcast(persistenceQueryData);
+ final Query query = (Query) data.getApplibQuerySerializable();
+ final QueryCardinality cardinality = data.getCardinality();
return new PersistenceQueryFindUsingApplibQuerySerializable(specification, query, cardinality);
}
- private PersistenceQueryFindUsingApplibQuerySerializable downcast(
- final PersistenceQuery persistenceQuery) {
- return (PersistenceQueryFindUsingApplibQuerySerializable) persistenceQuery;
- }
-
- private PersistenceQueryFindUsingApplibQuerySerializableData downcast(
- final PersistenceQueryData persistenceQueryData) {
- return (PersistenceQueryFindUsingApplibQuerySerializableData) persistenceQueryData;
- }
+ private PersistenceQueryFindUsingApplibQuerySerializable downcast(final PersistenceQuery persistenceQuery) {
+ return (PersistenceQueryFindUsingApplibQuerySerializable) persistenceQuery;
+ }
+
+ private PersistenceQueryFindUsingApplibQuerySerializableData downcast(
+ final PersistenceQueryData persistenceQueryData) {
+ return (PersistenceQueryFindUsingApplibQuerySerializableData) persistenceQueryData;
+ }
}
-
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/server/ServerConnection.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/server/ServerConnection.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/server/ServerConnection.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/server/ServerConnection.java Tue May 3 06:33:43 2011
@@ -21,11 +21,11 @@ package org.apache.isis.runtimes.dflt.re
import java.io.IOException;
+import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.runtimes.dflt.remoting.common.client.ClientConnection;
import org.apache.isis.runtimes.dflt.remoting.common.exchange.Request;
import org.apache.isis.runtimes.dflt.remoting.common.facade.ServerFacade;
import org.apache.isis.runtimes.dflt.remoting.common.marshalling.ServerMarshaller;
-import org.apache.isis.core.commons.exceptions.IsisException;
/**
* Acts as the mediator between the {@link ServerMarshaller} (which pulls stuff off the transport and pushes stuff on)
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/server/ServerConnectionDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/server/ServerConnectionDefault.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/server/ServerConnectionDefault.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/server/ServerConnectionDefault.java Tue May 3 06:33:43 2011
@@ -17,26 +17,26 @@
* under the License.
*/
-
package org.apache.isis.runtimes.dflt.remoting.server;
import java.io.IOException;
+import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.runtimes.dflt.remoting.common.exchange.Request;
import org.apache.isis.runtimes.dflt.remoting.common.facade.ServerFacade;
import org.apache.isis.runtimes.dflt.remoting.common.marshalling.ServerMarshaller;
-import org.apache.isis.core.commons.exceptions.IsisException;
public class ServerConnectionDefault implements ServerConnection {
private final ServerFacade server;
- private ServerMarshaller serverMarshaller;
+ private final ServerMarshaller serverMarshaller;
public ServerConnectionDefault(final ServerFacade server, final ServerMarshaller serverMarshaller) {
this.server = server;
- this.serverMarshaller = serverMarshaller;
+ this.serverMarshaller = serverMarshaller;
}
+ @Override
public ServerFacade getServerFacade() {
return server;
}
@@ -45,17 +45,19 @@ public class ServerConnectionDefault imp
return serverMarshaller;
}
+ @Override
public Request readRequest() throws IOException {
return serverMarshaller.readRequest();
}
- public void sendResponse(Object response) throws IOException {
+ @Override
+ public void sendResponse(final Object response) throws IOException {
serverMarshaller.sendResponse(response);
}
- public void sendError(IsisException exception) throws IOException {
+ @Override
+ public void sendError(final IsisException exception) throws IOException {
serverMarshaller.sendError(exception);
}
-
}
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/ConnectionException.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/ConnectionException.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/transport/ConnectionException.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/ConnectionException.java Tue May 3 06:33:43 2011
@@ -17,12 +17,10 @@
* under the License.
*/
-
package org.apache.isis.runtimes.dflt.remoting.transport;
import org.apache.isis.core.commons.exceptions.IsisException;
-
/**
* Indicates that a connection could not be established between the client and the server.
*/
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/ProfilingInputStream.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/ProfilingInputStream.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/transport/ProfilingInputStream.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/ProfilingInputStream.java Tue May 3 06:33:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.runtimes.dflt.remoting.transport;
import java.io.IOException;
@@ -25,13 +24,12 @@ import java.io.InputStream;
import org.apache.log4j.Logger;
-
/**
- * Collection of timing and quantity data for the stream. Note that as the reads block the clock does not
- * start until the first read has completed.
+ * Collection of timing and quantity data for the stream. Note that as the reads block the clock does not start until
+ * the first read has completed.
*/
public class ProfilingInputStream extends InputStream {
-
+
private static final Logger LOG = Logger.getLogger(ProfilingOutputStream.class);
private final InputStream wrapped;
@@ -90,15 +88,15 @@ public class ProfilingInputStream extend
start = end = 0;
}
- private void start() {}
-
+ private void start() {
+ }
+
@Override
public void close() throws IOException {
- super.close();
+ super.close();
if (LOG.isDebugEnabled()) {
LOG.debug(getSize() + " bytes received in " + getTime() + " seconds");
}
resetTimer();
}
}
-
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/ServerConnectionHandler.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/ServerConnectionHandler.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/transport/ServerConnectionHandler.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/ServerConnectionHandler.java Tue May 3 06:33:43 2011
@@ -23,7 +23,6 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
-
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.commons.debug.DebuggableWithTitle;
@@ -60,7 +59,7 @@ public class ServerConnectionHandler {
private long responseTime;
- public ServerConnectionHandler(ServerConnection connection) {
+ public ServerConnectionHandler(final ServerConnection connection) {
this.connection = connection;
}
@@ -119,8 +118,9 @@ public class ServerConnectionHandler {
}
private void monitorRequest(final AuthenticationSession authenticationSession, final Request request) {
- String userName = authenticationSession != null ? authenticationSession.getUserName() : "**AUTHENTICATING**";
- String message = "{" + userName + "|" + this + "} " + request.toString();
+ final String userName =
+ authenticationSession != null ? authenticationSession.getUserName() : "**AUTHENTICATING**";
+ final String message = "{" + userName + "|" + this + "} " + request.toString();
ACCESS_LOG.info(message);
Monitor.addEvent("REQUEST", message, debugSessionInfo);
}
@@ -130,7 +130,7 @@ public class ServerConnectionHandler {
}
private void sendResponse(final Request request) throws IOException {
- ResponseEnvelope response = new ResponseEnvelope(request);
+ final ResponseEnvelope response = new ResponseEnvelope(request);
if (LOG.isDebugEnabled()) {
debugResponse = response.toString();
@@ -141,7 +141,7 @@ public class ServerConnectionHandler {
private void sendExceptionResponse(final Exception e) throws IOException {
LOG.error("error during remote request", e);
- StringWriter sw = new StringWriter();
+ final StringWriter sw = new StringWriter();
e.printStackTrace(new PrintWriter(sw));
if (LOG.isDebugEnabled()) {
@@ -155,7 +155,7 @@ public class ServerConnectionHandler {
responseTime = System.currentTimeMillis() - start;
}
- private void closeSessionIfNotAuthenticateRequest(AuthenticationSession authenticationSession) {
+ private void closeSessionIfNotAuthenticateRequest(final AuthenticationSession authenticationSession) {
if (authenticationSession == null) {
return;
}
@@ -183,12 +183,12 @@ public class ServerConnectionHandler {
private void debugSessionInfo(final DebugBuilder debug) {
try {
if (debugSessionInfo != null) {
- for (DebuggableWithTitle info : debugSessionInfo) {
+ for (final DebuggableWithTitle info : debugSessionInfo) {
debug.appendTitle(info.debugTitle());
info.debugData(debug);
}
}
- } catch (RuntimeException e) {
+ } catch (final RuntimeException e) {
debug.appendException(e);
}
}
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/TailingInputStream.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/TailingInputStream.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/transport/TailingInputStream.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/TailingInputStream.java Tue May 3 06:33:43 2011
@@ -17,16 +17,14 @@
* under the License.
*/
-
package org.apache.isis.runtimes.dflt.remoting.transport;
import java.io.IOException;
import java.io.InputStream;
-
/**
- * Collection of timing and quantity data for the stream. Note that as the reads block the clock does not
- * start until the first read has completed.
+ * Collection of timing and quantity data for the stream. Note that as the reads block the clock does not start until
+ * the first read has completed.
*/
public class TailingInputStream extends InputStream {
private final InputStream wrapped;
@@ -57,4 +55,3 @@ public class TailingInputStream extends
}
}
-
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/Transport.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/Transport.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/transport/Transport.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/Transport.java Tue May 3 06:33:43 2011
@@ -17,23 +17,22 @@
* under the License.
*/
+package org.apache.isis.runtimes.dflt.remoting.transport;
-package org.apache.isis.runtimes.dflt.remoting.transport;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-
-public interface Transport extends ApplicationScopedComponent {
-
- void connect() throws IOException;
-
- void disconnect();
-
- InputStream getInputStream() throws IOException;
-
- OutputStream getOutputStream() throws IOException;
-
-}
+
+public interface Transport extends ApplicationScopedComponent {
+
+ void connect() throws IOException;
+
+ void disconnect();
+
+ InputStream getInputStream() throws IOException;
+
+ OutputStream getOutputStream() throws IOException;
+
+}
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/TransportAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/TransportAbstract.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/transport/TransportAbstract.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/TransportAbstract.java Tue May 3 06:33:43 2011
@@ -17,25 +17,23 @@
* under the License.
*/
+package org.apache.isis.runtimes.dflt.remoting.transport;
-package org.apache.isis.runtimes.dflt.remoting.transport;
-
import org.apache.isis.core.commons.config.IsisConfiguration;
-
-public abstract class TransportAbstract implements Transport {
-
- private final IsisConfiguration configuration;
-
- public TransportAbstract(IsisConfiguration configuration) {
- this.configuration = configuration;
- }
-
-
- //////////////////////////////////////////////////////////////////////
- // Dependencies (injected in constructor)
- //////////////////////////////////////////////////////////////////////
-
- public IsisConfiguration getConfiguration() {
- return configuration;
- }
-}
+
+public abstract class TransportAbstract implements Transport {
+
+ private final IsisConfiguration configuration;
+
+ public TransportAbstract(final IsisConfiguration configuration) {
+ this.configuration = configuration;
+ }
+
+ // ////////////////////////////////////////////////////////////////////
+ // Dependencies (injected in constructor)
+ // ////////////////////////////////////////////////////////////////////
+
+ public IsisConfiguration getConfiguration() {
+ return configuration;
+ }
+}
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/TransportConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/TransportConstants.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/transport/TransportConstants.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/TransportConstants.java Tue May 3 06:33:43 2011
@@ -17,18 +17,15 @@
* under the License.
*/
+package org.apache.isis.runtimes.dflt.remoting.transport;
-package org.apache.isis.runtimes.dflt.remoting.transport;
-
import org.apache.isis.core.commons.config.ConfigurationConstants;
-
-
-public final class TransportConstants {
-
- private static final String ROOT =
- ConfigurationConstants.ROOT + TransportInstaller.TYPE + ".";
-
-
- private TransportConstants() {}
-
-}
+
+public final class TransportConstants {
+
+ private static final String ROOT = ConfigurationConstants.ROOT + TransportInstaller.TYPE + ".";
+
+ private TransportConstants() {
+ }
+
+}
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/TransportInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/TransportInstaller.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/transport/TransportInstaller.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/TransportInstaller.java Tue May 3 06:33:43 2011
@@ -17,15 +17,14 @@
* under the License.
*/
+package org.apache.isis.runtimes.dflt.remoting.transport;
-package org.apache.isis.runtimes.dflt.remoting.transport;
-
import org.apache.isis.core.commons.components.Installer;
-
-/**
- * TODO: not yet in use, but holds the {@link #TYPE} constant.
- */
-public interface TransportInstaller extends Installer {
-
- public static String TYPE = "transport";
-}
+
+/**
+ * TODO: not yet in use, but holds the {@link #TYPE} constant.
+ */
+public interface TransportInstaller extends Installer {
+
+ public static String TYPE = "transport";
+}
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/pipe/PipedClient.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/pipe/PipedClient.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/transport/pipe/PipedClient.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/pipe/PipedClient.java Tue May 3 06:33:43 2011
@@ -17,27 +17,29 @@
* under the License.
*/
-
package org.apache.isis.runtimes.dflt.remoting.transport.pipe;
import org.apache.isis.runtimes.dflt.remoting.common.client.ClientConnection;
import org.apache.isis.runtimes.dflt.remoting.common.exchange.Request;
import org.apache.isis.runtimes.dflt.remoting.common.exchange.ResponseEnvelope;
-
public class PipedClient implements ClientConnection {
private PipedConnection communication;
- public void init() {}
-
- public void shutdown() {}
+ @Override
+ public void init() {
+ }
+ @Override
+ public void shutdown() {
+ }
public synchronized void setConnection(final PipedConnection communication) {
this.communication = communication;
}
+ @Override
public synchronized ResponseEnvelope executeRemotely(final Request request) {
communication.setRequest(request);
return communication.getResponse();
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/pipe/PipedConnection.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/pipe/PipedConnection.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/transport/pipe/PipedConnection.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/pipe/PipedConnection.java Tue May 3 06:33:43 2011
@@ -17,14 +17,12 @@
* under the License.
*/
-
package org.apache.isis.runtimes.dflt.remoting.transport.pipe;
import org.apache.isis.runtimes.dflt.remoting.common.exchange.Request;
import org.apache.isis.runtimes.dflt.remoting.common.exchange.ResponseEnvelope;
import org.apache.log4j.Logger;
-
public class PipedConnection {
private static final Logger LOG = Logger.getLogger(PipedConnection.class);
private Request request;
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/pipe/PipedServer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/pipe/PipedServer.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/transport/pipe/PipedServer.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/pipe/PipedServer.java Tue May 3 06:33:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.runtimes.dflt.remoting.transport.pipe;
import org.apache.isis.runtimes.dflt.remoting.common.exchange.Request;
@@ -25,8 +24,6 @@ import org.apache.isis.runtimes.dflt.rem
import org.apache.isis.runtimes.dflt.remoting.common.facade.ServerFacade;
import org.apache.log4j.Logger;
-
-
public class PipedServer {
private static final Logger LOG = Logger.getLogger(PipedServer.class);
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/simple/SimpleTransport.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/simple/SimpleTransport.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/transport/simple/SimpleTransport.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/transport/simple/SimpleTransport.java Tue May 3 06:33:43 2011
@@ -17,69 +17,72 @@
* under the License.
*/
+package org.apache.isis.runtimes.dflt.remoting.transport.simple;
-package org.apache.isis.runtimes.dflt.remoting.transport.simple;
-
import java.io.InputStream;
import java.io.OutputStream;
-import org.apache.isis.runtimes.dflt.remoting.transport.TransportAbstract;
import org.apache.isis.core.commons.config.IsisConfiguration;
-
-/**
- * Simple implementation that simply wraps an already existing
- * {@link InputStream} and {@link OutputStream}.
- *
- * <p>
- * Originally written to assist with refactoring.
- */
-public class SimpleTransport extends TransportAbstract {
-
- private final InputStream inputStream;
- private final OutputStream outputStream;
-
- public SimpleTransport(IsisConfiguration configuration,
- InputStream inputStream, OutputStream outputStream) {
- super(configuration);
- this.inputStream = inputStream;
- this.outputStream = outputStream;
- }
-
-
- //////////////////////////////////////////////////////
- // init, shutdown
- //////////////////////////////////////////////////////
-
- public void init() {
- // does nothing
- }
-
- public void shutdown() {
- // does nothing
- }
-
- //////////////////////////////////////////////////////
- // connect, disconnect
- //////////////////////////////////////////////////////
-
- public void connect() {
- // does nothing
- }
-
- public void disconnect() {
- // does nothing
- }
-
- //////////////////////////////////////////////////////
- // input & output streams
- //////////////////////////////////////////////////////
-
- public InputStream getInputStream() {
- return inputStream;
- }
-
- public OutputStream getOutputStream() {
- return outputStream;
- }
-
-}
+import org.apache.isis.runtimes.dflt.remoting.transport.TransportAbstract;
+
+/**
+ * Simple implementation that simply wraps an already existing {@link InputStream} and {@link OutputStream}.
+ *
+ * <p>
+ * Originally written to assist with refactoring.
+ */
+public class SimpleTransport extends TransportAbstract {
+
+ private final InputStream inputStream;
+ private final OutputStream outputStream;
+
+ public SimpleTransport(final IsisConfiguration configuration, final InputStream inputStream,
+ final OutputStream outputStream) {
+ super(configuration);
+ this.inputStream = inputStream;
+ this.outputStream = outputStream;
+ }
+
+ // ////////////////////////////////////////////////////
+ // init, shutdown
+ // ////////////////////////////////////////////////////
+
+ @Override
+ public void init() {
+ // does nothing
+ }
+
+ @Override
+ public void shutdown() {
+ // does nothing
+ }
+
+ // ////////////////////////////////////////////////////
+ // connect, disconnect
+ // ////////////////////////////////////////////////////
+
+ @Override
+ public void connect() {
+ // does nothing
+ }
+
+ @Override
+ public void disconnect() {
+ // does nothing
+ }
+
+ // ////////////////////////////////////////////////////
+ // input & output streams
+ // ////////////////////////////////////////////////////
+
+ @Override
+ public InputStream getInputStream() {
+ return inputStream;
+ }
+
+ @Override
+ public OutputStream getOutputStream() {
+ return outputStream;
+ }
+
+}
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/client/CommandClientTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/client/CommandClientTest.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/client/CommandClientTest.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/client/CommandClientTest.java Tue May 3 06:33:43 2011
@@ -17,11 +17,10 @@
* under the License.
*/
-
package org.apache.isis.runtimes.dflt.remoting.common.client;
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.runtimes.dflt.remoting.common.IsisRemoteException;
-import org.apache.isis.runtimes.dflt.remoting.common.client.ClientConnection;
import org.apache.isis.runtimes.dflt.remoting.common.data.DummyIdentityData;
import org.apache.isis.runtimes.dflt.remoting.common.data.common.IdentityData;
import org.apache.isis.runtimes.dflt.remoting.common.data.common.ObjectData;
@@ -36,13 +35,11 @@ import org.apache.isis.runtimes.dflt.rem
import org.apache.isis.runtimes.dflt.remoting.common.exchange.ResponseEnvelope;
import org.apache.isis.runtimes.dflt.remoting.common.facade.ServerFacade;
import org.apache.isis.runtimes.dflt.remoting.common.facade.proxy.ServerFacadeProxy;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.runtimes.dflt.runtime.testsystem.ProxyJunit3TestCase;
import org.apache.isis.runtimes.dflt.runtime.testsystem.TestProxyOid;
import org.apache.isis.runtimes.dflt.runtime.testsystem.TestProxySession;
import org.easymock.MockControl;
-
public class CommandClientTest extends ProxyJunit3TestCase {
private MockControl control;
private ServerFacade serverFacade;
@@ -55,67 +52,79 @@ public class CommandClientTest extends P
control = MockControl.createControl(ServerFacade.class);
serverFacade = (ServerFacade) control.getMock();
- ClientConnection connection = new ClientConnection() {
+ final ClientConnection connection = new ClientConnection() {
+ @Override
public ResponseEnvelope executeRemotely(final Request request) {
request.execute(serverFacade);
return new ResponseEnvelope(request);
}
- public void init() {}
+ @Override
+ public void init() {
+ }
- public void shutdown() {}
+ @Override
+ public void shutdown() {
+ }
};
serverFacadeProxy = new ServerFacadeProxy(connection);
session = new TestProxySession();
}
public void testOidForService() {
- OidForServiceRequest request = new OidForServiceRequest(session, "domain.Service");
- serverFacade.oidForService(request );
+ final OidForServiceRequest request = new OidForServiceRequest(session, "domain.Service");
+ serverFacade.oidForService(request);
final IdentityData data = new DummyIdentityData();
control.setReturnValue(new OidForServiceResponse(data));
control.replay();
- OidForServiceResponse response = serverFacadeProxy.oidForService(request);
- final IdentityData ret = response.getOidData();
+ final OidForServiceResponse response = serverFacadeProxy.oidForService(request);
+ final IdentityData ret = response.getOidData();
control.verify();
assertEquals(data, ret);
}
public void testHasInstances() {
- HasInstancesRequest request = new HasInstancesRequest(session, "pkg.Class");
- serverFacade.hasInstances(request);
+ final HasInstancesRequest request = new HasInstancesRequest(session, "pkg.Class");
+ serverFacade.hasInstances(request);
final boolean data = true;
control.setReturnValue(new HasInstancesResponse(data));
control.replay();
- HasInstancesResponse response = serverFacadeProxy.hasInstances(request);
- final boolean ret = response.hasInstances();
+ final HasInstancesResponse response = serverFacadeProxy.hasInstances(request);
+ final boolean ret = response.hasInstances();
control.verify();
assertEquals(data, ret);
}
public void testOutOfSequence() {
- ClientConnection connection = new ClientConnection() {
+ final ClientConnection connection = new ClientConnection() {
+ @Override
public ResponseEnvelope executeRemotely(final Request request) {
// create a response based on another request so id is different
return new ResponseEnvelope(new RequestAbstract((AuthenticationSession) null) {
private static final long serialVersionUID = 1L;
- public void execute(final ServerFacade serverFacade) {}
+ @Override
+ public void execute(final ServerFacade serverFacade) {
+ }
});
}
- public void init() {}
+ @Override
+ public void init() {
+ }
- public void shutdown() {}
+ @Override
+ public void shutdown() {
+ }
};
- serverFacadeProxy = new ServerFacadeProxy(connection);
+ serverFacadeProxy = new ServerFacadeProxy(connection);
try {
- OidForServiceRequest request = new OidForServiceRequest(session, "domain.Service");
+ final OidForServiceRequest request = new OidForServiceRequest(session, "domain.Service");
serverFacadeProxy.oidForService(request);
fail();
} catch (final IsisRemoteException e) {
@@ -126,18 +135,17 @@ public class CommandClientTest extends P
public void testClearAssociation() {
final DummyIdentityData target = new DummyIdentityData(new TestProxyOid(1), "class 1", null);
final DummyIdentityData associate = new DummyIdentityData(new TestProxyOid(2), "class 2", null);
- ClearAssociationRequest request = new ClearAssociationRequest(session, "fieldname", target, associate);
- serverFacade.clearAssociation(request);
+ final ClearAssociationRequest request = new ClearAssociationRequest(session, "fieldname", target, associate);
+ serverFacade.clearAssociation(request);
final ObjectData[] data = new ObjectData[2];
control.setReturnValue(new ClearAssociationResponse(data));
control.replay();
- ClearAssociationResponse response = serverFacadeProxy.clearAssociation(request);
- final ObjectData[] ret = response.getUpdates();
+ final ClearAssociationResponse response = serverFacadeProxy.clearAssociation(request);
+ final ObjectData[] ret = response.getUpdates();
control.verify();
assertEquals(data, ret);
}
}
-
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/client/ProxyPersistorTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/client/ProxyPersistorTest.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/client/ProxyPersistorTest.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/client/ProxyPersistorTest.java Tue May 3 06:33:43 2011
@@ -26,6 +26,18 @@ import static org.junit.Assert.assertTru
import java.util.List;
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+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.version.Version;
+import org.apache.isis.core.metamodel.services.ServicesInjectorDefault;
+import org.apache.isis.core.metamodel.services.container.DomainObjectContainerDefault;
+import org.apache.isis.core.metamodel.spec.ObjectList;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
+import org.apache.isis.core.testsupport.testdomain.Movie;
+import org.apache.isis.core.testsupport.testdomain.Person;
import org.apache.isis.runtimes.dflt.bytecode.identity.objectfactory.ObjectFactoryBasic;
import org.apache.isis.runtimes.dflt.remoting.common.client.persistence.ClientSideTransactionManager;
import org.apache.isis.runtimes.dflt.remoting.common.client.persistence.PersistenceSessionProxy;
@@ -48,16 +60,6 @@ import org.apache.isis.runtimes.dflt.rem
import org.apache.isis.runtimes.dflt.remoting.common.exchange.ResolveObjectRequest;
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.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.version.Version;
-import org.apache.isis.core.metamodel.services.ServicesInjectorDefault;
-import org.apache.isis.core.metamodel.services.container.DomainObjectContainerDefault;
-import org.apache.isis.core.metamodel.spec.ObjectList;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.runtimes.dflt.runtime.persistence.adapterfactory.pojo.PojoAdapterFactory;
import org.apache.isis.runtimes.dflt.runtime.persistence.adaptermanager.AdapterManagerDefault;
import org.apache.isis.runtimes.dflt.runtime.persistence.adaptermanager.AdapterManagerExtended;
@@ -73,8 +75,6 @@ import org.apache.isis.runtimes.dflt.run
import org.apache.isis.runtimes.dflt.runtime.testsystem.TestProxyOid;
import org.apache.isis.runtimes.dflt.runtime.testsystem.TestProxyOidGenerator;
import org.apache.isis.runtimes.dflt.runtime.testsystem.TestProxyVersion;
-import org.apache.isis.core.testsupport.testdomain.Movie;
-import org.apache.isis.core.testsupport.testdomain.Person;
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
@@ -117,13 +117,13 @@ public class ProxyPersistorTest extends
objectFactory = new ObjectFactoryBasic();
oidGenerator = new TestProxyOidGenerator();
- RuntimeContextFromSession runtimeContext = new RuntimeContextFromSession();
- DomainObjectContainerDefault container = new DomainObjectContainerDefault();
+ final RuntimeContextFromSession runtimeContext = new RuntimeContextFromSession();
+ final DomainObjectContainerDefault container = new DomainObjectContainerDefault();
runtimeContext.injectInto(container);
runtimeContext.setContainer(container);
- ServicesInjectorDefault servicesInjector = new ServicesInjectorDefault();
+ final ServicesInjectorDefault servicesInjector = new ServicesInjectorDefault();
servicesInjector.setContainer(container);
persistenceSessionProxy =
@@ -178,7 +178,7 @@ public class ProxyPersistorTest extends
dummyObjectAdapter.setupSpecification(new MovieSpecification());
final PersistenceQueryData c = new TestCriteria();
- ObjectSpecification noSpec = getSpecificationLoader().loadSpecification(Movie.class);
+ final ObjectSpecification noSpec = getSpecificationLoader().loadSpecification(Movie.class);
final PersistenceQueryFindAllInstances criteria = new PersistenceQueryFindAllInstances(noSpec);
final FindInstancesRequest request = new FindInstancesRequest(session, c);
@@ -288,7 +288,7 @@ public class ProxyPersistorTest extends
// system.addSpecificationToLoader(new MovieSpecification());
final PersistenceQueryData c = new TestCriteria();
- ObjectSpecification noSpec = getSpecificationLoader().loadSpecification(Movie.class);
+ final ObjectSpecification noSpec = getSpecificationLoader().loadSpecification(Movie.class);
final PersistenceQueryFindAllInstances criteria = new PersistenceQueryFindAllInstances(noSpec);
final FindInstancesRequest request = new FindInstancesRequest(session, c);
Modified: incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/client/facets/ProxyAction_ExecuteLocallyTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/client/facets/ProxyAction_ExecuteLocallyTest.java?rev=1098939&r1=1098938&r2=1098939&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/client/facets/ProxyAction_ExecuteLocallyTest.java (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/common/src/test/java/org/apache/isis/runtimes/dflt/remoting/common/client/facets/ProxyAction_ExecuteLocallyTest.java Tue May 3 06:33:43 2011
@@ -17,19 +17,17 @@
* under the License.
*/
-
package org.apache.isis.runtimes.dflt.remoting.common.client.facets;
import static org.hamcrest.CoreMatchers.equalTo;
-import org.apache.isis.runtimes.dflt.remoting.common.client.facets.ActionInvocationFacetWrapProxy;
-import org.apache.isis.runtimes.dflt.remoting.common.facade.ServerFacade;
-import org.apache.isis.runtimes.dflt.remoting.common.protocol.ObjectEncoderDecoder;
import org.apache.isis.applib.Identifier;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.actions.invoke.ActionInvocationFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.runtimes.dflt.remoting.common.facade.ServerFacade;
+import org.apache.isis.runtimes.dflt.remoting.common.protocol.ObjectEncoderDecoder;
import org.apache.isis.runtimes.dflt.runtime.testsystem.TestProxySystem;
import org.apache.log4j.BasicConfigurator;
import org.apache.log4j.Level;
@@ -46,7 +44,7 @@ import org.junit.runner.RunWith;
@RunWith(JMock.class)
public class ProxyAction_ExecuteLocallyTest {
- private Mockery mockery = new JUnit4Mockery();
+ private final Mockery mockery = new JUnit4Mockery();
private ActionInvocationFacetWrapProxy proxy;
private ObjectAction mockObjectAction;
@@ -54,7 +52,7 @@ public class ProxyAction_ExecuteLocallyT
private ServerFacade mockDistribution;
private ObjectAdapter target;
private ObjectAdapter param1;
-
+
private TestProxySystem system;
private Identifier identifier;
private ActionInvocationFacet mockActionInvocationFacet;
@@ -74,7 +72,7 @@ public class ProxyAction_ExecuteLocallyT
mockDistribution = mockery.mock(ServerFacade.class);
mockActionInvocationFacet = mockery.mock(ActionInvocationFacet.class);
mockFacetHolder = mockery.mock(FacetHolder.class);
-
+
identifier = Identifier.classIdentifier("");
target = system.createTransientTestObject();
@@ -82,7 +80,7 @@ public class ProxyAction_ExecuteLocallyT
{
one(mockActionInvocationFacet).getFacetHolder();
will(returnValue(mockFacetHolder));
-
+
allowing(mockObjectAction).getIdentifier();
will(returnValue((identifier)));
@@ -90,14 +88,17 @@ public class ProxyAction_ExecuteLocallyT
will(returnValue(null));
}
});
-
- proxy = new ActionInvocationFacetWrapProxy(mockActionInvocationFacet, mockDistribution, mockEncoder, mockObjectAction);
+
+ proxy =
+ new ActionInvocationFacetWrapProxy(mockActionInvocationFacet, mockDistribution, mockEncoder,
+ mockObjectAction);
}
// to prevent a warning
@Test
- public void testDummy() {}
+ public void testDummy() {
+ }
@Ignore("was commented out, don't know details")
@Test
@@ -105,7 +106,6 @@ public class ProxyAction_ExecuteLocallyT
// actionPeer.getTarget();
// expectLastCall().andStubReturn(null);
-
proxy.invoke(target, new ObjectAdapter[] { param1, param1 });
}
@@ -119,4 +119,3 @@ public class ProxyAction_ExecuteLocallyT
proxy.invoke(target, new ObjectAdapter[] { param1, param1 });
}
}
-