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 2012/08/15 23:43:47 UTC
svn commit: r1373642 [2/3] - in /incubator/isis/trunk/framework:
core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/mgr/
core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/
core/metamodel/src/test/java/org/apache/i...
Copied: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/persistence/spi/JdoObjectIdSerializerTest.java (from r1373632, incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/persistence/spi/JdoOidSerializerTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/persistence/spi/JdoObjectIdSerializerTest.java?p2=incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/persistence/spi/JdoObjectIdSerializerTest.java&p1=incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/persistence/spi/JdoOidSerializerTest.java&r1=1373632&r2=1373642&rev=1373642&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/persistence/spi/JdoOidSerializerTest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/persistence/spi/JdoObjectIdSerializerTest.java Wed Aug 15 21:43:44 2012
@@ -15,7 +15,7 @@ import org.datanucleus.identity.OIDImpl;
import org.junit.Rule;
import org.junit.Test;
-public class JdoOidSerializerTest {
+public class JdoObjectIdSerializerTest {
@ObjectType("CUS")
public static class Customer {}
@@ -30,107 +30,105 @@ public class JdoOidSerializerTest {
.build();
+
@Test
public void whenJavaxJdoIntIdentity() throws Exception {
- Object jdoOid = new javax.jdo.identity.IntIdentity(Customer.class, 123);
- String id = JdoOidSerializer.toString(jdoOid);
- assertThat(id, is("i~123"));
+ Object jdoObjectId = new javax.jdo.identity.IntIdentity(Customer.class, 123);
+ String id = JdoObjectIdSerializer.toOidIdentifier(jdoObjectId);
+ assertThat(id, is("i_123"));
RootOidDefault oid = RootOidDefault.create(ObjectSpecId.of("CUS"), id);
- String oidStr = JdoOidSerializer.toOidStr(oid);
+ Object jdoObjectIdRecreated = JdoObjectIdSerializer.toJdoObjectId(oid);
- // REVIEW: not completely certain if should have the [OID] suffix or not for JDO identity
- assertThat(oidStr, is("123"+ "[OID]" + Customer.class.getName()));
+ assertThat(jdoObjectIdRecreated, is(jdoObjectId));
}
@Test
public void whenJavaxJdoStringIdentity() throws Exception {
- Object jdoOid = new javax.jdo.identity.StringIdentity(Customer.class, "123");
- String id = JdoOidSerializer.toString(jdoOid);
- assertThat(id, is("s~123"));
+ Object jdoObjectId = new javax.jdo.identity.StringIdentity(Customer.class, "123");
+ String id = JdoObjectIdSerializer.toOidIdentifier(jdoObjectId);
+ assertThat(id, is("s_123"));
RootOidDefault oid = RootOidDefault.create(ObjectSpecId.of("CUS"), id);
- String oidStr = JdoOidSerializer.toOidStr(oid);
+ Object jdoObjectIdRecreated = JdoObjectIdSerializer.toJdoObjectId(oid);
- // REVIEW: not completely certain if should have the [OID] suffix or not for JDO identity
- assertThat(oidStr, is("123" + "[OID]" + Customer.class.getName()));
+ assertThat(jdoObjectIdRecreated, is(jdoObjectId));
}
@Test
public void whenJavaxJdoLongIdentity() throws Exception {
- Object jdoOid = new javax.jdo.identity.LongIdentity(Customer.class, 123L);
- String id = JdoOidSerializer.toString(jdoOid);
- assertThat(id, is("l~123"));
+ Object jdoObjectId = new javax.jdo.identity.LongIdentity(Customer.class, 123L);
+ String id = JdoObjectIdSerializer.toOidIdentifier(jdoObjectId);
+ assertThat(id, is("l_123"));
RootOidDefault oid = RootOidDefault.create(ObjectSpecId.of("CUS"), id);
- String oidStr = JdoOidSerializer.toOidStr(oid);
+ Object jdoObjectIdRecreated = JdoObjectIdSerializer.toJdoObjectId(oid);
- // REVIEW: not completely certain if should have the [OID] suffix or not for JDO identity
- assertThat(oidStr, is("123"+ "[OID]" + Customer.class.getName()));
+ assertThat(jdoObjectIdRecreated, is(jdoObjectId));
}
@Test
public void whenLong() throws Exception {
Object jdoOid = new OIDImpl(Customer.class.getName(), 123L);
- String id = JdoOidSerializer.toString(jdoOid);
- assertThat(id, is("L~123"));
+ String id = JdoObjectIdSerializer.toOidIdentifier(jdoOid);
+ assertThat(id, is("L_123"));
RootOidDefault oid = RootOidDefault.create(ObjectSpecId.of("CUS"), id);
- String oidStr = JdoOidSerializer.toOidStr(oid);
+ Object jdoOidRecreated = JdoObjectIdSerializer.toJdoObjectId(oid);
- assertThat(oidStr, is("123"+ "[OID]" + Customer.class.getName()));
+ assertThat(jdoOidRecreated, is((Object)("123"+ "[OID]" + Customer.class.getName())));
}
@Test
public void whenDataNucleusOidAndLong() throws Exception {
Object jdoOid = new OIDImpl(Customer.class.getName(), 123L);
- String id = JdoOidSerializer.toString(jdoOid);
- assertThat(id, is("L~123"));
+ String id = JdoObjectIdSerializer.toOidIdentifier(jdoOid);
+ assertThat(id, is("L_123"));
RootOidDefault oid = RootOidDefault.create(ObjectSpecId.of("CUS"), id);
- String oidStr = JdoOidSerializer.toOidStr(oid);
+ Object jdoOidRecreated = JdoObjectIdSerializer.toJdoObjectId(oid);
- assertThat(oidStr, is("123"+ "[OID]" + Customer.class.getName()));
+ assertThat(jdoOidRecreated, is((Object)("123"+ "[OID]" + Customer.class.getName())));
}
@Test
public void whenDataNucleusOidAndBigInteger() throws Exception {
Object jdoOid = new OIDImpl(Customer.class.getName(), new BigInteger("123"));
- String id = JdoOidSerializer.toString(jdoOid);
- assertThat(id, is("B~123"));
+ String id = JdoObjectIdSerializer.toOidIdentifier(jdoOid);
+ assertThat(id, is("B_123"));
RootOidDefault oid = RootOidDefault.create(ObjectSpecId.of("CUS"), id);
- String oidStr = JdoOidSerializer.toOidStr(oid);
+ Object jdoOidRecreated = JdoObjectIdSerializer.toJdoObjectId(oid);
- assertThat(oidStr, is("123"+ "[OID]" + Customer.class.getName()));
+ assertThat(jdoOidRecreated, is(((Object)("123"+ "[OID]" + Customer.class.getName()))));
}
@Test
public void whenDataNucleusOidAndString() throws Exception {
Object jdoOid = new OIDImpl(Customer.class.getName(), "456");
- String id = JdoOidSerializer.toString(jdoOid);
- assertThat(id, is("S~456"));
+ String id = JdoObjectIdSerializer.toOidIdentifier(jdoOid);
+ assertThat(id, is("S_456"));
RootOidDefault oid = RootOidDefault.create(ObjectSpecId.of("CUS"), id);
- String oidStr = JdoOidSerializer.toOidStr(oid);
+ Object jdoOidRecreated = JdoObjectIdSerializer.toJdoObjectId(oid);
- assertThat(oidStr, is("456" + "[OID]" + Customer.class.getName()));
+ assertThat(jdoOidRecreated, is((Object)("456" + "[OID]" + Customer.class.getName())));
}
@Test
public void whenDataNucleusOidAndOtherKeyValue() throws Exception {
Date key = new Date();
Object jdoOid = new OIDImpl(Customer.class.getName(), key);
- String id = JdoOidSerializer.toString(jdoOid);
- assertThat(id, IsisMatchers.startsWith(OIDImpl.class.getName() + "~" + key.toString()));
+ String id = JdoObjectIdSerializer.toOidIdentifier(jdoOid);
+ assertThat(id, IsisMatchers.startsWith(OIDImpl.class.getName() + "_" + key.toString()));
RootOidDefault oid = RootOidDefault.create(ObjectSpecId.of("CUS"), id);
- String oidStr = JdoOidSerializer.toOidStr(oid);
+ Object jdoOidRecreated = JdoObjectIdSerializer.toJdoObjectId(oid);
- assertThat(oidStr, is(key.toString() + "[OID]" + Customer.class.getName()));
+ assertThat(jdoOidRecreated, is((Object)(key.toString() + "[OID]" + Customer.class.getName())));
}
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/scenarios/scalar/Persistence_persistAndUpdate_objectAdapters.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/scenarios/scalar/Persistence_persistAndUpdate_objectAdapters.java?rev=1373642&r1=1373641&r2=1373642&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/scenarios/scalar/Persistence_persistAndUpdate_objectAdapters.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/scenarios/scalar/Persistence_persistAndUpdate_objectAdapters.java Wed Aug 15 21:43:44 2012
@@ -29,6 +29,7 @@ import org.junit.Test;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ResolveState;
+import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.Utils;
import org.apache.isis.runtimes.dflt.testsupport.IsisSystemWithFixtures;
import org.apache.isis.tck.dom.scalars.PrimitiveValuedEntity;
@@ -67,7 +68,7 @@ public class Persistence_persistAndUpdat
adapter = iswf.adapterFor(list.get(0));
assertThat(adapter.getResolveState(), is(ResolveState.RESOLVED));
assertThat(adapter.isTransient(), is(false));
- assertThat(adapter.getOid().enString(), is("PRMV:i~1"));
+ assertThat(adapter.getOid().enString(new OidMarshaller()), is("PRMV:i~1"));
iswf.commitTran();
}
@@ -106,6 +107,7 @@ public class Persistence_persistAndUpdat
iswf.commitTran();
}
+
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/NoSqlObjectStore.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/NoSqlObjectStore.java?rev=1373642&r1=1373641&r2=1373642&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/NoSqlObjectStore.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/NoSqlObjectStore.java Wed Aug 15 21:43:44 2012
@@ -125,7 +125,7 @@ public class NoSqlObjectStore implements
}
@Override
- public List<ObjectAdapter> getInstances(final PersistenceQuery persistenceQuery) {
+ public List<ObjectAdapter> loadInstancesAndAdapt(final PersistenceQuery persistenceQuery) {
final ObjectSpecification specification = persistenceQuery.getSpecification();
final List<ObjectAdapter> instances = Lists.newArrayList();
appendInstances(persistenceQuery, specification, instances);
@@ -155,7 +155,7 @@ public class NoSqlObjectStore implements
@Override
- public ObjectAdapter getObject(final TypedOid oid) {
+ public ObjectAdapter loadInstanceAndAdapt(final TypedOid oid) {
final String key = keyCreator.getIdentifierForPersistentRoot(oid);
final ObjectSpecification objectSpec = getSpecificationLookup().lookupBySpecId(oid.getObjectSpecId());
final StateReader reader = database.getInstance(key, objectSpec.getSpecId());
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/ObjectReader.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/ObjectReader.java?rev=1373642&r1=1373641&r2=1373642&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/ObjectReader.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/ObjectReader.java Wed Aug 15 21:43:44 2012
@@ -232,7 +232,7 @@ public class ObjectReader {
////////////////////////////////////////////////////////////////////////////
- // from context
+ // dependencies (from context)
////////////////////////////////////////////////////////////////////////////
protected Persistor getPersistenceSession() {
@@ -248,7 +248,7 @@ public class ObjectReader {
}
protected OidMarshaller getOidMarshaller() {
- return new OidMarshaller();
+ return IsisContext.getOidMarshaller();
}
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/file/JsonStateWriter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/file/JsonStateWriter.java?rev=1373642&r1=1373641&r2=1373642&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/file/JsonStateWriter.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/file/JsonStateWriter.java Wed Aug 15 21:43:44 2012
@@ -21,24 +21,25 @@ package org.apache.isis.runtimes.dflt.ob
import java.util.List;
-import com.google.common.collect.Lists;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
+import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.adapter.oid.TypedOid;
import org.apache.isis.runtimes.dflt.objectstores.nosql.NoSqlStoreException;
import org.apache.isis.runtimes.dflt.objectstores.nosql.db.StateWriter;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import com.google.common.collect.Lists;
public class JsonStateWriter implements StateWriter {
private final JSONObject dbObject = new JSONObject();
private TypedOid oid;
-
private String currentVersion;
private String newVersion;
+
@Override
public StateWriter addAggregate(final String id) {
final JsonStateWriter jsonStateWriter = new JsonStateWriter();
@@ -53,7 +54,7 @@ public class JsonStateWriter implements
@Override
public void writeOid(final TypedOid typedOid) {
this.oid = typedOid;
- writeField(PropertyNames.OID, typedOid.enString());
+ writeField(PropertyNames.OID, typedOid.enString(getOidMarshaller()));
}
@Override
@@ -97,7 +98,7 @@ public class JsonStateWriter implements
}
public String getRequest() {
- return oid.enString() + " " + currentVersion + " " + newVersion;
+ return oid.enString(getOidMarshaller()) + " " + currentVersion + " " + newVersion;
}
public String getData() {
@@ -126,4 +127,13 @@ public class JsonStateWriter implements
}
}
+
+ ///////////////////////////////////////////////////////
+ // dependencies (from context)
+ ///////////////////////////////////////////////////////
+
+ protected OidMarshaller getOidMarshaller() {
+ return IsisContext.getOidMarshaller();
+ }
+
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoStateWriter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoStateWriter.java?rev=1373642&r1=1373641&r2=1373642&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoStateWriter.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoStateWriter.java Wed Aug 15 21:43:44 2012
@@ -21,10 +21,12 @@ package org.apache.isis.runtimes.dflt.ob
import java.util.List;
+import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.adapter.oid.TypedOid;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.runtimes.dflt.objectstores.nosql.db.StateWriter;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
import org.apache.log4j.Logger;
import com.google.common.collect.Lists;
@@ -58,7 +60,7 @@ public class MongoStateWriter implements
@Override
public void writeOid(final TypedOid typedOid) {
- writeField(PropertyNames.OID, typedOid.enString());
+ writeField(PropertyNames.OID, typedOid.enString(getOidMarshaller()));
if(typedOid instanceof RootOid) {
RootOid rootOid = (RootOid) typedOid;
writeField(PropertyNames.MONGO_INTERNAL_ID, rootOid.getIdentifier());
@@ -115,4 +117,13 @@ public class MongoStateWriter implements
}
dbObject.put(id, collection);
}
+
+ // ///////////////////////////////////////////////////////////////////
+ // dependencies
+ // ///////////////////////////////////////////////////////////////////
+
+ protected OidMarshaller getOidMarshaller() {
+ return IsisContext.getOidMarshaller();
+ }
+
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/keys/KeyCreatorDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/keys/KeyCreatorDefault.java?rev=1373642&r1=1373641&r2=1373642&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/keys/KeyCreatorDefault.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/keys/KeyCreatorDefault.java Wed Aug 15 21:43:44 2012
@@ -48,7 +48,7 @@ public class KeyCreatorDefault {
}
/**
- * Equivalent to the {@link Oid#enString()} for the adapter's Oid.
+ * Equivalent to the {@link Oid#enString(OidMarshaller)} for the adapter's Oid.
*/
public String oidStrFor(final ObjectAdapter adapter) {
if(adapter == null) {
@@ -56,7 +56,7 @@ public class KeyCreatorDefault {
}
try {
//return adapter.getSpecification().getFullIdentifier() + "@" + key(adapter.getOid());
- return adapter.getOid().enString();
+ return adapter.getOid().enString(getOidMarshaller());
} catch (final NoSqlStoreException e) {
throw new NoSqlStoreException("Failed to create refence for " + adapter, e);
}
@@ -81,12 +81,18 @@ public class KeyCreatorDefault {
return getSpecificationLoader().lookupBySpecId(oid.getObjectSpecId());
}
+
+ /////////////////////////////////////////////////
+ // dependencies (from context)
+ /////////////////////////////////////////////////
+
+
protected SpecificationLoaderSpi getSpecificationLoader() {
return IsisContext.getSpecificationLoader();
}
protected OidMarshaller getOidMarshaller() {
- return new OidMarshaller();
+ return IsisContext.getOidMarshaller();
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/NoSqlKeyCreatorTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/NoSqlKeyCreatorTest.java?rev=1373642&r1=1373641&r2=1373642&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/NoSqlKeyCreatorTest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/NoSqlKeyCreatorTest.java Wed Aug 15 21:43:44 2012
@@ -51,7 +51,7 @@ public class NoSqlKeyCreatorTest {
private ObjectSpecification mockSpecification;
private final RootOidDefault oid = RootOidDefault.create(ObjectSpecId.of("ERP"), "3");
- private final String oidStr = oid.enString();
+ private final String oidStr = oid.enString(new OidMarshaller());
private KeyCreatorDefault keyCreatorDefault;
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/NoSqlObjectStoreTest_interactWith_db.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/NoSqlObjectStoreTest_interactWith_db.java?rev=1373642&r1=1373641&r2=1373642&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/NoSqlObjectStoreTest_interactWith_db.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/NoSqlObjectStoreTest_interactWith_db.java Wed Aug 15 21:43:44 2012
@@ -196,7 +196,7 @@ public class NoSqlObjectStoreTest_intera
}
});
- store.getInstances(persistenceQuery);
+ store.loadInstancesAndAdapt(persistenceQuery);
}
@Test
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/WriteObjectCommandTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/WriteObjectCommandTest.java?rev=1373642&r1=1373641&r2=1373642&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/WriteObjectCommandTest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/WriteObjectCommandTest.java Wed Aug 15 21:43:44 2012
@@ -32,6 +32,7 @@ import org.junit.Test;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.exceptions.UnexpectedCallException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.adapter.oid.RootOidDefault;
import org.apache.isis.core.metamodel.adapter.version.SerialNumberVersion;
import org.apache.isis.core.metamodel.adapter.version.Version;
@@ -80,21 +81,21 @@ public class WriteObjectCommandTest {
smpl1 = iswf.fixtures.smpl1;
smpl1.setName("Fred Smith");
smpl1.setSize(108);
- smpl1Adapter = iswf.remapAsPersistent(smpl1, RootOidDefault.deString("SMPL:1"));
+ smpl1Adapter = iswf.remapAsPersistent(smpl1, RootOidDefault.deString("SMPL:1", new OidMarshaller()));
smpl2 = iswf.fixtures.smpl2;
smpl2.setName("John Brown");
- iswf.remapAsPersistent(smpl2, RootOidDefault.deString("SMPL:2"));
+ iswf.remapAsPersistent(smpl2, RootOidDefault.deString("SMPL:2", new OidMarshaller()));
rfcg1 = iswf.fixtures.rfcg1;
rfcg1.setReference(smpl1);
- rfcg1Adapter = iswf.remapAsPersistent(rfcg1, RootOidDefault.deString("RFCG:1"));
+ rfcg1Adapter = iswf.remapAsPersistent(rfcg1, RootOidDefault.deString("RFCG:1", new OidMarshaller()));
prnt1 = iswf.fixtures.prnt1;
prnt1.getHomogeneousCollection().add(smpl1);
prnt1.getHomogeneousCollection().add(smpl2);
- prnt1Adapter = iswf.remapAsPersistent(prnt1, RootOidDefault.deString("PRNT:1"));
+ prnt1Adapter = iswf.remapAsPersistent(prnt1, RootOidDefault.deString("PRNT:1", new OidMarshaller()));
final Version version = new SerialNumberVersion(2, "username", null);
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/file/JsonStateWriterTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/file/JsonStateWriterTest.java?rev=1373642&r1=1373641&r2=1373642&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/file/JsonStateWriterTest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/file/JsonStateWriterTest.java Wed Aug 15 21:43:44 2012
@@ -23,15 +23,19 @@ import static org.junit.Assert.assertEqu
import java.util.ArrayList;
import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
-
+import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.adapter.oid.RootOidDefault;
import org.apache.isis.runtimes.dflt.objectstores.nosql.db.StateWriter;
-import org.apache.isis.runtimes.dflt.objectstores.nosql.db.file.JsonStateWriter;
+import org.apache.isis.runtimes.dflt.testsupport.IsisSystemWithFixtures;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
public class JsonStateWriterTest {
+ @Rule
+ public IsisSystemWithFixtures iswf = IsisSystemWithFixtures.builder().build();
+
private JsonStateWriter writer;
@Before
@@ -48,7 +52,7 @@ public class JsonStateWriterTest {
public void basicData() throws Exception {
// writer.writeObjectType("com.planchase.ClassName");
// writer.writeId("#1");
- writer.writeOid(RootOidDefault.deString("com.planchase.ClassName:1"));
+ writer.writeOid(RootOidDefault.deString("com.planchase.ClassName:1", new OidMarshaller()));
writer.writeTime("ddmmyy");
writer.writeVersion("1", "2");
writer.writeUser("fred");
@@ -111,7 +115,7 @@ public class JsonStateWriterTest {
public void requestData() throws Exception {
// writer.writeObjectType("com.planchase.ClassName");
// writer.writeId("#8");
- writer.writeOid(RootOidDefault.deString("com.planchase.ClassName:8"));
+ writer.writeOid(RootOidDefault.deString("com.planchase.ClassName:8", new OidMarshaller()));
writer.writeVersion("1", "2");
assertEquals("com.planchase.ClassName:8 1 2", writer.getRequest());
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoStateWriterIntegrationTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoStateWriterIntegrationTest.java?rev=1373642&r1=1373641&r2=1373642&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoStateWriterIntegrationTest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoStateWriterIntegrationTest.java Wed Aug 15 21:43:44 2012
@@ -33,6 +33,7 @@ import org.apache.log4j.Logger;
import org.junit.Before;
import org.junit.Test;
+import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.adapter.oid.RootOidDefault;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
@@ -79,7 +80,7 @@ public class MongoStateWriterIntegration
@Test
public void serialNumberNotStored() throws Exception {
//writer.writeId("D01");
- writer.writeOid(RootOidDefault.deString(SPEC_NAME+":"+"D01"));
+ writer.writeOid(RootOidDefault.deString(SPEC_NAME+":"+"D01", new OidMarshaller()));
writer.flush();
final DBCollection instances = testDb.getCollection(SPEC_NAME);
@@ -95,7 +96,7 @@ public class MongoStateWriterIntegration
@Test
public void writeFields() throws Exception {
//writer.writeObjectType(SPEC_NAME);
- writer.writeOid(RootOidDefault.deString(SPEC_NAME+":"+"D01"));
+ writer.writeOid(RootOidDefault.deString(SPEC_NAME+":"+"D01", new OidMarshaller()));
writer.writeField("number", 1023);
writer.writeField("string", "testing");
writer.flush();
@@ -112,7 +113,7 @@ public class MongoStateWriterIntegration
public void writeFields2() throws Exception {
// writer.writeId("3");
// writer.writeObjectType(SPEC_NAME);
- writer.writeOid(RootOidDefault.deString(SPEC_NAME + ":" + "3"));
+ writer.writeOid(RootOidDefault.deString(SPEC_NAME + ":" + "3", new OidMarshaller()));
writer.flush();
writer.writeField("number", 1023);
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/ObjectReaderMongoIntegrationTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/ObjectReaderMongoIntegrationTest.java?rev=1373642&r1=1373641&r2=1373642&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/ObjectReaderMongoIntegrationTest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/ObjectReaderMongoIntegrationTest.java Wed Aug 15 21:43:44 2012
@@ -39,6 +39,7 @@ import org.apache.isis.core.commons.exce
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ResolveState;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
+import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.adapter.oid.RootOidDefault;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -77,9 +78,11 @@ public class ObjectReaderMongoIntegratio
private Map<String, DataEncryption> dataEncrypter;
- private final RootOidDefault oid3 = RootOidDefault.deString("SMPL:3");
- private final RootOidDefault oid4 = RootOidDefault.deString("RFCG:4");
- private final RootOidDefault oid5 = RootOidDefault.deString("PRNT:5");
+ private OidMarshaller oidMarshaller = new OidMarshaller();
+
+ private final RootOidDefault oid3 = RootOidDefault.deString("SMPL:3", oidMarshaller );
+ private final RootOidDefault oid4 = RootOidDefault.deString("RFCG:4", oidMarshaller);
+ private final RootOidDefault oid5 = RootOidDefault.deString("PRNT:5", oidMarshaller);
@Before
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/SqlObjectStore.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/SqlObjectStore.java?rev=1373642&r1=1373641&r2=1373642&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/SqlObjectStore.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/SqlObjectStore.java Wed Aug 15 21:43:44 2012
@@ -323,7 +323,7 @@ public final class SqlObjectStore implem
}
@Override
- public List<ObjectAdapter> getInstances(final PersistenceQuery query) {
+ public List<ObjectAdapter> loadInstancesAndAdapt(final PersistenceQuery query) {
if (query instanceof PersistenceQueryFindByTitle) {
return findByTitle((PersistenceQueryFindByTitle) query);
} else if (query instanceof PersistenceQueryFindAllInstances) {
@@ -413,7 +413,7 @@ public final class SqlObjectStore implem
@Override
- public ObjectAdapter getObject(final TypedOid oid) {
+ public ObjectAdapter loadInstanceAndAdapt(final TypedOid oid) {
final DatabaseConnector connection = connectionPool.acquire();
final ObjectSpecification objectSpec = getSpecificationLookup().lookupBySpecId(oid.getObjectSpecId());
final ObjectMapping mapper = objectMappingLookup.getMapping(objectSpec, connection);
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AutoMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AutoMapper.java?rev=1373642&r1=1373641&r2=1373642&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AutoMapper.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AutoMapper.java Wed Aug 15 21:43:44 2012
@@ -28,6 +28,7 @@ import org.apache.isis.core.commons.debu
import org.apache.isis.core.commons.debug.DebuggableWithTitle;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.adapter.oid.TypedOid;
import org.apache.isis.core.metamodel.adapter.util.InvokeUtils;
@@ -53,6 +54,7 @@ import org.apache.isis.runtimes.dflt.run
import org.apache.isis.runtimes.dflt.runtime.persistence.ObjectNotFoundException;
import org.apache.isis.runtimes.dflt.runtime.persistence.PersistorUtil;
import org.apache.isis.runtimes.dflt.runtime.persistence.query.PersistenceQueryFindByPattern;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
import org.apache.log4j.Logger;
public class AutoMapper extends AbstractAutoMapper implements ObjectMapping, DebuggableWithTitle {
@@ -267,7 +269,7 @@ public class AutoMapper extends Abstract
final Results rs = connector.select(completeSelectStatement(sql));
final ObjectSpecification objectSpec = getSpecificationLoader().lookupBySpecId(typedOid.getObjectSpecId());
if (rs.next()) {
- return loadObject(connector, objectSpec, rs);
+ return loadMappedObject(connector, objectSpec, rs);
} else {
throw new ObjectNotFoundException("No object with with " + typedOid + " in table " + table);
}
@@ -340,7 +342,7 @@ public class AutoMapper extends Abstract
final Results rs = connector.select(selectStatment);
final int maxInstances = Defaults.getMaxInstances();
for (int count = 0; rs.next() && count < maxInstances; count++) {
- final ObjectAdapter instance = loadObject(connector, cls, rs);
+ final ObjectAdapter instance = loadMappedObject(connector, cls, rs);
LOG.debug(" instance " + instance);
instances.addElement(instance);
}
@@ -351,7 +353,7 @@ public class AutoMapper extends Abstract
}
}
- private ObjectAdapter loadObject(final DatabaseConnector connector, final ObjectSpecification cls, final Results rs) {
+ private ObjectAdapter loadMappedObject(final DatabaseConnector connector, final ObjectSpecification cls, final Results rs) {
final Oid oid = idMapping.recreateOid(rs, specification);
final ObjectAdapter adapter = getAdapter(cls, oid);
@@ -384,7 +386,7 @@ public class AutoMapper extends Abstract
}
} else {
rs.close();
- throw new SqlObjectStoreException("Unable to load data from " + table + " with id " + object.getOid().enString());
+ throw new SqlObjectStoreException("Unable to load data from " + table + " with id " + object.getOid().enString(getOidMarshaller()));
}
}
@@ -492,4 +494,14 @@ public class AutoMapper extends Abstract
return "AutoMapper [table=" + table + ",id=" + idMapping + ",noColumns=" + fieldMappingByField.size() + ",specification=" + specification.getFullIdentifier() + "]";
}
+
+
+ ////////////////////////////////////////////////////////////////
+ // dependencies (from context)
+ ////////////////////////////////////////////////////////////////
+
+ protected OidMarshaller getOidMarshaller() {
+ return IsisContext.getOidMarshaller();
+ }
+
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlObjectStore.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlObjectStore.java?rev=1373642&r1=1373641&r2=1373642&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlObjectStore.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlObjectStore.java Wed Aug 15 21:43:44 2012
@@ -247,7 +247,7 @@ public class XmlObjectStore implements O
ObjectAdapter adapter;
adapter = getAdapterManager().getAdapterFor(elementOid);
if (adapter == null) {
- adapter = getObject(elementOid);
+ adapter = loadInstanceAndAdapt(elementOid);
}
elements[j] = adapter;
}
@@ -315,7 +315,7 @@ public class XmlObjectStore implements O
@Override
- public ObjectAdapter getObject(final TypedOid oid) {
+ public ObjectAdapter loadInstanceAndAdapt(final TypedOid oid) {
LOG.debug("getObject " + oid);
final Data data = dataManager.loadData((RootOidDefault) oid);
LOG.debug(" data read " + data);
@@ -361,7 +361,7 @@ public class XmlObjectStore implements O
// /////////////////////////////////////////////////////////
@Override
- public List<ObjectAdapter> getInstances(final PersistenceQuery persistenceQuery) {
+ public List<ObjectAdapter> loadInstancesAndAdapt(final PersistenceQuery persistenceQuery) {
if (!(persistenceQuery instanceof PersistenceQueryBuiltIn)) {
throw new IllegalArgumentException(MessageFormat.format("Provided PersistenceQuery not supported; was {0}; " + "the XML object store only supports {1}", persistenceQuery.getClass().getName(), PersistenceQueryBuiltIn.class.getName()));
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/xml/XmlDataManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/xml/XmlDataManager.java?rev=1373642&r1=1373641&r2=1373642&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/xml/XmlDataManager.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/xml/XmlDataManager.java Wed Aug 15 21:43:44 2012
@@ -34,6 +34,7 @@ import org.apache.isis.core.commons.exce
import org.apache.isis.core.commons.xml.ContentWriter;
import org.apache.isis.core.commons.xml.XmlFile;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.adapter.oid.RootOidDefault;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -133,7 +134,7 @@ public class XmlDataManager implements D
private static RootOidDefault oidFrom(final Attributes attributes) {
final String oid = attributes.getValue("oid");
- return RootOidDefault.deString(oid);
+ return RootOidDefault.deString(oid, getOidMarshaller());
}
private static FileVersion fileVersionFrom(final Attributes attributes) {
@@ -156,7 +157,7 @@ public class XmlDataManager implements D
if (tagName.equals("instance")) {
final String oidStr = attrs.getValue("oid");
- final RootOidDefault oid = RootOidDefault.deString(oidStr);
+ final RootOidDefault oid = RootOidDefault.deString(oidStr, getOidMarshaller());
instances.addElement(oid);
}
@@ -398,7 +399,7 @@ public class XmlDataManager implements D
for (final RootOid elementAt : instances) {
writer.append(" <instance");
- Utils.appendAttribute(writer, "oid", elementAt.enString());
+ Utils.appendAttribute(writer, "oid", elementAt.enString(getOidMarshaller()));
writer.append("/>\n");
}
writer.append("</instances>");
@@ -428,7 +429,7 @@ public class XmlDataManager implements D
writer.write("<");
writer.write(tag);
final RootOid oid = data.getRootOid();
- Utils.appendAttribute(writer, "oid", oid.enString());
+ Utils.appendAttribute(writer, "oid", oid.enString(getOidMarshaller()));
Utils.appendAttribute(writer, "user", "" + getAuthenticationSession().getUserName());
final long sequence = data.getVersion().getSequence();
@@ -474,7 +475,7 @@ public class XmlDataManager implements D
Assert.assertFalse(rootOidDefault.isTransient());
writer.append(" <association");
Utils.appendAttribute(writer, "field", field);
- Utils.appendAttribute(writer, "oid", rootOidDefault.enString());
+ Utils.appendAttribute(writer, "oid", rootOidDefault.enString(getOidMarshaller()));
writer.append("/>\n");
}
@@ -492,7 +493,7 @@ public class XmlDataManager implements D
throw new ObjectPersistenceException("Can't add tranisent OID (" + oid + ") to " + field + " element.");
}
writer.append(" <element ");
- Utils.appendAttribute(writer, "oid", rootOidDefault.enString());
+ Utils.appendAttribute(writer, "oid", rootOidDefault.enString(getOidMarshaller()));
writer.append("/>\n");
}
writer.append(" </multiple-association>\n");
@@ -515,7 +516,7 @@ public class XmlDataManager implements D
final Object oid = refs.elementAt(i);
writer.append(" <element");
final RootOid rootOid = (RootOid) oid;
- Utils.appendAttribute(writer, "oid", rootOid.enString());
+ Utils.appendAttribute(writer, "oid", rootOid.enString(getOidMarshaller()));
writer.append("/>\n");
}
}
@@ -538,9 +539,13 @@ public class XmlDataManager implements D
// ////////////////////////////////////////////////////////
- // From context
+ // dependencies (from context)
// ////////////////////////////////////////////////////////
-
+
+ protected static OidMarshaller getOidMarshaller() {
+ return IsisContext.getOidMarshaller();
+ }
+
protected AuthenticationSession getAuthenticationSession() {
return IsisContext.getAuthenticationSession();
}
@@ -549,4 +554,5 @@ public class XmlDataManager implements D
return IsisContext.getSpecificationLoader();
}
+
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/services/xml/XmlServiceManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/services/xml/XmlServiceManager.java?rev=1373642&r1=1373641&r2=1373642&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/services/xml/XmlServiceManager.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/services/xml/XmlServiceManager.java Wed Aug 15 21:43:44 2012
@@ -38,6 +38,7 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.runtimes.dflt.objectstores.xml.internal.data.xml.Utils;
import org.apache.isis.runtimes.dflt.objectstores.xml.internal.services.ServiceManager;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
public class XmlServiceManager implements ServiceManager {
@@ -85,7 +86,7 @@ public class XmlServiceManager implement
// Utils.appendAttribute(writer, "type", element.oid.getObjectSpecId());
// Utils.appendAttribute(writer, "id", element.oid.getIdentifier());
- Utils.appendAttribute(writer, "oid", element.oid.enString());
+ Utils.appendAttribute(writer, "oid", element.oid.enString(getOidMarshaller()));
writer.append("/>\n");
}
@@ -93,15 +94,34 @@ public class XmlServiceManager implement
}
});
}
+
+
+ ////////////////////////////////////////////////////
+ // dependencies (from context)
+ ////////////////////////////////////////////////////
+
+ protected OidMarshaller getOidMarshaller() {
+ return IsisContext.getOidMarshaller();
+ }
}
class ServiceElement {
final RootOid oid;
public ServiceElement(final RootOid oid) {
- Assert.assertNotNull("oid", oid.enString());
+ Assert.assertNotNull("oid", oid.enString(getOidMarshaller()));
this.oid = oid;
}
+
+
+ /////////////////////////////////////////////////////
+ // dependencies (from context)
+ /////////////////////////////////////////////////////
+
+ protected OidMarshaller getOidMarshaller() {
+ return IsisContext.getOidMarshaller();
+ }
+
}
class ServiceHandler extends DefaultHandler {
@@ -121,7 +141,12 @@ class ServiceHandler extends DefaultHand
}
}
+
+ ///////////////////////////////////////////////////////
+ // dependencies (from context)
+ ///////////////////////////////////////////////////////
+
protected OidMarshaller getOidMarshaller() {
- return new OidMarshaller();
+ return IsisContext.getOidMarshaller();
}
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlObjectStoreTest_toRefactor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlObjectStoreTest_toRefactor.java?rev=1373642&r1=1373641&r2=1373642&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlObjectStoreTest_toRefactor.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/XmlObjectStoreTest_toRefactor.java Wed Aug 15 21:43:44 2012
@@ -129,7 +129,7 @@ public class XmlObjectStoreTest_toRefact
public void validatesGettingObjectStoreInstances() throws Exception {
final SaveObjectCommand command = objectStore.createSaveObjectCommand(adapter1);
objectStore.execute(Collections.<PersistenceCommand> singletonList(command));
- final List<ObjectAdapter> array = objectStore.getInstances(persistenceHelper);
+ final List<ObjectAdapter> array = objectStore.loadInstancesAndAdapt(persistenceHelper);
assertTrue(array.size() == 1);
}
@@ -155,7 +155,7 @@ public class XmlObjectStoreTest_toRefact
public void validatesObjectStoreGetObject() throws Exception {
final SaveObjectCommand command = objectStore.createSaveObjectCommand(adapter1);
objectStore.execute(Collections.<PersistenceCommand> singletonList(command));
- final ObjectAdapter retrievedAdapter = objectStore.getObject((TypedOid) adapter1.getOid());
+ final ObjectAdapter retrievedAdapter = objectStore.loadInstanceAndAdapt((TypedOid) adapter1.getOid());
assertTrue(retrievedAdapter.getOid().equals(adapter1.getOid()));
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/xml/XmlDataManagerTest_instances.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/xml/XmlDataManagerTest_instances.java?rev=1373642&r1=1373641&r2=1373642&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/xml/XmlDataManagerTest_instances.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/test/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/xml/XmlDataManagerTest_instances.java Wed Aug 15 21:43:44 2012
@@ -32,6 +32,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.apache.isis.core.commons.xml.XmlFile;
+import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.adapter.oid.RootOidDefault;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
@@ -70,7 +71,7 @@ public class XmlDataManagerTest_instance
oids = new RootOid[SIZE];
data = new ObjectData[SIZE];
- pattern = new ObjectData(RootOidDefault.deString("RLE:1"), new FileVersion("user", 13));
+ pattern = new ObjectData(RootOidDefault.deString("RLE:1", new OidMarshaller()), new FileVersion("user", 13));
for (int i = 0; i < SIZE; i++) {
oids[i] = RootOidDefault.create(ObjectSpecId.of("RLE"), ""+i);
data[i] = new ObjectData(oids[i], new FileVersion("user", 13));
Modified: incubator/isis/trunk/framework/runtimes/dflt/profilestores/xml/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/profilestores/xml/pom.xml?rev=1373642&r1=1373641&r2=1373642&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/profilestores/xml/pom.xml (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/profilestores/xml/pom.xml Wed Aug 15 21:43:44 2012
@@ -85,6 +85,11 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>testsupport</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.isis.runtimes.dflt</groupId>
Modified: incubator/isis/trunk/framework/runtimes/dflt/profilestores/xml/src/main/java/org/apache/isis/runtimes/dflt/profilestores/xml/internal/UserProfileContentWriter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/profilestores/xml/src/main/java/org/apache/isis/runtimes/dflt/profilestores/xml/internal/UserProfileContentWriter.java?rev=1373642&r1=1373641&r2=1373642&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/profilestores/xml/src/main/java/org/apache/isis/runtimes/dflt/profilestores/xml/internal/UserProfileContentWriter.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/profilestores/xml/src/main/java/org/apache/isis/runtimes/dflt/profilestores/xml/internal/UserProfileContentWriter.java Wed Aug 15 21:43:44 2012
@@ -30,6 +30,7 @@ import org.apache.commons.lang.StringUti
import org.apache.isis.core.commons.encoding.DataOutputStreamExtended;
import org.apache.isis.core.commons.xml.ContentWriter;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.services.ServiceUtil;
import org.apache.isis.core.runtime.userprofile.Options;
import org.apache.isis.core.runtime.userprofile.PerspectiveEntry;
@@ -65,7 +66,7 @@ public class UserProfileContentWriter im
xml.append(" <objects>\n");
for (final Object object : perspective.getObjects()) {
final ObjectAdapter adapter = getPersistenceSession().getAdapterManager().adapterFor(object);
- xml.append(" <object>" + adapter.getOid().enString() + "</object>\n");
+ xml.append(" <object>" + adapter.getOid().enString(getOidMarshaller()) + "</object>\n");
}
xml.append(" </objects>\n");
xml.append(" </perspective>\n");
@@ -107,6 +108,10 @@ public class UserProfileContentWriter im
// Dependencies (from context)
// ///////////////////////////////////////////////////
+ protected OidMarshaller getOidMarshaller() {
+ return IsisContext.getOidMarshaller();
+ }
+
protected static PersistenceSession getPersistenceSession() {
return IsisContext.getPersistenceSession();
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/profilestores/xml/src/test/java/org/apache/isis/runtimes/dflt/profilestores/xml/internal/UserProfileDataHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/profilestores/xml/src/test/java/org/apache/isis/runtimes/dflt/profilestores/xml/internal/UserProfileDataHandlerTest.java?rev=1373642&r1=1373641&r2=1373642&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/profilestores/xml/src/test/java/org/apache/isis/runtimes/dflt/profilestores/xml/internal/UserProfileDataHandlerTest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/profilestores/xml/src/test/java/org/apache/isis/runtimes/dflt/profilestores/xml/internal/UserProfileDataHandlerTest.java Wed Aug 15 21:43:44 2012
@@ -24,20 +24,11 @@ import static org.junit.Assert.assertNot
import java.io.FileInputStream;
import java.io.InputStreamReader;
-import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.junit.Before;
-import org.junit.Test;
-import org.xml.sax.InputSource;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
-
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
+import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
@@ -45,26 +36,51 @@ import org.apache.isis.core.runtime.imag
import org.apache.isis.core.runtime.userprofile.Options;
import org.apache.isis.core.runtime.userprofile.UserProfile;
import org.apache.isis.core.runtime.userprofile.UserProfileLoader;
+import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2;
+import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2.Mode;
import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContextStatic;
import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSessionFactory;
import org.apache.isis.runtimes.dflt.runtime.system.session.IsisSessionFactory;
import org.apache.isis.runtimes.dflt.runtime.system.session.IsisSessionFactoryDefault;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.jmock.auto.Mock;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.XMLReaderFactory;
public class UserProfileDataHandlerTest {
+ @Rule
+ public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
+
+ @Mock
+ private TemplateImageLoader mockTemplateImageLoader;
+ @Mock
+ private SpecificationLoaderSpi mockSpecificationLoader;
+ @Mock
+ private AuthenticationManager mockAuthenticationManager;
+ @Mock
+ private AuthorizationManager mockAuthorizationManager;
+ @Mock
+ private UserProfileLoader mockUserProfileLoader;
+ @Mock
+ private PersistenceSessionFactory mockPersistenceSessionFactory;
+
private TestServiceObject1 service;
private UserProfile profile;
+
@Before
public void setup() throws Exception {
Logger.getRootLogger().setLevel(Level.OFF);
- final Mockery mockery = new JUnit4Mockery();
- final ArrayList<Object> servicesList = new ArrayList<Object>();
service = new TestServiceObject1();
- servicesList.add(service);
- final IsisSessionFactory executionContextFactory = new IsisSessionFactoryDefault(DeploymentType.EXPLORATION, new IsisConfigurationDefault(), mockery.mock(TemplateImageLoader.class), mockery.mock(SpecificationLoaderSpi.class), mockery.mock(AuthenticationManager.class),
- mockery.mock(AuthorizationManager.class), mockery.mock(UserProfileLoader.class), mockery.mock(PersistenceSessionFactory.class), servicesList);
+ final IsisSessionFactory executionContextFactory = new IsisSessionFactoryDefault(DeploymentType.EXPLORATION, new IsisConfigurationDefault(), mockTemplateImageLoader, mockSpecificationLoader, mockAuthenticationManager,
+ mockAuthorizationManager, mockUserProfileLoader, mockPersistenceSessionFactory, Arrays.<Object>asList(service), new OidMarshaller());
IsisContextStatic.createRelaxedInstance(executionContextFactory);
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adaptermanager/AdapterManagerDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adaptermanager/AdapterManagerDefault.java?rev=1373642&r1=1373641&r2=1373642&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adaptermanager/AdapterManagerDefault.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adaptermanager/AdapterManagerDefault.java Wed Aug 15 21:43:44 2012
@@ -40,6 +40,7 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.adapter.oid.AggregatedOid;
import org.apache.isis.core.metamodel.adapter.oid.CollectionOid;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.adapter.oid.TypedOid;
import org.apache.isis.core.metamodel.adapter.version.Version;
@@ -440,7 +441,7 @@ public class AdapterManagerDefault imple
// associate root adapter with the new Oid, and remap
if (LOG.isDebugEnabled()) {
- LOG.debug("replacing Oid for root adapter and re-adding into maps; oid is now: " + persistedRootOid.enString() + " (was: " + transientRootOid.enString() + ")");
+ LOG.debug("replacing Oid for root adapter and re-adding into maps; oid is now: " + persistedRootOid.enString(getOidMarshaller()) + " (was: " + transientRootOid.enString(getOidMarshaller()) + ")");
}
adapter.replaceOid(persistedRootOid);
oidAdapterMap.add(persistedRootOid, adapter);
@@ -498,7 +499,7 @@ public class AdapterManagerDefault imple
}
}
- private static Object getCollectionPojo(final OneToManyAssociation association, final ObjectAdapter ownerAdapter) {
+ private static Object getCollectionPojo(final OneToManyAssociation association, final ObjectAdapter ownerAdapter) {
final PropertyOrCollectionAccessorFacet accessor = association.getFacet(PropertyOrCollectionAccessorFacet.class);
return accessor.getProperty(ownerAdapter);
}
@@ -726,6 +727,10 @@ public class AdapterManagerDefault imple
// Dependencies (from context)
// /////////////////////////////////////////////////////////////////
+ protected OidMarshaller getOidMarshaller() {
+ return IsisContext.getOidMarshaller();
+ }
+
public OidGenerator getOidGenerator() {
return IsisContext.getPersistenceSession().getOidGenerator();
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/IsisObjectStoreDelegating.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/IsisObjectStoreDelegating.java?rev=1373642&r1=1373641&r2=1373642&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/IsisObjectStoreDelegating.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/IsisObjectStoreDelegating.java Wed Aug 15 21:43:44 2012
@@ -134,8 +134,8 @@ public class IsisObjectStoreDelegating i
// ////////////////////////////////////////////////
@Override
- public ObjectAdapter getObject(final TypedOid oid) {
- return underlying.getObject(oid);
+ public ObjectAdapter loadInstanceAndAdapt(final TypedOid oid) {
+ return underlying.loadInstanceAndAdapt(oid);
}
@Override
@@ -153,8 +153,8 @@ public class IsisObjectStoreDelegating i
// ////////////////////////////////////////////////
@Override
- public List<ObjectAdapter> getInstances(final PersistenceQuery persistenceQuery) {
- return underlying.getInstances(persistenceQuery);
+ public List<ObjectAdapter> loadInstancesAndAdapt(final PersistenceQuery persistenceQuery) {
+ return underlying.loadInstancesAndAdapt(persistenceQuery);
}
@Override
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/IsisObjectStoreLogger.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/IsisObjectStoreLogger.java?rev=1373642&r1=1373641&r2=1373642&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/IsisObjectStoreLogger.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/IsisObjectStoreLogger.java Wed Aug 15 21:43:44 2012
@@ -25,6 +25,7 @@ import org.apache.isis.core.commons.conf
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.commons.factory.InstanceCreationException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.adapter.oid.TypedOid;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -37,6 +38,7 @@ import org.apache.isis.runtimes.dflt.run
import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.transaction.DestroyObjectCommand;
import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.transaction.PersistenceCommand;
import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.transaction.SaveObjectCommand;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceQuery;
public class IsisObjectStoreLogger extends Logger implements ObjectStoreSpi {
@@ -59,7 +61,7 @@ public class IsisObjectStoreLogger exten
@Override
public void registerService(final RootOid rootOid) {
- log("registering service: " + rootOid.enString());
+ log("registering service: " + rootOid.enString(getOidMarshaller()));
underlying.registerService(rootOid);
}
@@ -91,15 +93,15 @@ public class IsisObjectStoreLogger exten
}
@Override
- public List<ObjectAdapter> getInstances(final PersistenceQuery criteria) throws ObjectPersistenceException, UnsupportedFindException {
+ public List<ObjectAdapter> loadInstancesAndAdapt(final PersistenceQuery criteria) throws ObjectPersistenceException, UnsupportedFindException {
log("get instances matching " + criteria);
- return underlying.getInstances(criteria);
+ return underlying.loadInstancesAndAdapt(criteria);
}
@Override
- public ObjectAdapter getObject(final TypedOid oid) throws ObjectNotFoundException, ObjectPersistenceException {
- final ObjectAdapter adapter = underlying.getObject(oid);
+ public ObjectAdapter loadInstanceAndAdapt(final TypedOid oid) throws ObjectNotFoundException, ObjectPersistenceException {
+ final ObjectAdapter adapter = underlying.loadInstanceAndAdapt(oid);
log("get object for " + oid + " (of type '" + oid.getObjectSpecId() + "')", adapter.getObject());
return adapter;
}
@@ -108,7 +110,7 @@ public class IsisObjectStoreLogger exten
public RootOid getOidForService(ObjectSpecification serviceSpec) {
final RootOid serviceOid = underlying.getOidForService(serviceSpec);
if(serviceOid != null) {
- log("get OID for service: " + serviceOid.enString());
+ log("get OID for service: " + serviceOid.enString(getOidMarshaller()));
} else {
log("get OID for service: null (presumably in the process of being registered for '" + serviceSpec.getSpecId() + "')");
}
@@ -188,4 +190,15 @@ public class IsisObjectStoreLogger exten
public void abortTransaction() {
underlying.abortTransaction();
}
+
+
+ /////////////////////////////////////////////
+ // Dependencies (from context)
+ /////////////////////////////////////////////
+
+ protected OidMarshaller getOidMarshaller() {
+ return IsisContext.getOidMarshaller();
+ }
+
+
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/snapshot/XmlSnapshotBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/snapshot/XmlSnapshotBuilder.java?rev=1373642&r1=1373641&r2=1373642&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/snapshot/XmlSnapshotBuilder.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/snapshot/XmlSnapshotBuilder.java Wed Aug 15 21:43:44 2012
@@ -25,6 +25,7 @@ import com.google.common.collect.Lists;
import org.apache.isis.applib.snapshot.Snapshottable;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
+import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.runtime.snapshot.XmlSchema;
import org.apache.isis.core.runtime.snapshot.XmlSnapshot;
import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
@@ -42,6 +43,7 @@ public class XmlSnapshotBuilder {
private final Snapshottable snapshottable;
private XmlSchema schema;
+ private OidMarshaller oidMarshaller = new OidMarshaller();
static class PathAndAnnotation {
public PathAndAnnotation(final String path, final String annotation) {
@@ -64,6 +66,11 @@ public class XmlSnapshotBuilder {
return this;
}
+ public XmlSnapshotBuilder usingOidMarshaller(final OidMarshaller oidMarshaller) {
+ this.oidMarshaller = oidMarshaller;
+ return this;
+ }
+
public XmlSnapshotBuilder includePath(final String path) {
return includePathAndAnnotation(path, null);
}
@@ -75,7 +82,7 @@ public class XmlSnapshotBuilder {
public XmlSnapshot build() {
final ObjectAdapter adapter = getAdapterManager().adapterFor(snapshottable);
- final XmlSnapshot snapshot = (schema != null) ? new XmlSnapshot(adapter, schema) : new XmlSnapshot(adapter);
+ final XmlSnapshot snapshot = (schema != null) ? new XmlSnapshot(adapter, schema, oidMarshaller) : new XmlSnapshot(adapter, oidMarshaller);
for (final XmlSnapshotBuilder.PathAndAnnotation paa : paths) {
if (paa.annotation != null) {
snapshot.include(paa.path, paa.annotation);
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/IsisSystemFixturesHookAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/IsisSystemFixturesHookAbstract.java?rev=1373642&r1=1373641&r2=1373642&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/IsisSystemFixturesHookAbstract.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/IsisSystemFixturesHookAbstract.java Wed Aug 15 21:43:44 2012
@@ -28,6 +28,7 @@ import org.apache.isis.applib.fixtures.L
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.commons.debug.DebuggableWithTitle;
+import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
import org.apache.isis.core.runtime.about.AboutIsis;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
@@ -193,6 +194,18 @@ public abstract class IsisSystemFixtures
}
// ///////////////////////////////////////////
+ // OidMarshaller
+ // ///////////////////////////////////////////
+
+ /**
+ * Just returns a {@link OidMarshaller}; subclasses may override if
+ * required.
+ */
+ protected OidMarshaller obtainOidMarshaller() {
+ return new OidMarshaller();
+ }
+
+ // ///////////////////////////////////////////
// Reflector
// ///////////////////////////////////////////
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContext.java?rev=1373642&r1=1373641&r2=1373642&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContext.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/context/IsisContext.java Wed Aug 15 21:43:44 2012
@@ -32,6 +32,7 @@ import org.apache.isis.core.commons.debu
import org.apache.isis.core.commons.debug.DebugList;
import org.apache.isis.core.commons.debug.DebuggableWithTitle;
import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
@@ -379,6 +380,16 @@ public abstract class IsisContext implem
return getSessionFactory().getServices();
}
+ /**
+ * Convenience method.
+ *
+ * @see IsisSessionFactory#getOidMarshaller()
+ */
+ public static OidMarshaller getOidMarshaller() {
+ return getSessionFactory().getOidMarshaller();
+ }
+
+
// ///////////////////////////////////////////////////////////
// Static Convenience methods (session scoped)
// ///////////////////////////////////////////////////////////
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/AdapterManagerSpi.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/AdapterManagerSpi.java?rev=1373642&r1=1373641&r2=1373642&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/AdapterManagerSpi.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/AdapterManagerSpi.java Wed Aug 15 21:43:44 2012
@@ -24,9 +24,7 @@ import org.apache.isis.core.commons.comp
import org.apache.isis.core.commons.components.SessionScopedComponent;
import org.apache.isis.core.commons.debug.DebuggableWithTitle;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.ResolveState;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
-import org.apache.isis.core.metamodel.adapter.mgr.AdapterRecreator;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.algorithm.PersistAlgorithm;
@@ -46,7 +44,6 @@ import org.apache.isis.runtimes.dflt.run
* maps to an {@link ObjectAdapter adapter} and these are reused.
*/
public interface AdapterManagerSpi extends AdapterManager, Iterable<ObjectAdapter>,
- AdapterRecreator,
RecreatedPojoRemapper,
AdapterLifecycleTransitioner,
SessionScopedComponent,
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/ObjectStore.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/ObjectStore.java?rev=1373642&r1=1373641&r2=1373642&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/ObjectStore.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/ObjectStore.java Wed Aug 15 21:43:44 2012
@@ -26,6 +26,8 @@ import org.apache.isis.core.commons.comp
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.debug.DebuggableWithTitle;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
+import org.apache.isis.core.metamodel.adapter.oid.CollectionOid;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.adapter.oid.TypedOid;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -114,12 +116,23 @@ public interface ObjectStore extends Deb
void execute(final List<PersistenceCommand> commands);
// ///////////////////////////////////////////////////////
- // getObject
+ // loadInstancesAndAdapt, hasInstances
+ // ///////////////////////////////////////////////////////
+
+ List<ObjectAdapter> loadInstancesAndAdapt(PersistenceQuery persistenceQuery);
+
+ boolean hasInstances(ObjectSpecification specification);
+
+ // ///////////////////////////////////////////////////////
+ // loadInstanceAndAdapt
// ///////////////////////////////////////////////////////
/**
* Retrieves the object identified by the specified {@link TypedOid} from the object
- * store. The cache should be checked first and, if the object is cached,
+ * store, {@link RecreatedPojoRemapper#mapRecreatedPojo(org.apache.isis.core.metamodel.adapter.oid.Oid, Object) mapped} into
+ * the {@link AdapterManager}.
+ *
+ * <p>The cache should be checked first and, if the object is cached,
* the cached version should be returned. It is important that if this
* method is called again, while the originally returned object is in
* working memory, then this method must return that same Java object.
@@ -137,15 +150,15 @@ public interface ObjectStore extends Deb
* specified {@link TypedOid} then a {@link ObjectNotFoundException} should be
* thrown.
*
- * <para>Note that the OID could be for an internal collection, and is
- * therefore related to the parent object (using a <class>CompositeOid
- * </class>). The elements for an internal collection are commonly stored as
+ * <p>
+ * Note that the OID could be for an internal collection, and is
+ * therefore related to the parent object (using a {@link CollectionOid}).
+ * The elements for an internal collection are commonly stored as
* part of the parent object, so to get element the parent object needs to
* be retrieved first, and the internal collection can be got from that.
- * </para>
*
* <p>
- * Returns the stored ObjectAdapter object .
+ * Returns the stored {@link ObjectAdapter} object.
*
*
* @return the requested {@link ObjectAdapter} that has the specified
@@ -154,34 +167,26 @@ public interface ObjectStore extends Deb
* @throws ObjectNotFoundException
* when no object corresponding to the oid can be found
*/
- ObjectAdapter getObject(TypedOid oid);
-
-
- // ///////////////////////////////////////////////////////
- // getInstances, hasInstances
- // ///////////////////////////////////////////////////////
-
- List<ObjectAdapter> getInstances(PersistenceQuery persistenceQuery);
+ ObjectAdapter loadInstanceAndAdapt(TypedOid oid);
- boolean hasInstances(ObjectSpecification specification);
// ///////////////////////////////////////////////////////
// resolveField, resolveImmediately
// ///////////////////////////////////////////////////////
/**
- * Called by the resolveEagerly method in ObjectAdapterManager.
+ * Called by the resolveImmediately method in ObjectAdapterManager.
*
- * @see PersistenceSession#resolveField(ObjectAdapter, ObjectAssociation)
+ * @see PersistenceSession#resolveImmediately(ObjectAdapter)
*/
- void resolveField(ObjectAdapter object, ObjectAssociation field);
+ void resolveImmediately(ObjectAdapter object);
/**
- * Called by the resolveImmediately method in ObjectAdapterManager.
+ * Called by the resolveEagerly method in ObjectAdapterManager.
*
- * @see PersistenceSession#resolveImmediately(ObjectAdapter)
+ * @see PersistenceSession#resolveField(ObjectAdapter, ObjectAssociation)
*/
- void resolveImmediately(ObjectAdapter object);
+ void resolveField(ObjectAdapter object, ObjectAssociation field);
// ///////////////////////////////////////////////////////
// Services
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSession.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSession.java?rev=1373642&r1=1373641&r2=1373642&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSession.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSession.java Wed Aug 15 21:43:44 2012
@@ -43,7 +43,6 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.adapter.ObjectAdapterFactory;
import org.apache.isis.core.metamodel.adapter.ResolveState;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
-import org.apache.isis.core.metamodel.adapter.mgr.AdapterRecreator;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.adapter.oid.TypedOid;
@@ -445,7 +444,7 @@ public class PersistenceSession implemen
return getTransactionManager().executeWithinTransaction(new TransactionalClosureWithReturnAbstract<List<ObjectAdapter>>() {
@Override
public List<ObjectAdapter> execute() {
- return objectStore.getInstances(persistenceQuery);
+ return objectStore.loadInstancesAndAdapt(persistenceQuery);
}
@Override
@@ -657,18 +656,17 @@ public class PersistenceSession implemen
return adapter;
}
- return loadObjectFromPersistenceLayer(oid);
+ return loadMappedObjectFromObjectStore(oid);
}
- private ObjectAdapter loadObjectFromPersistenceLayer(final TypedOid oid) {
- // the object store will map for us, using its hydrator (calls back
- // to #recreateAdapter)
- return getTransactionManager().executeWithinTransaction(new TransactionalClosureWithReturnAbstract<ObjectAdapter>() {
+ private ObjectAdapter loadMappedObjectFromObjectStore(final TypedOid oid) {
+ ObjectAdapter adapter = getTransactionManager().executeWithinTransaction(new TransactionalClosureWithReturnAbstract<ObjectAdapter>() {
@Override
public ObjectAdapter execute() {
- return objectStore.getObject(oid);
+ return objectStore.loadInstanceAndAdapt(oid);
}
});
+ return adapter;
}
// ///////////////////////////////////////////////////////////////////////////
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/session/IsisSessionFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/session/IsisSessionFactory.java?rev=1373642&r1=1373641&r2=1373642&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/session/IsisSessionFactory.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/session/IsisSessionFactory.java Wed Aug 15 21:43:44 2012
@@ -24,6 +24,8 @@ import java.util.List;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
@@ -94,4 +96,10 @@ public interface IsisSessionFactory exte
public List<Object> getServices();
+ /**
+ * The {@link OidMarshaller} to use for marshalling and unmarshalling {@link Oid}s
+ * into strings.
+ */
+ public OidMarshaller getOidMarshaller();
+
}