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 2015/09/08 08:51:14 UTC
[03/12] isis git commit: ISIS-1194: removing
RootOid#compareAgainst(...) and RootOid#asPersistent(), since neither used.
ISIS-1194: removing RootOid#compareAgainst(...) and RootOid#asPersistent(), since neither used.
Also renaming some method that mention "ResolveState" in their name
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/fea41bfa
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/fea41bfa
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/fea41bfa
Branch: refs/heads/master
Commit: fea41bfa6e4b4ec71cd3e5cda95ad44539c25b9a
Parents: a91eef5
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Sep 7 18:48:55 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Sep 7 18:48:55 2015 +0100
----------------------------------------------------------------------
.../isis/core/metamodel/adapter/oid/Oid.java | 1 +
.../core/metamodel/adapter/oid/RootOid.java | 45 +-------
.../metamodel/adapter/oid/RootOidDefault.java | 23 ----
.../metamodel/adapter/oid/OidVersionTest.java | 16 +--
.../oid/RootOidDefaultTest_compareAgainst.java | 110 -------------------
.../adaptermanager/AdapterManagerDefault.java | 26 ++---
6 files changed, 14 insertions(+), 207 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/fea41bfa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java
----------------------------------------------------------------------
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 64d8178..7e54e7d 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
@@ -46,6 +46,7 @@ public interface Oid extends Encodable {
String enStringNoVersion(OidMarshaller oidMarshaller);
Version getVersion();
+
void setVersion(Version version);
/**
http://git-wip-us.apache.org/repos/asf/isis/blob/fea41bfa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/RootOid.java
----------------------------------------------------------------------
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 a701b22..e565685 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
@@ -21,6 +21,7 @@ package org.apache.isis.core.metamodel.adapter.oid;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.core.metamodel.adapter.version.Version;
+import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
@@ -31,7 +32,7 @@ import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
* <p>
* The root adapter/pojo can be recreated with no further information; the
* {@link #getObjectSpecId()} can be used to fetch the corresponding
- * {@link ObjectSpecification} using {@link SpecificationLoaderSpi#lookupBySpecId(String)}.
+ * {@link ObjectSpecification} using {@link SpecificationLoaderSpi#lookupBySpecId(ObjectSpecId)}.
*
* <p>
* <p>
@@ -50,48 +51,6 @@ public interface RootOid extends TypedOid {
void setVersion(Version version);
-
- /**
- * Returns a new RootOid for the same {@link #getObjectSpecId()}, but persistent and with the specified {@link #getIdentifier() identifier}.
- */
- RootOid asPersistent(String identifier);
-
- /**
- * The result of performing a {@link #compareTo(Comparison) comparison.}
- */
- public static enum Comparison {
- /**
- * The two {@link RootOid oid}s identify the same domain object,
- * (meaning {@link RootOid#equals(Object) equals} method returns <tt>true</tt>)
- * and the {@link RootOid#getVersion() version information} held within the
- * oid is the same.
- */
- EQUIVALENT_AND_UNCHANGED,
- /**
- * The two {@link RootOid oid}s identify the same domain object,
- * (meaning {@link RootOid#equals(Object) equals} method returns <tt>true</tt>)
- * but the {@link RootOid#getVersion() version information} held within the
- * oid is the different.
- */
- EQUIVALENT_BUT_CHANGED,
- /**
- * The two {@link RootOid oid}s identify the same domain object,
- * (meaning {@link RootOid#equals(Object) equals} method returns <tt>true</tt>)
- * but there is no {@link RootOid#getVersion() version information} so
- * cannot determine whether the domain object has changed.
- */
- EQUIVALENT_BUT_NO_VERSION_INFO,
- /**
- * The two {@link RootOid oid}s identify the different domain objects,
- * (meaning {@link RootOid#equals(Object) equals} method returns <tt>false</tt>).
- *
- * <p>
- */
- NOT_EQUIVALENT,
- }
-
- Comparison compareAgainst(RootOid oid2);
-
Bookmark asBookmark();
http://git-wip-us.apache.org/repos/asf/isis/blob/fea41bfa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefault.java
index 5600716..0748e03 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefault.java
@@ -216,17 +216,6 @@ public final class RootOidDefault implements Serializable, RootOid {
}
- // ////////////////////////////////////////////
- // asPersistent
- // ////////////////////////////////////////////
-
- @Override
- public RootOidDefault asPersistent(final String identifier) {
- Ensure.ensureThatState(state.isTransient(), is(true));
- Ensure.ensureThatArg(identifier, is(not(nullValue())));
-
- return new RootOidDefault(objectSpecId, identifier, State.PERSISTENT);
- }
// ////////////////////////////////////////////
@@ -242,18 +231,6 @@ public final class RootOidDefault implements Serializable, RootOid {
this.version = version;
}
- @Override
- public Comparison compareAgainst(final RootOid other) {
- if(!equals(other)) {
- return Comparison.NOT_EQUIVALENT;
- }
- if(getVersion() == null || other.getVersion() == null) {
- return Comparison.EQUIVALENT_BUT_NO_VERSION_INFO;
- }
- return getVersion().equals(other.getVersion())
- ? Comparison.EQUIVALENT_AND_UNCHANGED
- : Comparison.EQUIVALENT_BUT_CHANGED;
- }
// ////////////////////////////////////////////
// bookmark
http://git-wip-us.apache.org/repos/asf/isis/blob/fea41bfa/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidVersionTest.java
----------------------------------------------------------------------
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 e217aca..8f87443 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
@@ -18,15 +18,15 @@
*/
package org.apache.isis.core.metamodel.adapter.oid;
+import org.junit.Test;
+
+import org.apache.isis.core.metamodel.spec.ObjectSpecId;
+
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.junit.Assert.assertThat;
-import org.junit.Test;
-
-import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-
public class OidVersionTest {
private ObjectSpecId cusObjectSpecId = ObjectSpecId.of("CUS");
@@ -40,7 +40,6 @@ public class OidVersionTest {
oid2 = RootOidDefault.create(cusObjectSpecId, "123", 90807L);
assertThat(oid1, is(equalTo(oid2)));
- assertThat(oid1.compareAgainst(oid2), is(RootOid.Comparison.EQUIVALENT_AND_UNCHANGED));
}
@Test
@@ -49,7 +48,6 @@ public class OidVersionTest {
oid2 = RootOidDefault.create(cusObjectSpecId, "123", 90808L);
assertThat(oid1, is(equalTo(oid2)));
- assertThat(oid1.compareAgainst(oid2), is(RootOid.Comparison.EQUIVALENT_BUT_CHANGED));
}
@Test
@@ -58,7 +56,6 @@ public class OidVersionTest {
oid2 = RootOidDefault.create(cusObjectSpecId, "123", 90808L);
assertThat(oid1, is(equalTo(oid2)));
- assertThat(oid1.compareAgainst(oid2), is(RootOid.Comparison.EQUIVALENT_BUT_NO_VERSION_INFO));
}
@Test
@@ -67,7 +64,6 @@ public class OidVersionTest {
oid2 = RootOidDefault.create(cusObjectSpecId, "123");
assertThat(oid1, is(equalTo(oid2)));
- assertThat(oid1.compareAgainst(oid2), is(RootOid.Comparison.EQUIVALENT_BUT_NO_VERSION_INFO));
}
@Test
@@ -76,7 +72,6 @@ public class OidVersionTest {
oid2 = RootOidDefault.create(cusObjectSpecId, "123");
assertThat(oid1, is(equalTo(oid2)));
- assertThat(oid1.compareAgainst(oid2), is(RootOid.Comparison.EQUIVALENT_BUT_NO_VERSION_INFO));
}
@Test
@@ -85,7 +80,6 @@ public class OidVersionTest {
oid2 = RootOidDefault.create(cusObjectSpecId, "124");
assertThat(oid1, is(not(equalTo(oid2))));
- assertThat(oid1.compareAgainst(oid2), is(RootOid.Comparison.NOT_EQUIVALENT));
}
@Test
@@ -94,7 +88,6 @@ public class OidVersionTest {
oid2 = RootOidDefault.create(ordObjectSpecId, "123");
assertThat(oid1, is(not(equalTo(oid2))));
- assertThat(oid1.compareAgainst(oid2), is(RootOid.Comparison.NOT_EQUIVALENT));
}
@Test
@@ -103,7 +96,6 @@ public class OidVersionTest {
oid2 = RootOidDefault.createTransient(cusObjectSpecId, "123");
assertThat(oid1, is(not(equalTo(oid2))));
- assertThat(oid1.compareAgainst(oid2), is(RootOid.Comparison.NOT_EQUIVALENT));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/fea41bfa/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_compareAgainst.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_compareAgainst.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_compareAgainst.java
deleted file mode 100644
index adee8c3..0000000
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_compareAgainst.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.core.metamodel.adapter.oid;
-
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
-
-import org.junit.Test;
-
-import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-
-public class RootOidDefaultTest_compareAgainst {
-
- private ObjectSpecId cusObjectSpecId = ObjectSpecId.of("CUS");
- private ObjectSpecId ordObjectSpecId = ObjectSpecId.of("ORD");
-
- private RootOid oid1, oid2;
-
- @Test
- public void whenEquivalentAndSameVersion() throws Exception {
- oid1 = RootOidDefault.create(cusObjectSpecId, "123", 90807L);
- oid2 = RootOidDefault.create(cusObjectSpecId, "123", 90807L);
-
- assertThat(oid1, is(equalTo(oid2)));
- assertThat(oid1.compareAgainst(oid2), is(RootOid.Comparison.EQUIVALENT_AND_UNCHANGED));
- }
-
- @Test
- public void whenEquivalentAndDifferentVersions() throws Exception {
- oid1 = RootOidDefault.create(cusObjectSpecId, "123", 90807L);
- oid2 = RootOidDefault.create(cusObjectSpecId, "123", 90808L);
-
- assertThat(oid1, is(equalTo(oid2)));
- assertThat(oid1.compareAgainst(oid2), is(RootOid.Comparison.EQUIVALENT_BUT_CHANGED));
- }
-
- @Test
- public void whenEquivalentAndNoVersionInfoForLeftHand() throws Exception {
- oid1 = RootOidDefault.create(cusObjectSpecId, "123");
- oid2 = RootOidDefault.create(cusObjectSpecId, "123", 90808L);
-
- assertThat(oid1, is(equalTo(oid2)));
- assertThat(oid1.compareAgainst(oid2), is(RootOid.Comparison.EQUIVALENT_BUT_NO_VERSION_INFO));
- }
-
- @Test
- public void whenEquivalentAndNoVersionInfoForRightHand() throws Exception {
- oid1 = RootOidDefault.create(cusObjectSpecId, "123", 90807L);
- oid2 = RootOidDefault.create(cusObjectSpecId, "123");
-
- assertThat(oid1, is(equalTo(oid2)));
- assertThat(oid1.compareAgainst(oid2), is(RootOid.Comparison.EQUIVALENT_BUT_NO_VERSION_INFO));
- }
-
- @Test
- public void whenEquivalentAndNoVersionInfoForEither() throws Exception {
- oid1 = RootOidDefault.create(cusObjectSpecId, "123");
- oid2 = RootOidDefault.create(cusObjectSpecId, "123");
-
- assertThat(oid1, is(equalTo(oid2)));
- assertThat(oid1.compareAgainst(oid2), is(RootOid.Comparison.EQUIVALENT_BUT_NO_VERSION_INFO));
- }
-
- @Test
- public void whenNotEquivalentById() throws Exception {
- oid1 = RootOidDefault.create(cusObjectSpecId, "123");
- oid2 = RootOidDefault.create(cusObjectSpecId, "124");
-
- assertThat(oid1, is(not(equalTo(oid2))));
- assertThat(oid1.compareAgainst(oid2), is(RootOid.Comparison.NOT_EQUIVALENT));
- }
-
- @Test
- public void whenNotEquivalentByObjectSpecId() throws Exception {
- oid1 = RootOidDefault.create(cusObjectSpecId, "123");
- oid2 = RootOidDefault.create(ordObjectSpecId, "123");
-
- assertThat(oid1, is(not(equalTo(oid2))));
- assertThat(oid1.compareAgainst(oid2), is(RootOid.Comparison.NOT_EQUIVALENT));
- }
-
- @Test
- public void whenNotEquivalentByState() throws Exception {
- oid1 = RootOidDefault.create(cusObjectSpecId, "123");
- oid2 = RootOidDefault.createTransient(cusObjectSpecId, "123");
-
- assertThat(oid1, is(not(equalTo(oid2))));
- assertThat(oid1.compareAgainst(oid2), is(RootOid.Comparison.NOT_EQUIVALENT));
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/fea41bfa/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java
index 637a8f0..2ece4ba 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java
@@ -280,7 +280,7 @@ public class AdapterManagerDefault implements AdapterManager, Iterable<ObjectAda
// persistence of collection follows the parent
final CollectionOid collectionOid = new CollectionOid((TypedOid) parentOid, otma);
- final ObjectAdapter collectionAdapter = createCollectionAdapterAndInferResolveState(pojo, collectionOid);
+ final ObjectAdapter collectionAdapter = createCollectionAdapter(pojo, collectionOid);
// we copy over the type onto the adapter itself
// [not sure why this is really needed, surely we have enough info in
@@ -412,10 +412,10 @@ public class AdapterManagerDefault implements AdapterManager, Iterable<ObjectAda
final ObjectAdapter createdAdapter;
if(oid instanceof RootOid) {
final RootOid rootOid = (RootOid) oid;
- createdAdapter = createRootAdapterAndInferResolveState(pojo, rootOid);
+ createdAdapter = createRootAdapter(pojo, rootOid);
} else if (oid instanceof CollectionOid){
final CollectionOid collectionOid = (CollectionOid) oid;
- createdAdapter = createCollectionAdapterAndInferResolveState(pojo, collectionOid);
+ createdAdapter = createCollectionAdapter(pojo, collectionOid);
} else {
final AggregatedOid aggregatedOid = (AggregatedOid) oid;
createdAdapter = createAggregatedAdapter(pojo, aggregatedOid);
@@ -630,7 +630,7 @@ public class AdapterManagerDefault implements AdapterManager, Iterable<ObjectAda
*/
protected final ObjectAdapter createTransientOrViewModelRootAdapter(final Object pojo) {
final RootOid rootOid = getOidGenerator().createTransientOrViewModelOid(pojo);
- return createRootAdapterAndInferResolveState(pojo, rootOid);
+ return createRootAdapter(pojo, rootOid);
}
/**
@@ -655,28 +655,16 @@ public class AdapterManagerDefault implements AdapterManager, Iterable<ObjectAda
* root {@link ObjectAdapter adapter} for the supplied domain object.
*
* @see #createStandaloneAdapterAndSetResolveState(Object)
- * @see #createCollectionAdapterAndInferResolveState(Object, CollectionOid)
+ * @see #createCollectionAdapter(Object, CollectionOid)
*/
- private ObjectAdapter createRootAdapterAndInferResolveState(final Object pojo, RootOid rootOid) {
+ private ObjectAdapter createRootAdapter(final Object pojo, RootOid rootOid) {
Ensure.ensureThatArg(rootOid, is(not(nullValue())));
final ObjectAdapter rootAdapter = getObjectAdapterFactory().createAdapter(pojo, rootOid, this);
- doPostCreateRootAdapter(rootAdapter);
return rootAdapter;
}
- /**
- * Hook method for objectstores to register the newly created root-adapter.
- *
- * <p>
- * For example, the JDO DataNucleus object store uses this to attach the pojo
- * into its persistence context. This enables dirty tracking and lazy loading of the
- * pojo.
- */
- protected void doPostCreateRootAdapter(ObjectAdapter rootAdapter) {
-
- }
- private ObjectAdapter createCollectionAdapterAndInferResolveState(final Object pojo, CollectionOid collectionOid) {
+ private ObjectAdapter createCollectionAdapter(final Object pojo, CollectionOid collectionOid) {
Ensure.ensureThatArg(collectionOid, is(not(nullValue())));
final ObjectAdapter collectionAdapter = getObjectAdapterFactory().createAdapter(pojo, collectionOid, this);
return collectionAdapter;