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 2019/07/18 09:45:30 UTC
[isis] branch v2 updated: ISIS-2154 removes
ObjectAdapter.checkLock(Version version)
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
The following commit(s) were added to refs/heads/v2 by this push:
new 2a9c205 ISIS-2154 removes ObjectAdapter.checkLock(Version version)
2a9c205 is described below
commit 2a9c20512fa299ad0e1dfeda11077dd62ee05336
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Jul 18 11:45:23 2019 +0200
ISIS-2154 removes ObjectAdapter.checkLock(Version version)
---
.../isis/metamodel/adapter/ObjectAdapter.java | 11 ----
.../adapterfactory/pojo/PojoAdapterTest.java | 65 +++++++++++-----------
.../persistence/adapter/ObjectAdapterForBean.java | 4 --
.../runtime/persistence/adapter/PojoAdapter.java | 26 ---------
4 files changed, 33 insertions(+), 73 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/ObjectAdapter.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/ObjectAdapter.java
index d9e62dd..16a3ec0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/ObjectAdapter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/ObjectAdapter.java
@@ -31,7 +31,6 @@ import org.apache.isis.commons.internal.base._Tuples.Tuple2;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.metamodel.adapter.oid.Oid;
import org.apache.isis.metamodel.adapter.oid.ParentedOid;
-import org.apache.isis.metamodel.adapter.version.ConcurrencyException;
import org.apache.isis.metamodel.adapter.version.Version;
import org.apache.isis.metamodel.commons.ClassExtensions;
import org.apache.isis.metamodel.commons.ListExtensions;
@@ -54,16 +53,6 @@ import org.apache.isis.metamodel.spec.ObjectSpecification;
public interface ObjectAdapter extends ManagedObject {
/**
- * Checks the version of this adapter to make sure that it does not differ
- * from the specified version.
- *
- * @throws ConcurrencyException
- * if the specified version differs from the version held this
- * adapter.
- */
- void checkLock(Version version); //XXX[2033] not referenced at all
-
- /**
* The object's unique {@link Oid}.
*
* <p>
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
index d411bdc..54d0fe5 100644
--- a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
+++ b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
@@ -112,37 +112,38 @@ public class PojoAdapterTest {
assertSame(mockVersion, adapter.getVersion());
}
- @Test
- public void checkLock_whenVersionsSame() throws Exception {
-
- context.checking(new Expectations() {
- {
- oneOf(mockVersion).different(mockVersion2);
- will(returnValue(false));
- }
- });
-
- adapter.checkLock(mockVersion2);
- }
-
- @Test(expected=ConcurrencyException.class)
- public void checkLock_whenVersionsDifferent() throws Exception {
-
- adapter = PojoAdapterBuilder.create()
- .with(mockSpecificationLoader)
- .withTitleString("some pojo")
- .with(mockVersion)
- .with(mockAuthenticationSession)
- .build();
-
- context.checking(new Expectations() {
- {
- oneOf(mockVersion).different(mockVersion2);
- will(returnValue(true));
- }
- });
-
- adapter.checkLock(mockVersion2);
- }
+//TODO[2154] remove
+// @Test
+// public void checkLock_whenVersionsSame() throws Exception {
+//
+// context.checking(new Expectations() {
+// {
+// oneOf(mockVersion).different(mockVersion2);
+// will(returnValue(false));
+// }
+// });
+//
+// adapter.checkLock(mockVersion2);
+// }
+//
+// @Test(expected=ConcurrencyException.class)
+// public void checkLock_whenVersionsDifferent() throws Exception {
+//
+// adapter = PojoAdapterBuilder.create()
+// .with(mockSpecificationLoader)
+// .withTitleString("some pojo")
+// .with(mockVersion)
+// .with(mockAuthenticationSession)
+// .build();
+//
+// context.checking(new Expectations() {
+// {
+// oneOf(mockVersion).different(mockVersion2);
+// will(returnValue(true));
+// }
+// });
+//
+// adapter.checkLock(mockVersion2);
+// }
}
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapter/ObjectAdapterForBean.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapter/ObjectAdapterForBean.java
index eb3dfdd..0bc931f 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapter/ObjectAdapterForBean.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapter/ObjectAdapterForBean.java
@@ -32,10 +32,6 @@ public class ObjectAdapterForBean implements ObjectAdapter {
}
@Override
- public void checkLock(Version version) {
- }
-
- @Override
public Oid getOid() {
val spec = getSpecification();
return Oid.Factory.persistentOf(spec.getSpecId(), bean.getId());
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapter/PojoAdapter.java b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapter/PojoAdapter.java
index bf191fc..736f88c 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapter/PojoAdapter.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapter/PojoAdapter.java
@@ -214,32 +214,6 @@ public final class PojoAdapter implements ObjectAdapter {
}
}
-
- @Override
- public void checkLock(final Version otherVersion) {
- if(isParentedCollection()) {
- getAggregateRoot().checkLock(otherVersion);
- return;
- }
-
- Oid thisOid = getOid();
- final Version thisVersion = thisOid.getVersion();
-
- // check for exception, but don't throw if suppressed through thread-local
- if(thisVersion != null &&
- otherVersion != null &&
- thisVersion.different(otherVersion)) {
-
-// if(ConcurrencyChecking.isCurrentlyEnabled()) {
-// log.info("concurrency conflict detected on {} ({})", thisOid, otherVersion);
-// final String currentUser = authenticationSession.getUserName();
-// throw new ConcurrencyException(currentUser, thisOid, thisVersion, otherVersion);
-// } else {
- log.info("concurrency conflict detected but suppressed, on {} ({})", thisOid, otherVersion );
-// }
- }
- }
-
@Override
public void setVersion(final Version version) {
if(isParentedCollection()) {