You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2018/09/26 10:53:07 UTC
[isis] 02/06: ISIS-1976: refactors RootOid constructors into
factory class
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit dfdecf0aa1ff7591558da025495bacbc681bbf22
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Sep 26 09:35:04 2018 +0200
ISIS-1976: refactors RootOid constructors into factory class
Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
.../isis/core/metamodel/adapter/oid/Oid.java | 42 +++++++++++++++
.../isis/core/metamodel/adapter/oid/RootOid.java | 60 +---------------------
.../core/metamodel/adapter/version/Version.java | 8 ++-
...ObjectFacetDeclarativeInitializingAbstract.java | 3 +-
.../oid/CollectionOidTest_valueSemantics.java | 4 +-
.../adapter/oid/OidMarshallerTest_marshall.java | 15 +++---
.../oid/OidMarshallerTest_roundtripping.java | 9 ++--
.../core/metamodel/adapter/oid/OidVersionTest.java | 33 ++++++------
...dDefaultTest_valueSemantics_whenPersistent.java | 12 ++---
...idDefaultTest_valueSemantics_whenTransient.java | 12 ++---
.../metamodel/adapter/oid/RootOidTest_create.java | 9 ++--
...eptionRecognizerDocDefault_recognizes_Test.java | 4 +-
.../adapterfactory/pojo/PojoAdapterTest.java | 6 +--
.../transaction/PojoAdapterBuilder.java | 5 +-
.../WrapperFactoryDefaultTest_wrappedObject.java | 4 +-
.../adapterfactory/pojo/PojoAdapterTest.java | 6 +--
.../transaction/PojoAdapterBuilder.java | 5 +-
.../WrapperFactoryDefaultTest_wrappedObject.java | 4 +-
.../PersistenceSessionServiceInternalDefault.java | 3 +-
.../ObjectAdapterContext_NewIdentifier.java | 2 +-
...ObjectAdapterContext_ObjectAdapterProvider.java | 3 +-
.../adaptermanager/ObjectAdapterLegacy.java | 3 +-
.../persistence/adaptermanager/OidProviders.java | 10 ++--
.../restfulobjects/server/util/OidUtils.java | 3 +-
.../model/mementos/ObjectAdapterMemento.java | 3 +-
.../widgets/breadcrumbs/BreadcrumbModel.java | 3 +-
26 files changed, 138 insertions(+), 133 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java
index e087e12..634cbbd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java
@@ -24,6 +24,7 @@ import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.commons.encoding.Encodable;
import org.apache.isis.core.metamodel.adapter.version.Version;
+import org.apache.isis.core.metamodel.spec.ObjectSpecId;
/**
@@ -110,7 +111,48 @@ public interface Oid extends Encodable {
}
}
+ // -- FACTORIES
+
+ /** for convenience*/
+ public static final class Factory {
+
+ public static RootOid ofBookmark(final Bookmark bookmark) {
+ return RootOid.of(ObjectSpecId.of(bookmark.getObjectType()),
+ bookmark.getIdentifier(), State.from(bookmark), Version.empty());
+ }
+
+ public static RootOid viewmodelOf(ObjectSpecId objectSpecId, String mementoStr) {
+ return RootOid.of(objectSpecId, mementoStr, State.VIEWMODEL, Version.empty());
+ }
+
+ public static RootOid transientOf(final ObjectSpecId objectSpecId, final String identifier) {
+ return RootOid.of(objectSpecId, identifier, State.TRANSIENT, Version.empty());
+ }
+
+ public static RootOid persistentOf(final ObjectSpecId objectSpecId, final String identifier) {
+ return Factory.persistentOf(objectSpecId, identifier, null);
+ }
+
+ public static RootOid persistentOf(final ObjectSpecId objectSpecId, final String identifier, final Long versionSequence) {
+ return Factory.persistentOf(objectSpecId, identifier, versionSequence, null, null);
+ }
+ public static RootOid persistentOf(final ObjectSpecId objectSpecId, final String identifier, final Long versionSequence, final String versionUser) {
+ return Factory.persistentOf(objectSpecId, identifier, versionSequence, versionUser, null);
+ }
+
+ public static RootOid persistentOf(final ObjectSpecId objectSpecId, final String identifier, final Long versionSequence, final Long versionUtcTimestamp) {
+ return Factory.persistentOf(objectSpecId, identifier, versionSequence, null, versionUtcTimestamp);
+ }
+
+ public static RootOid persistentOf(final ObjectSpecId objectSpecId, final String identifier, final Long versionSequence, final String versionUser, final Long versionUtcTimestamp) {
+ return RootOid.of(objectSpecId, identifier, State.PERSISTENT,
+ Version.Factory.ifPresent(versionSequence, versionUser, versionUtcTimestamp));
+ }
+
+
+
+ }
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/RootOid.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/RootOid.java
index 1284176..bf12927 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/RootOid.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/RootOid.java
@@ -50,65 +50,9 @@ public class RootOid implements Oid, Serializable {
private Version version;
- // -- Constructor, factory methods
- public static RootOid createTransient(final ObjectSpecId objectSpecId, final String identifier) {
- return new RootOid(objectSpecId, identifier, State.TRANSIENT);
+ public static RootOid of(final ObjectSpecId objectSpecId, final String identifier, final State state) {
+ return of(objectSpecId, identifier, state, Version.empty());
}
-
- public static RootOid create(final Bookmark bookmark) {
- return new RootOid(ObjectSpecId.of(bookmark.getObjectType()), bookmark.getIdentifier(), State.from(bookmark));
- }
-
- public static RootOid create(final ObjectSpecId objectSpecId, final String identifier) {
- return create(objectSpecId, identifier, null);
- }
-
- public static RootOid create(final ObjectSpecId objectSpecId, final String identifier, final Long versionSequence) {
- return create(objectSpecId, identifier, versionSequence, null, null);
- }
-
- public static RootOid create(final ObjectSpecId objectSpecId, final String identifier, final Long versionSequence, final String versionUser) {
- return create(objectSpecId, identifier, versionSequence, versionUser, null);
- }
-
- public static RootOid create(final ObjectSpecId objectSpecId, final String identifier, final Long versionSequence, final Long versionUtcTimestamp) {
- return create(objectSpecId, identifier, versionSequence, null, versionUtcTimestamp);
- }
-
- public static RootOid create(final ObjectSpecId objectSpecId, final String identifier, final Long versionSequence, final String versionUser, final Long versionUtcTimestamp) {
- return new RootOid(objectSpecId, identifier, State.PERSISTENT,
- Version.Factory.ifPresent(versionSequence, versionUser, versionUtcTimestamp));
- }
-
- public RootOid(final ObjectSpecId objectSpecId, final String identifier, final State state) {
- this(objectSpecId, identifier, state, (Version)null);
- }
-
- public RootOid(final ObjectSpecId objectSpecId, final String identifier, final State state, final Long versionSequence) {
- this(objectSpecId, identifier, state, versionSequence, null, null);
- }
-
- /**
- * If specify version sequence, can optionally specify the user that changed the object. This is used for informational purposes only.
- */
- public RootOid(final ObjectSpecId objectSpecId, final String identifier, final State state, final Long versionSequence, final String versionUser) {
- this(objectSpecId, identifier, state, versionSequence, versionUser, null);
- }
-
- /**
- * If specify version sequence, can optionally specify utc timestamp that the oid was changed. This is used for informational purposes only.
- */
- public RootOid(final ObjectSpecId objectSpecId, final String identifier, final State state, final Long versionSequence, final Long versionUtcTimestamp) {
- this(objectSpecId, identifier, state, versionSequence, null, versionUtcTimestamp);
- }
-
- /**
- * If specify version sequence, can optionally specify user and/or utc timestamp that the oid was changed. This is used for informational purposes only.
- */
- public RootOid(final ObjectSpecId objectSpecId, final String identifier, final State state, final Long versionSequence, final String versionUser, final Long versionUtcTimestamp) {
- this(objectSpecId, identifier, state, Version.Factory.ifPresent(versionSequence, versionUser, versionUtcTimestamp));
- }
-
public static RootOid of(final ObjectSpecId objectSpecId, final String identifier, final State state, final Version version) {
return new RootOid(objectSpecId, identifier, state, version);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/Version.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/Version.java
index 9c2d34c..43702b1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/Version.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/Version.java
@@ -57,6 +57,10 @@ public final class Version implements Serializable, Encodable {
// -- FACTORIES
+ public static Version empty() {
+ return Factory.EMPTY_VERSION;
+ }
+
public static Version of(long sequence, @Nullable String user) {
return of(sequence, user, Factory.EMPTY_TIMESTAMP);
}
@@ -64,7 +68,7 @@ public final class Version implements Serializable, Encodable {
public static Version of(long sequence, @Nullable String user, long utcTimestamp) {
return new Version(sequence, user, utcTimestamp);
}
-
+
// -- constructor, fields
private final long sequence;
@@ -230,4 +234,6 @@ public final class Version implements Serializable, Encodable {
+
+
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeInitializingAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeInitializingAbstract.java
index 117e4e6..cb7511d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeInitializingAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeInitializingAbstract.java
@@ -69,7 +69,8 @@ extends RecreatableObjectFacetAbstract {
final ObjectAdapter viewModelAdapter = adapterProvider.adapterForViewModel(
viewModelPojo,
(ObjectSpecId objectSpecId)->
- new RootOid(objectSpecId, mementoStr, Oid.State.VIEWMODEL) );
+ Oid.Factory.viewmodelOf(objectSpecId, mementoStr) );
+
final ObjectSpecification spec = viewModelAdapter.getSpecification();
final Stream<OneToOneAssociation> properties = spec.streamProperties(Contributed.EXCLUDED);
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/CollectionOidTest_valueSemantics.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/CollectionOidTest_valueSemantics.java
index 46657df..a2d2c1f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/CollectionOidTest_valueSemantics.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/CollectionOidTest_valueSemantics.java
@@ -27,8 +27,8 @@ import org.apache.isis.core.unittestsupport.value.ValueTypeContractTestAbstract;
public class CollectionOidTest_valueSemantics extends ValueTypeContractTestAbstract<ParentedCollectionOid> {
- private final RootOid parent = new RootOid(ObjectSpecId.of("CUS"), "123", State.PERSISTENT);
- private final RootOid otherParent = new RootOid(ObjectSpecId.of("CUS"), "124", State.PERSISTENT);
+ private final RootOid parent = RootOid.of(ObjectSpecId.of("CUS"), "123", State.PERSISTENT);
+ private final RootOid otherParent = RootOid.of(ObjectSpecId.of("CUS"), "124", State.PERSISTENT);
@Override
protected List<ParentedCollectionOid> getObjectsWithSameValue() {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_marshall.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_marshall.java
index 24eae7c..014174b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_marshall.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_marshall.java
@@ -21,6 +21,7 @@ package org.apache.isis.core.metamodel.adapter.oid;
import org.junit.Before;
import org.junit.Test;
+import org.apache.isis.core.metamodel.adapter.oid.Oid.Factory;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import static org.hamcrest.CoreMatchers.equalTo;
@@ -37,45 +38,45 @@ public class OidMarshallerTest_marshall {
@Test
public void rootOid() {
- final String marshal = oidMarshaller.marshal(RootOid.create(ObjectSpecId.of("CUS"), "123"));
+ final String marshal = oidMarshaller.marshal(Factory.persistentOf(ObjectSpecId.of("CUS"), "123"));
assertThat(marshal, equalTo("CUS:123"));
}
@Test
public void rootOid_transient() {
- final String marshal = oidMarshaller.marshal(RootOid.createTransient(ObjectSpecId.of("CUS"), "123"));
+ final String marshal = oidMarshaller.marshal(Factory.transientOf(ObjectSpecId.of("CUS"), "123"));
assertThat(marshal, equalTo("!CUS:123"));
}
@Test
public void rootOid_versionSequence() {
- final String marshal = oidMarshaller.marshal(RootOid.create(ObjectSpecId.of("CUS"), "123", 90807L));
+ final String marshal = oidMarshaller.marshal(Factory.persistentOf(ObjectSpecId.of("CUS"), "123", 90807L));
assertThat(marshal, equalTo("CUS:123^90807::"));
}
@Test
public void rootOid_versionSequenceAndUser() {
- final String marshal = oidMarshaller.marshal(RootOid.create(ObjectSpecId.of("CUS"), "123", 90807L, "joebloggs"));
+ final String marshal = oidMarshaller.marshal(Factory.persistentOf(ObjectSpecId.of("CUS"), "123", 90807L, "joebloggs"));
assertThat(marshal, equalTo("CUS:123^90807:joebloggs:"));
}
@Test
public void rootOid_versionSequenceAndUserThatHasAnAtSymbol() {
final ObjectSpecId objectSpecId = ObjectSpecId.of("CUS");
- final RootOid oid = RootOid.create(objectSpecId, "123", 90807L, "joebloggs@foo.bar");
+ final RootOid oid = Factory.persistentOf(objectSpecId, "123", 90807L, "joebloggs@foo.bar");
final String marshal = oidMarshaller.marshal(oid);
assertThat(marshal, equalTo("CUS:123^90807:joebloggs@foo.bar:"));
}
@Test
public void rootOid_versionSequenceAndUtc() {
- final String marshal = oidMarshaller.marshal(RootOid.create(ObjectSpecId.of("CUS"), "123", 90807L, 3453452141L));
+ final String marshal = oidMarshaller.marshal(Factory.persistentOf(ObjectSpecId.of("CUS"), "123", 90807L, 3453452141L));
assertThat(marshal, equalTo("CUS:123^90807::3453452141"));
}
@Test
public void rootOid_versionSequenceAndUserAndUtc() {
- final String marshal = oidMarshaller.marshal(RootOid.create(ObjectSpecId.of("CUS"), "123", 90807L, "joebloggs", 3453452141L));
+ final String marshal = oidMarshaller.marshal(Factory.persistentOf(ObjectSpecId.of("CUS"), "123", 90807L, "joebloggs", 3453452141L));
assertThat(marshal, equalTo("CUS:123^90807:joebloggs:3453452141"));
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_roundtripping.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_roundtripping.java
index c98bd98..7724a68 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_roundtripping.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_roundtripping.java
@@ -21,6 +21,7 @@ package org.apache.isis.core.metamodel.adapter.oid;
import org.junit.Test;
+import org.apache.isis.core.metamodel.adapter.oid.Oid.Factory;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import static org.hamcrest.CoreMatchers.is;
@@ -33,7 +34,7 @@ public class OidMarshallerTest_roundtripping {
@Test
public void rootOid_withNoVersion() {
- RootOid oid = RootOid.create(ObjectSpecId.of("CUS"), "123");
+ RootOid oid = Factory.persistentOf(ObjectSpecId.of("CUS"), "123");
final String enString = oid.enString();
final RootOid deString = RootOid.deString(enString);
@@ -42,7 +43,7 @@ public class OidMarshallerTest_roundtripping {
@Test
public void rootOid_withVersion() {
- RootOid oid = RootOid.create(ObjectSpecId.of("CUS"), "123", 90807L);
+ RootOid oid = Factory.persistentOf(ObjectSpecId.of("CUS"), "123", 90807L);
final String enString = oid.enString();
final RootOid deString = RootOid.deString(enString);
@@ -54,7 +55,7 @@ public class OidMarshallerTest_roundtripping {
@Test
public void collectionOid_withNoVersion() {
- RootOid parentOid = RootOid.create(ObjectSpecId.of("CUS"), "123");
+ RootOid parentOid = Factory.persistentOf(ObjectSpecId.of("CUS"), "123");
ParentedCollectionOid oid = new ParentedCollectionOid(parentOid, "items");
final String enString = oid.enString();
@@ -64,7 +65,7 @@ public class OidMarshallerTest_roundtripping {
@Test
public void collectionOid_withVersion() {
- RootOid parentOid = RootOid.create(ObjectSpecId.of("CUS"), "123", 90807L);
+ RootOid parentOid = Factory.persistentOf(ObjectSpecId.of("CUS"), "123", 90807L);
ParentedCollectionOid oid = new ParentedCollectionOid(parentOid, "items");
final String enString = oid.enString();
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidVersionTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidVersionTest.java
index b501494..d09b806 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidVersionTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidVersionTest.java
@@ -20,6 +20,7 @@ package org.apache.isis.core.metamodel.adapter.oid;
import org.junit.Test;
+import org.apache.isis.core.metamodel.adapter.oid.Oid.Factory;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import static org.hamcrest.CoreMatchers.equalTo;
@@ -36,64 +37,64 @@ public class OidVersionTest {
@Test
public void whenEquivalentAndSameVersion() throws Exception {
- oid1 = RootOid.create(cusObjectSpecId, "123", 90807L);
- oid2 = RootOid.create(cusObjectSpecId, "123", 90807L);
+ oid1 = Factory.persistentOf(cusObjectSpecId, "123", 90807L);
+ oid2 = Factory.persistentOf(cusObjectSpecId, "123", 90807L);
assertThat(oid1, is(equalTo(oid2)));
}
@Test
public void whenEquivalentAndDifferentVersions() throws Exception {
- oid1 = RootOid.create(cusObjectSpecId, "123", 90807L);
- oid2 = RootOid.create(cusObjectSpecId, "123", 90808L);
+ oid1 = Factory.persistentOf(cusObjectSpecId, "123", 90807L);
+ oid2 = Factory.persistentOf(cusObjectSpecId, "123", 90808L);
assertThat(oid1, is(equalTo(oid2)));
}
@Test
public void whenEquivalentAndNoVersionInfoForLeftHand() throws Exception {
- oid1 = RootOid.create(cusObjectSpecId, "123");
- oid2 = RootOid.create(cusObjectSpecId, "123", 90808L);
+ oid1 = Factory.persistentOf(cusObjectSpecId, "123");
+ oid2 = Factory.persistentOf(cusObjectSpecId, "123", 90808L);
assertThat(oid1, is(equalTo(oid2)));
}
@Test
public void whenEquivalentAndNoVersionInfoForRightHand() throws Exception {
- oid1 = RootOid.create(cusObjectSpecId, "123", 90807L);
- oid2 = RootOid.create(cusObjectSpecId, "123");
+ oid1 = Factory.persistentOf(cusObjectSpecId, "123", 90807L);
+ oid2 = Factory.persistentOf(cusObjectSpecId, "123");
assertThat(oid1, is(equalTo(oid2)));
}
@Test
public void whenEquivalentAndNoVersionInfoForEither() throws Exception {
- oid1 = RootOid.create(cusObjectSpecId, "123");
- oid2 = RootOid.create(cusObjectSpecId, "123");
+ oid1 = Factory.persistentOf(cusObjectSpecId, "123");
+ oid2 = Factory.persistentOf(cusObjectSpecId, "123");
assertThat(oid1, is(equalTo(oid2)));
}
@Test
public void whenNotEquivalentById() throws Exception {
- oid1 = RootOid.create(cusObjectSpecId, "123");
- oid2 = RootOid.create(cusObjectSpecId, "124");
+ oid1 = Factory.persistentOf(cusObjectSpecId, "123");
+ oid2 = Factory.persistentOf(cusObjectSpecId, "124");
assertThat(oid1, is(not(equalTo(oid2))));
}
@Test
public void whenNotEquivalentByObjectSpecId() throws Exception {
- oid1 = RootOid.create(cusObjectSpecId, "123");
- oid2 = RootOid.create(ordObjectSpecId, "123");
+ oid1 = Factory.persistentOf(cusObjectSpecId, "123");
+ oid2 = Factory.persistentOf(ordObjectSpecId, "123");
assertThat(oid1, is(not(equalTo(oid2))));
}
@Test
public void whenNotEquivalentByState() throws Exception {
- oid1 = RootOid.create(cusObjectSpecId, "123");
- oid2 = RootOid.createTransient(cusObjectSpecId, "123");
+ oid1 = Factory.persistentOf(cusObjectSpecId, "123");
+ oid2 = Factory.transientOf(cusObjectSpecId, "123");
assertThat(oid1, is(not(equalTo(oid2))));
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenPersistent.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenPersistent.java
index 7ae1f95..d39b1be 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenPersistent.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenPersistent.java
@@ -30,17 +30,17 @@ public class RootOidDefaultTest_valueSemantics_whenPersistent extends ValueTypeC
@Override
protected List<RootOid> getObjectsWithSameValue() {
return Arrays.asList(
- new RootOid(ObjectSpecId.of("CUS"), "123", State.PERSISTENT),
- new RootOid(ObjectSpecId.of("CUS"), "123", State.PERSISTENT),
- new RootOid(ObjectSpecId.of("CUS"), "123", State.PERSISTENT));
+ RootOid.of(ObjectSpecId.of("CUS"), "123", State.PERSISTENT),
+ RootOid.of(ObjectSpecId.of("CUS"), "123", State.PERSISTENT),
+ RootOid.of(ObjectSpecId.of("CUS"), "123", State.PERSISTENT));
}
@Override
protected List<RootOid> getObjectsWithDifferentValue() {
return Arrays.asList(
- new RootOid(ObjectSpecId.of("CUS"), "123", State.TRANSIENT),
- new RootOid(ObjectSpecId.of("CUS"), "124", State.PERSISTENT),
- new RootOid(ObjectSpecId.of("CUX"), "123", State.PERSISTENT));
+ RootOid.of(ObjectSpecId.of("CUS"), "123", State.TRANSIENT),
+ RootOid.of(ObjectSpecId.of("CUS"), "124", State.PERSISTENT),
+ RootOid.of(ObjectSpecId.of("CUX"), "123", State.PERSISTENT));
}
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenTransient.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenTransient.java
index 4b893dc..d7fffdf 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenTransient.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenTransient.java
@@ -30,18 +30,18 @@ public class RootOidDefaultTest_valueSemantics_whenTransient extends ValueTypeCo
@Override
protected List<RootOid> getObjectsWithSameValue() {
return Arrays.asList(
- new RootOid(ObjectSpecId.of("CUS"), "123", State.TRANSIENT),
- new RootOid(ObjectSpecId.of("CUS"), "123", State.TRANSIENT),
- new RootOid(ObjectSpecId.of("CUS"), "123", State.TRANSIENT)
+ RootOid.of(ObjectSpecId.of("CUS"), "123", State.TRANSIENT),
+ RootOid.of(ObjectSpecId.of("CUS"), "123", State.TRANSIENT),
+ RootOid.of(ObjectSpecId.of("CUS"), "123", State.TRANSIENT)
);
}
@Override
protected List<RootOid> getObjectsWithDifferentValue() {
return Arrays.asList(
- new RootOid(ObjectSpecId.of("CUS"), "123", State.PERSISTENT),
- new RootOid(ObjectSpecId.of("CUS"), "124", State.TRANSIENT),
- new RootOid(ObjectSpecId.of("CUX"), "123", State.TRANSIENT));
+ RootOid.of(ObjectSpecId.of("CUS"), "123", State.PERSISTENT),
+ RootOid.of(ObjectSpecId.of("CUS"), "124", State.TRANSIENT),
+ RootOid.of(ObjectSpecId.of("CUX"), "123", State.TRANSIENT));
}
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidTest_create.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidTest_create.java
index c1f2537..d5032c4 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidTest_create.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidTest_create.java
@@ -20,6 +20,7 @@ package org.apache.isis.core.metamodel.adapter.oid;
import org.junit.Test;
+import org.apache.isis.core.metamodel.adapter.oid.Oid.Factory;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import static org.hamcrest.CoreMatchers.is;
@@ -32,7 +33,7 @@ public class RootOidTest_create {
@Test
public void create() throws Exception {
ObjectSpecId objectSpecId = ObjectSpecId.of("CUS");
- RootOid oid = RootOid.create(objectSpecId, "123");
+ RootOid oid = Factory.persistentOf(objectSpecId, "123");
assertThat(oid.getObjectSpecId(), is(objectSpecId));
assertThat(oid.getIdentifier(), is("123"));
assertThat(oid.getVersion(), is(nullValue()));
@@ -43,7 +44,7 @@ public class RootOidTest_create {
@Test
public void createTransient() throws Exception {
ObjectSpecId objectSpecId = ObjectSpecId.of("CUS");
- RootOid oid = RootOid.createTransient(objectSpecId, "123");
+ RootOid oid = Factory.transientOf(objectSpecId, "123");
assertThat(oid.getObjectSpecId(), is(objectSpecId));
assertThat(oid.getIdentifier(), is("123"));
assertThat(oid.getVersion(), is(nullValue()));
@@ -55,7 +56,7 @@ public class RootOidTest_create {
@Test
public void createWithVersion() throws Exception {
ObjectSpecId objectSpecId = ObjectSpecId.of("CUS");
- RootOid oid = RootOid.create(objectSpecId, "123", 456L);
+ RootOid oid = Factory.persistentOf(objectSpecId, "123", 456L);
assertThat(oid.getObjectSpecId(), is(objectSpecId));
assertThat(oid.getIdentifier(), is("123"));
assertThat(oid.getVersion().getSequence(), is(456L));
@@ -66,7 +67,7 @@ public class RootOidTest_create {
@Test
public void createTransientNoVersion() throws Exception {
ObjectSpecId objectSpecId = ObjectSpecId.of("CUS");
- RootOid oid = RootOid.createTransient(objectSpecId, "123");
+ RootOid oid = Factory.transientOf(objectSpecId, "123");
assertThat(oid.getObjectSpecId(), is(objectSpecId));
assertThat(oid.getIdentifier(), is("123"));
assertThat(oid.getVersion(), is(nullValue()));
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/exceprecog/ExceptionRecognizerDocDefault_recognizes_Test.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/exceprecog/ExceptionRecognizerDocDefault_recognizes_Test.java
index ebbb81a..949b208 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/exceprecog/ExceptionRecognizerDocDefault_recognizes_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/exceprecog/ExceptionRecognizerDocDefault_recognizes_Test.java
@@ -23,7 +23,7 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.core.metamodel.adapter.oid.RootOid;
+import org.apache.isis.core.metamodel.adapter.oid.Oid.Factory;
import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
@@ -54,7 +54,7 @@ public class ExceptionRecognizerDocDefault_recognizes_Test {
@Test
public void whenConcurrencyException_is_recognized() throws Exception {
- ex = new ConcurrencyException("foo", RootOid.create(ObjectSpecId.of("CUS"), "123"));
+ ex = new ConcurrencyException("foo", Factory.persistentOf(ObjectSpecId.of("CUS"), "123"));
assertThat(excepRecognizer.recognize(ex), is(not(nullValue())));
}
diff --git a/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java b/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
index 2c2a5b7..2df642c 100644
--- a/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
+++ b/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
@@ -26,7 +26,7 @@ import java.util.Date;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.oid.RootOid;
+import org.apache.isis.core.metamodel.adapter.oid.Oid.Factory;
import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
import org.apache.isis.core.metamodel.adapter.version.Version;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
@@ -65,7 +65,7 @@ public class PojoAdapterTest {
public void setUp() throws Exception {
domainObject = new RuntimeTestPojo();
- adapter = new PojoAdapter(domainObject, RootOid.create(ObjectSpecId.of("CUS"), "1"), mockAuthenticationSession,
+ adapter = new PojoAdapter(domainObject, Factory.persistentOf(ObjectSpecId.of("CUS"), "1"), mockAuthenticationSession,
mockSpecificationLoader, mockPersistenceSession);
adapter.setVersion(mockVersion);
@@ -92,7 +92,7 @@ public class PojoAdapterTest {
@Test
public void getOid_initially() {
- assertEquals(RootOid.create(ObjectSpecId.of("CUS"), "1"), adapter.getOid());
+ assertEquals(Factory.persistentOf(ObjectSpecId.of("CUS"), "1"), adapter.getOid());
}
@Test
diff --git a/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java b/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
index 14dedef..463a886 100644
--- a/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
+++ b/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
@@ -23,6 +23,7 @@ import java.util.Iterator;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.oid.Oid.Factory;
import org.apache.isis.core.metamodel.adapter.oid.ParentedCollectionOid;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.adapter.version.Version;
@@ -67,13 +68,13 @@ public class PojoAdapterBuilder {
TRANSIENT {
@Override
RootOid createOid(ObjectSpecId objectSpecId, String identifier) {
- return RootOid.createTransient(objectSpecId, identifier);
+ return Factory.transientOf(objectSpecId, identifier);
}
},
PERSISTENT {
@Override
RootOid createOid(ObjectSpecId objectSpecId, String identifier) {
- return RootOid.create(objectSpecId, identifier);
+ return Factory.persistentOf(objectSpecId, identifier);
}
},
VALUE {
diff --git a/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java b/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
index f343937..7b20492 100644
--- a/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
+++ b/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
@@ -41,7 +41,7 @@ import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider;
-import org.apache.isis.core.metamodel.adapter.oid.RootOid;
+import org.apache.isis.core.metamodel.adapter.oid.Oid.Factory;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
@@ -166,7 +166,7 @@ public class WrapperFactoryDefaultTest_wrappedObject {
will(returnValue(mockAuthenticationSessionProvider));
allowing(mockEmployeeAdapter).getOid();
- will(returnValue(RootOid.create(ObjectSpecId.of("EMP"), "1")));
+ will(returnValue(Factory.persistentOf(ObjectSpecId.of("EMP"), "1")));
allowing(mockEmployeeSpec).getCorrespondingClass();
will(returnValue(Employee.class));
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
index faafc59..d035492 100644
--- a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
+++ b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
@@ -26,7 +26,7 @@ import java.util.Date;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.oid.RootOid;
+import org.apache.isis.core.metamodel.adapter.oid.Oid.Factory;
import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
import org.apache.isis.core.metamodel.adapter.version.Version;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
@@ -65,7 +65,7 @@ public class PojoAdapterTest {
public void setUp() throws Exception {
domainObject = new RuntimeTestPojo();
- adapter = new PojoAdapter(domainObject, RootOid.create(ObjectSpecId.of("CUS"), "1"), mockAuthenticationSession,
+ adapter = new PojoAdapter(domainObject, Factory.persistentOf(ObjectSpecId.of("CUS"), "1"), mockAuthenticationSession,
mockSpecificationLoader, mockPersistenceSession);
adapter.setVersion(mockVersion);
@@ -92,7 +92,7 @@ public class PojoAdapterTest {
@Test
public void getOid_initially() {
- assertEquals(RootOid.create(ObjectSpecId.of("CUS"), "1"), adapter.getOid());
+ assertEquals(Factory.persistentOf(ObjectSpecId.of("CUS"), "1"), adapter.getOid());
}
@Test
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
index 125ebb6..cda1a8f 100644
--- a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
+++ b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
@@ -23,6 +23,7 @@ import java.util.Iterator;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.oid.Oid.Factory;
import org.apache.isis.core.metamodel.adapter.oid.ParentedCollectionOid;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.adapter.version.Version;
@@ -67,13 +68,13 @@ public class PojoAdapterBuilder {
TRANSIENT {
@Override
RootOid createOid(ObjectSpecId objectSpecId, String identifier) {
- return RootOid.createTransient(objectSpecId, identifier);
+ return Factory.transientOf(objectSpecId, identifier);
}
},
PERSISTENT {
@Override
RootOid createOid(ObjectSpecId objectSpecId, String identifier) {
- return RootOid.create(objectSpecId, identifier);
+ return Factory.persistentOf(objectSpecId, identifier);
}
},
VALUE {
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
index dc64ff8..e453008 100644
--- a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
+++ b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
@@ -45,7 +45,7 @@ import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider;
-import org.apache.isis.core.metamodel.adapter.oid.RootOid;
+import org.apache.isis.core.metamodel.adapter.oid.Oid.Factory;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
@@ -166,7 +166,7 @@ public class WrapperFactoryDefaultTest_wrappedObject {
will(returnValue(mockAuthenticationSessionProvider));
allowing(mockEmployeeAdapter).getOid();
- will(returnValue(RootOid.create(ObjectSpecId.of("EMP"), "1")));
+ will(returnValue(Factory.persistentOf(ObjectSpecId.of("EMP"), "1")));
allowing(mockEmployeeSpec).getCorrespondingClass();
will(returnValue(Employee.class));
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java
index 9117a6b..5c0800c 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java
@@ -41,6 +41,7 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider;
import org.apache.isis.core.metamodel.adapter.concurrency.ConcurrencyChecking;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.oid.Oid.Factory;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -87,7 +88,7 @@ public class PersistenceSessionServiceInternalDefault implements PersistenceSess
final Bookmark bookmark,
final BookmarkService.FieldResetPolicy fieldResetPolicy) {
- final RootOid rootOid = RootOid.create(bookmark);
+ final RootOid rootOid = Factory.ofBookmark(bookmark);
final PersistenceSession ps = getPersistenceSession();
final boolean denyRefresh = fieldResetPolicy == BookmarkService.FieldResetPolicy.DONT_REFRESH;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_NewIdentifier.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_NewIdentifier.java
index e7e930e..da71211 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_NewIdentifier.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_NewIdentifier.java
@@ -73,7 +73,7 @@ class ObjectAdapterContext_NewIdentifier {
final String identifier = persistenceSession.identifierFor(pojo);
final ObjectSpecId objectSpecId = spec.getSpecId();
- return new RootOid(objectSpecId, identifier, Oid.State.PERSISTENT);
+ return RootOid.of(objectSpecId, identifier, Oid.State.PERSISTENT);
}
}
\ No newline at end of file
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ObjectAdapterProvider.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ObjectAdapterProvider.java
index a92c5cf..565a79c 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ObjectAdapterProvider.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ObjectAdapterProvider.java
@@ -32,6 +32,7 @@ import org.apache.isis.commons.internal.base._Lazy;
import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider;
+import org.apache.isis.core.metamodel.adapter.oid.Oid.Factory;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
@@ -113,7 +114,7 @@ class ObjectAdapterContext_ObjectAdapterProvider implements ObjectAdapterProvide
final ObjectSpecification objectSpecification =
specificationLoader.loadSpecification(viewModelPojo.getClass());
final ObjectSpecId objectSpecId = objectSpecification.getSpecId();
- final RootOid newRootOid = RootOid.create(objectSpecId, UUID.randomUUID().toString());
+ final RootOid newRootOid = Factory.persistentOf(objectSpecId, UUID.randomUUID().toString());
final ObjectAdapter createdAdapter = objectAdapterContext.createRootOrAggregatedAdapter(newRootOid, viewModelPojo);
return createdAdapter;
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterLegacy.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterLegacy.java
index cfc866c..eef15a2 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterLegacy.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterLegacy.java
@@ -27,6 +27,7 @@ import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.oid.Oid.Factory;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
@@ -80,7 +81,7 @@ public class ObjectAdapterLegacy {
}
private static ObjectAdapter adapterFor(final Bookmark bookmark) {
- final RootOid rootOid = RootOid.create(bookmark);
+ final RootOid rootOid = Factory.ofBookmark(bookmark);
return adapterFor(rootOid);
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/OidProviders.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/OidProviders.java
index 491e836..8a77f0f 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/OidProviders.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/OidProviders.java
@@ -60,7 +60,7 @@ public class OidProviders {
@Override
public RootOid oidFor(Object pojo, ObjectSpecification spec) {
final String identifier = PersistenceSession.SERVICE_IDENTIFIER;
- return new RootOid(spec.getSpecId(), identifier, Oid.State.PERSISTENT);
+ return RootOid.of(spec.getSpecId(), identifier, Oid.State.PERSISTENT);
}
}
@@ -82,10 +82,10 @@ public class OidProviders {
final boolean isRecognized = persistenceSession.isRecognized(pojo);
if(isRecognized) {
final String identifier = persistenceSession.identifierFor(pojo);
- return new RootOid(spec.getSpecId(), identifier, Oid.State.PERSISTENT);
+ return RootOid.of(spec.getSpecId(), identifier, Oid.State.PERSISTENT);
} else {
final String identifier = UUID.randomUUID().toString();
- return new RootOid(spec.getSpecId(), identifier, Oid.State.TRANSIENT);
+ return RootOid.of(spec.getSpecId(), identifier, Oid.State.TRANSIENT);
}
}
@@ -116,7 +116,7 @@ public class OidProviders {
public RootOid oidFor(Object pojo, ObjectSpecification spec) {
final ViewModelFacet recreatableObjectFacet = spec.getFacet(ViewModelFacet.class);
final String identifier = recreatableObjectFacet.memento(pojo);
- return new RootOid(spec.getSpecId(), identifier, Oid.State.VIEWMODEL);
+ return RootOid.of(spec.getSpecId(), identifier, Oid.State.VIEWMODEL);
}
}
@@ -131,7 +131,7 @@ public class OidProviders {
@Override
public RootOid oidFor(Object pojo, ObjectSpecification spec) {
final String identifier = UUID.randomUUID().toString();
- return new RootOid(spec.getSpecId(), identifier, Oid.State.TRANSIENT);
+ return RootOid.of(spec.getSpecId(), identifier, Oid.State.TRANSIENT);
}
}
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/OidUtils.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/OidUtils.java
index 4700dff..4bda8d1 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/OidUtils.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/OidUtils.java
@@ -25,6 +25,7 @@ import org.apache.isis.core.metamodel.adapter.concurrency.ConcurrencyChecking;
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.version.Version;
import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -113,7 +114,7 @@ public final class OidUtils {
// ("*") from the specId, meaning that the marshalling logic above in RootOidDefault.deString() creates an
// oid in the wrong state. The code below checks for this and recreates the oid with the current state of 'view model'
if(!rootOid.isViewModel()) {
- return new RootOid(rootOid.getObjectSpecId(), rootOid.getIdentifier(), Oid.State.VIEWMODEL);
+ return RootOid.of(rootOid.getObjectSpecId(), rootOid.getIdentifier(), Oid.State.VIEWMODEL);
}
return rootOid;
}
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java
index a7a1bdf..5a26c9c 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java
@@ -34,6 +34,7 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider;
import org.apache.isis.core.metamodel.adapter.concurrency.ConcurrencyChecking;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.oid.Oid.Factory;
import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
@@ -620,7 +621,7 @@ public class ObjectAdapterMemento implements Serializable {
}
public static Function<ObjectAdapterMemento, RootOid> toOid() {
- return objectAdapterMemento->RootOid.create(objectAdapterMemento.asBookmark());
+ return objectAdapterMemento->Factory.ofBookmark(objectAdapterMemento.asBookmark());
}
}
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
index a5ca7c0..c19bd96 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
@@ -27,6 +27,7 @@ import com.google.common.collect.Maps;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.applib.services.bookmark.Bookmark;
+import org.apache.isis.core.metamodel.adapter.oid.Oid.Factory;
import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
@@ -161,7 +162,7 @@ public class BreadcrumbModel implements Serializable {
}
protected EntityModel toEntityModel(final Bookmark bookmark) {
- RootOid rootOid = RootOid.create(bookmark);
+ RootOid rootOid = Factory.ofBookmark(bookmark);
ObjectAdapterMemento oam = ObjectAdapterMemento.createPersistent(rootOid);
return new EntityModel(oam);
}