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 2020/10/05 08:18:30 UTC
[isis] branch 2441-auditing updated: ISIS-2441: finally move
ObjectAdapter to JDO (no longer used in core)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch 2441-auditing
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/2441-auditing by this push:
new fb72954 ISIS-2441: finally move ObjectAdapter to JDO (no longer used in core)
fb72954 is described below
commit fb729540e1ff6314081b0483162809f9349aaef4
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Oct 5 10:18:19 2020 +0200
ISIS-2441: finally move ObjectAdapter to JDO (no longer used in core)
---
.../isis/core/metamodel/adapter/package-info.java | 32 ----------------------
.../collections/JavaCollectionFacetTest.java | 6 ++--
.../DomainObjectLayoutFactoryTest.java | 16 +++++------
.../ident/cssclass/CssClassFacetMethodTest.java | 6 ++--
.../CssClassFacetMethodWithProblemTest.java | 6 ++--
.../object/ident/icon/IconFacetMethodTest.java | 8 +++---
.../object/ident/layout/LayoutFacetMethodTest.java | 6 ++--
.../ident/title/TitleFacetViaMethodTest.java | 8 +++---
.../TitleAnnotationFacetFactoryTest.java | 4 +--
.../navparent/NavigableParentFacetMethodTest.java | 6 ++--
.../NavigableParentAnnotationFacetFactoryTest.java | 4 +--
.../ValueSemanticsProviderAbstractTestCase.java | 6 ++--
...ionParameterAbstractTest_getId_and_getName.java | 3 +-
...ObjectAssociationAbstractTest_alwaysHidden.java | 13 ++++-----
.../ValueSemanticsProviderAbstractTestCase.java | 6 ++--
...sistenceQueryFindUsingApplibQueryProcessor.java | 2 +-
.../queries/PersistenceQueryProcessorAbstract.java | 2 +-
.../datanucleus5/jdosupport/IsisJdoSupportDN5.java | 2 +-
.../datanucleus5/objectadapter}/ObjectAdapter.java | 11 +-------
.../objectadapter/ObjectAdapterContext.java | 1 -
.../ObjectAdapterContext_Factories.java | 1 -
...ObjectAdapterContext_ObjectAdapterProvider.java | 1 -
.../ObjectAdapterContext_ObjectCreation.java | 1 -
.../objectadapter/ObjectAdapterProvider.java | 2 --
.../datanucleus5/objectadapter/PojoAdapter.java | 1 -
.../persistence/IsisLifecycleListener.java | 2 +-
.../persistence/PersistenceSession5.java | 2 +-
.../persistence/query/PersistenceQueryFactory.java | 2 +-
...ersistenceQueryFindUsingApplibQueryDefault.java | 2 +-
.../adapterfactory/PojoAdapterTest.java | 2 +-
.../testing/ObjectMemberAbstractTest.java | 2 +-
.../viewer/services/mementos/ObjectMementoWkt.java | 1 -
32 files changed, 58 insertions(+), 109 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/package-info.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/package-info.java
deleted file mode 100644
index 53c74ca..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/package-info.java
+++ /dev/null
@@ -1,32 +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.
- */
-
-/**
- * Defines {@link org.apache.isis.core.metamodel.adapter.ObjectAdapter} interface,
- * a wrapper around each domain object pojo.
- *
- * <p>
- * {@link org.apache.isis.core.metamodel.adapter.ObjectAdapter} is analogous
- * to {@link java.lang.Object java.lang.Object}; from it the {@link org.apache.isis.core.metamodel.spec.ObjectSpecification}
- * can be obtained (analogous to {@link java.lang.Class java.lang.Class}.
- *
- * <p>
- * The other significant type defined by
- */
-package org.apache.isis.core.metamodel.adapter;
\ No newline at end of file
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/JavaCollectionFacetTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/JavaCollectionFacetTest.java
index 865bf23..7bc0c90 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/JavaCollectionFacetTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/JavaCollectionFacetTest.java
@@ -36,9 +36,9 @@ import static org.hamcrest.MatcherAssert.assertThat;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.core.metamodel._testing.MetaModelContext_forTesting;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.collections.javautilcollection.JavaCollectionFacet;
+import org.apache.isis.core.metamodel.spec.ManagedObject;
public class JavaCollectionFacetTest {
@@ -48,8 +48,8 @@ public class JavaCollectionFacetTest {
public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
@Mock private FacetHolder mockFacetHolder;
- @Mock private ObjectAdapter mockCollection;
- @Mock private Collection<ObjectAdapter> mockWrappedCollection;
+ @Mock private ManagedObject mockCollection;
+ @Mock private Collection<ManagedObject> mockWrappedCollection;
private MetaModelContext_forTesting metaModelContext;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
index 6c77491..7abe8be 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
@@ -28,16 +28,15 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import org.apache.isis.applib.annotation.BookmarkPolicy;
import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.annotation.ViewModelLayout;
import org.apache.isis.applib.layout.component.CssClassFaPosition;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
import org.apache.isis.core.metamodel.facets.FacetFactory;
@@ -48,6 +47,7 @@ import org.apache.isis.core.metamodel.facets.members.cssclassfa.CssClassFaFacet;
import org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet;
import org.apache.isis.core.metamodel.facets.object.paged.PagedFacet;
import org.apache.isis.core.metamodel.facets.object.plural.PluralFacet;
+import org.apache.isis.core.metamodel.spec.ManagedObject;
public class DomainObjectLayoutFactoryTest extends AbstractFacetFactoryJUnit4TestCase {
@@ -190,7 +190,7 @@ public class DomainObjectLayoutFactoryTest extends AbstractFacetFactoryJUnit4Tes
public static class CssClass extends DomainObjectLayoutFactoryTest {
@Mock
- ObjectAdapter mockAdapter;
+ ManagedObject mockAdapter;
public static class ForDomainObjectLayout extends CssClass {
@@ -273,7 +273,7 @@ public class DomainObjectLayoutFactoryTest extends AbstractFacetFactoryJUnit4Tes
public static class CssClassFa extends DomainObjectLayoutFactoryTest {
@Mock
- ObjectAdapter mockAdapter;
+ ManagedObject mockAdapter;
public static class ForDomainObjectLayout extends CssClassFa {
@@ -353,7 +353,7 @@ public class DomainObjectLayoutFactoryTest extends AbstractFacetFactoryJUnit4Tes
public static class DescribedAs extends DomainObjectLayoutFactoryTest {
@Mock
- ObjectAdapter mockAdapter;
+ ManagedObject mockAdapter;
public static class ForDomainObjectLayout extends DescribedAs {
@@ -430,7 +430,7 @@ public class DomainObjectLayoutFactoryTest extends AbstractFacetFactoryJUnit4Tes
public static class Named extends DomainObjectLayoutFactoryTest {
@Mock
- ObjectAdapter mockAdapter;
+ ManagedObject mockAdapter;
public static class ForDomainObjectLayout extends Named {
@@ -507,7 +507,7 @@ public class DomainObjectLayoutFactoryTest extends AbstractFacetFactoryJUnit4Tes
public static class Paged extends DomainObjectLayoutFactoryTest {
@Mock
- ObjectAdapter mockAdapter;
+ ManagedObject mockAdapter;
public static class ForDomainObjectLayout extends Paged {
@@ -584,7 +584,7 @@ public class DomainObjectLayoutFactoryTest extends AbstractFacetFactoryJUnit4Tes
public static class Plural extends DomainObjectLayoutFactoryTest {
@Mock
- ObjectAdapter mockAdapter;
+ ManagedObject mockAdapter;
public static class ForDomainObjectLayout extends Plural {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/cssclass/CssClassFacetMethodTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/cssclass/CssClassFacetMethodTest.java
index 3f7282f..59a646e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/cssclass/CssClassFacetMethodTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/cssclass/CssClassFacetMethodTest.java
@@ -32,9 +32,9 @@ import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.cssclass.method.CssClassFacetMethod;
+import org.apache.isis.core.metamodel.spec.ManagedObject;
public class CssClassFacetMethodTest {
@@ -44,7 +44,7 @@ public class CssClassFacetMethodTest {
private CssClassFacetMethod facet;
private FacetHolder mockFacetHolder;
- private ObjectAdapter mockOwningAdapter;
+ private ManagedObject mockOwningAdapter;
private DomainObjectInCssClassMethod pojo;
@@ -59,7 +59,7 @@ public class CssClassFacetMethodTest {
pojo = new DomainObjectInCssClassMethod();
mockFacetHolder = mockery.mock(FacetHolder.class);
- mockOwningAdapter = mockery.mock(ObjectAdapter.class);
+ mockOwningAdapter = mockery.mock(ManagedObject.class);
final Method iconNameMethod = DomainObjectInCssClassMethod.class.getMethod("cssClass");
facet = new CssClassFacetMethod(iconNameMethod, mockFacetHolder);
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/cssclass/CssClassFacetMethodWithProblemTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/cssclass/CssClassFacetMethodWithProblemTest.java
index 93ff7a5..1b12055 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/cssclass/CssClassFacetMethodWithProblemTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/cssclass/CssClassFacetMethodWithProblemTest.java
@@ -32,9 +32,9 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.cssclass.method.CssClassFacetMethod;
+import org.apache.isis.core.metamodel.spec.ManagedObject;
public class CssClassFacetMethodWithProblemTest {
@@ -43,7 +43,7 @@ public class CssClassFacetMethodWithProblemTest {
private CssClassFacetMethod facet;
private FacetHolder mockFacetHolder;
- private ObjectAdapter mockOwningAdapter;
+ private ManagedObject mockOwningAdapter;
private DomainObjectWithProblemInCssClassMethod pojo;
@@ -58,7 +58,7 @@ public class CssClassFacetMethodWithProblemTest {
pojo = new DomainObjectWithProblemInCssClassMethod();
mockFacetHolder = mockery.mock(FacetHolder.class);
- mockOwningAdapter = mockery.mock(ObjectAdapter.class);
+ mockOwningAdapter = mockery.mock(ManagedObject.class);
final Method iconNameMethod = DomainObjectWithProblemInCssClassMethod.class.getMethod("cssClass");
facet = new CssClassFacetMethod(iconNameMethod, mockFacetHolder);
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/icon/IconFacetMethodTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/icon/IconFacetMethodTest.java
index ad6964c..58f7ddb 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/icon/IconFacetMethodTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/icon/IconFacetMethodTest.java
@@ -32,9 +32,9 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
-import org.apache.isis.core.metamodel.facets.object.icon.method.IconFacetMethod;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facets.object.icon.method.IconFacetMethod;
+import org.apache.isis.core.metamodel.spec.ManagedObject;
public class IconFacetMethodTest {
@@ -43,7 +43,7 @@ public class IconFacetMethodTest {
private IconFacetMethod facet;
private FacetHolder mockFacetHolder;
- private ObjectAdapter mockOwningAdapter;
+ private ManagedObject mockOwningAdapter;
private DomainObjectWithProblemInIconNameMethod pojo;
@@ -58,7 +58,7 @@ public class IconFacetMethodTest {
pojo = new DomainObjectWithProblemInIconNameMethod();
mockFacetHolder = mockery.mock(FacetHolder.class);
- mockOwningAdapter = mockery.mock(ObjectAdapter.class);
+ mockOwningAdapter = mockery.mock(ManagedObject.class);
final Method iconNameMethod = DomainObjectWithProblemInIconNameMethod.class.getMethod("iconName");
facet = new IconFacetMethod(iconNameMethod, mockFacetHolder);
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/layout/LayoutFacetMethodTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/layout/LayoutFacetMethodTest.java
index 0255a8e..c382125 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/layout/LayoutFacetMethodTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/layout/LayoutFacetMethodTest.java
@@ -32,9 +32,9 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.layout.LayoutFacetMethod;
+import org.apache.isis.core.metamodel.spec.ManagedObject;
public class LayoutFacetMethodTest {
@@ -43,7 +43,7 @@ public class LayoutFacetMethodTest {
private LayoutFacetMethod facet;
private FacetHolder mockFacetHolder;
- private ObjectAdapter mockOwningAdapter;
+ private ManagedObject mockOwningAdapter;
private DomainObjectWithProblemInLayoutMethod pojo;
@@ -58,7 +58,7 @@ public class LayoutFacetMethodTest {
pojo = new DomainObjectWithProblemInLayoutMethod();
mockFacetHolder = mockery.mock(FacetHolder.class);
- mockOwningAdapter = mockery.mock(ObjectAdapter.class);
+ mockOwningAdapter = mockery.mock(ManagedObject.class);
final Method iconNameMethod = DomainObjectWithProblemInLayoutMethod.class.getMethod("layout");
facet = new LayoutFacetMethod(iconNameMethod, mockFacetHolder);
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/TitleFacetViaMethodTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/TitleFacetViaMethodTest.java
index dc97504..98d99ae 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/TitleFacetViaMethodTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/TitleFacetViaMethodTest.java
@@ -33,11 +33,11 @@ import org.junit.runner.RunWith;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import org.apache.isis.core.metamodel.facets.object.title.methods.TitleFacetViaTitleMethod;
import org.apache.isis.core.metamodel._testing.MetaModelContext_forTesting;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facets.object.title.methods.TitleFacetViaTitleMethod;
+import org.apache.isis.core.metamodel.spec.ManagedObject;
@RunWith(JMock.class)
public class TitleFacetViaMethodTest {
@@ -47,7 +47,7 @@ public class TitleFacetViaMethodTest {
private TitleFacetViaTitleMethod facet;
private FacetHolder mockFacetHolder;
- private ObjectAdapter mockOwningAdapter;
+ private ManagedObject mockOwningAdapter;
private DomainObjectWithProblemInItsTitleMethod pojo;
@@ -67,7 +67,7 @@ public class TitleFacetViaMethodTest {
pojo = new DomainObjectWithProblemInItsTitleMethod();
mockFacetHolder = mockery.mock(FacetHolder.class);
- mockOwningAdapter = mockery.mock(ObjectAdapter.class);
+ mockOwningAdapter = mockery.mock(ManagedObject.class);
final Method iconNameMethod = DomainObjectWithProblemInItsTitleMethod.class.getMethod("title");
facet = new TitleFacetViaTitleMethod(iconNameMethod, null, null, mockFacetHolder);
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
index 2632518..2ab6e60 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
@@ -35,7 +35,6 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
import org.apache.isis.core.metamodel.facets.Annotations;
@@ -43,6 +42,7 @@ import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
import org.apache.isis.core.metamodel.facets.object.title.annotation.TitleAnnotationFacetFactory;
import org.apache.isis.core.metamodel.facets.object.title.annotation.TitleFacetViaTitleAnnotation;
+import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.security.authentication.AuthenticationSessionTracker;
@@ -51,7 +51,7 @@ public class TitleAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4T
private TitleAnnotationFacetFactory facetFactory;
@Mock
- private ObjectAdapter mockObjectAdapter;
+ private ManagedObject mockObjectAdapter;
@Mock
private AuthenticationSession mockAuthenticationSession;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/navparent/NavigableParentFacetMethodTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/navparent/NavigableParentFacetMethodTest.java
index 4d511c3..f31b654 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/navparent/NavigableParentFacetMethodTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/navparent/NavigableParentFacetMethodTest.java
@@ -32,9 +32,9 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.navparent.method.NavigableParentFacetMethod;
+import org.apache.isis.core.metamodel.spec.ManagedObject;
public class NavigableParentFacetMethodTest {
@@ -43,7 +43,7 @@ public class NavigableParentFacetMethodTest {
private NavigableParentFacetMethod facet;
private FacetHolder mockFacetHolder;
- private ObjectAdapter mockOwningAdapter;
+ private ManagedObject mockOwningAdapter;
private DomainObjectWithProblemInNavigableParentMethod pojo;
@@ -58,7 +58,7 @@ public class NavigableParentFacetMethodTest {
pojo = new DomainObjectWithProblemInNavigableParentMethod();
mockFacetHolder = mockery.mock(FacetHolder.class);
- mockOwningAdapter = mockery.mock(ObjectAdapter.class);
+ mockOwningAdapter = mockery.mock(ManagedObject.class);
final Method navigableParentMethod = DomainObjectWithProblemInNavigableParentMethod.class.getMethod("parent");
facet = new NavigableParentFacetMethod(navigableParentMethod, mockFacetHolder);
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactoryTest.java
index 8a30e33..fbd1c63 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactoryTest.java
@@ -29,13 +29,13 @@ import org.junit.Before;
import org.junit.Test;
import org.apache.isis.commons.internal._Constants;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.isis.core.metamodel.facets.object.navparent.NavigableParentFacet;
import org.apache.isis.core.metamodel.facets.object.navparent.annotation.NavigableParentTestSamples.DomainObjectA;
import org.apache.isis.core.metamodel.facets.object.navparent.method.NavigableParentFacetMethod;
+import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.security.authentication.AuthenticationSessionTracker;
@@ -44,7 +44,7 @@ public class NavigableParentAnnotationFacetFactoryTest extends AbstractFacetFact
private NavigableParentAnnotationFacetFactory facetFactory;
@Mock
- private ObjectAdapter mockObjectAdapter;
+ private ManagedObject mockObjectAdapter;
@Mock
private AuthenticationSession mockAuthenticationSession;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
index c428b34..f96d06a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
@@ -39,7 +39,6 @@ import static org.junit.Assert.fail;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.core.metamodel._testing.MetaModelContext_forTesting;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
@@ -47,6 +46,7 @@ import org.apache.isis.core.metamodel.facets.object.encodeable.encoder.Encodable
import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
import org.apache.isis.core.metamodel.facets.object.parseable.parser.ParseableFacetUsingParser;
import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract;
+import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.security.authentication.AuthenticationSessionTracker;
public abstract class ValueSemanticsProviderAbstractTestCase {
@@ -56,7 +56,7 @@ public abstract class ValueSemanticsProviderAbstractTestCase {
@Mock protected FacetHolder mockFacetHolder;
@Mock protected AuthenticationSessionTracker mockAuthenticationSessionTracker;
- @Mock protected ObjectAdapter mockAdapter;
+ @Mock protected ManagedObject mockAdapter;
protected MetaModelContext metaModelContext;
@@ -119,7 +119,7 @@ public abstract class ValueSemanticsProviderAbstractTestCase {
return parseableFacet;
}
- protected ObjectAdapter createAdapter(final Object object) {
+ protected ManagedObject createAdapter(final Object object) {
return mockAdapter;
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
index 7b22d5f..5ffde69 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
@@ -34,7 +34,6 @@ import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -74,7 +73,7 @@ public class ObjectActionParameterAbstractTest_getId_and_getName {
private ObjectSpecification objectSpec;
@Override
- public ObjectAdapter get(final ManagedObject owner, final InteractionInitiatedBy interactionInitiatedBy) {
+ public ManagedObject get(final ManagedObject owner, final InteractionInitiatedBy interactionInitiatedBy) {
return null;
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
index 9fb44db..51bbcbd 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
@@ -19,23 +19,22 @@
package org.apache.isis.core.metamodel.specloader.specimpl;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertFalse;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertTrue;
-
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
@@ -84,7 +83,7 @@ public class ObjectAssociationAbstractTest_alwaysHidden {
facetedMethod, FeatureType.PROPERTY, mockObjectSpecification) {
@Override
- public ObjectAdapter get(
+ public ManagedObject get(
final ManagedObject fromObject,
final InteractionInitiatedBy interactionInitiatedBy) {
return null;
diff --git a/legacy/extensions/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java b/legacy/extensions/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
index 0683596..8fa7c99 100644
--- a/legacy/extensions/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
+++ b/legacy/extensions/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
@@ -39,7 +39,6 @@ import static org.junit.Assert.fail;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.core.metamodel._testing.MetaModelContext_forTesting;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
@@ -47,6 +46,7 @@ import org.apache.isis.core.metamodel.facets.object.encodeable.encoder.Encodable
import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
import org.apache.isis.core.metamodel.facets.object.parseable.parser.ParseableFacetUsingParser;
import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract;
+import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.security.authentication.AuthenticationSessionTracker;
public abstract class ValueSemanticsProviderAbstractTestCase {
@@ -56,7 +56,7 @@ public abstract class ValueSemanticsProviderAbstractTestCase {
@Mock protected FacetHolder mockFacetHolder;
@Mock protected AuthenticationSessionTracker mockAuthenticationSessionTracker;
- @Mock protected ObjectAdapter mockAdapter;
+ @Mock protected ManagedObject mockAdapter;
protected MetaModelContext metaModelContext;
@@ -119,7 +119,7 @@ public abstract class ValueSemanticsProviderAbstractTestCase {
return parseableFacet;
}
- protected ObjectAdapter createAdapter(final Object object) {
+ protected ManagedObject createAdapter(final Object object) {
return mockAdapter;
}
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
index e54df25..ec7ec08 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
@@ -27,13 +27,13 @@ import javax.jdo.Query;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.services.container.query.QueryCardinality;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ManagedObjects;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.persistence.jdo.datanucleus5.datanucleus.metamodel.JdoPropertyUtils;
+import org.apache.isis.persistence.jdo.datanucleus5.objectadapter.ObjectAdapter;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.PersistenceSession5;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.query.PersistenceQueryFindUsingApplibQueryDefault;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java
index 49d6b78..c3f174c 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java
@@ -28,9 +28,9 @@ import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.assertions._Assert;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.persistence.jdo.applib.services.IsisJdoSupport_v3_2;
+import org.apache.isis.persistence.jdo.datanucleus5.objectadapter.ObjectAdapter;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.IsisLifecycleListener;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.PersistenceSession5;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.query.PersistenceQuery;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/IsisJdoSupportDN5.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/IsisJdoSupportDN5.java
index 598526b..436c14f 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/IsisJdoSupportDN5.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/IsisJdoSupportDN5.java
@@ -45,10 +45,10 @@ import org.apache.isis.applib.FatalException;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.ObjectPersistenceException;
import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
import org.apache.isis.persistence.jdo.applib.services.IsisJdoSupport_v3_2;
+import org.apache.isis.persistence.jdo.datanucleus5.objectadapter.ObjectAdapter;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.IsisPersistenceSessionJdo;
import static org.apache.isis.commons.internal.base._NullSafe.stream;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapter.java
similarity index 82%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
rename to persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapter.java
index 182fac5..1897be1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapter.java
@@ -17,10 +17,9 @@
* under the License.
*/
-package org.apache.isis.core.metamodel.adapter;
+package org.apache.isis.persistence.jdo.datanucleus5.objectadapter;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
-import org.apache.isis.core.metamodel.adapter.oid.ParentedOid;
import org.apache.isis.core.metamodel.spec.ManagedObject;
/**
@@ -44,12 +43,4 @@ public interface ObjectAdapter extends ManagedObject {
*/
Oid getOid(); //XXX[2033] referenced by 'metamodel' only to create a bookmark (CommandUtil)
- /**
- * Whether this instance belongs to another object (meaning its
- * {@link #getOid()} will be a {@link ParentedOid}).
- */
- default boolean isParented() {
- return getOid() instanceof ParentedOid;
- }
-
}
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java
index 968b520..2c34244 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java
@@ -23,7 +23,6 @@ import java.util.Objects;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.commons.internal.assertions._Assert;
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;
import org.apache.isis.core.metamodel.adapter.oid.ParentedOid;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_Factories.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_Factories.java
index 2cae284..d12d572 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_Factories.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_Factories.java
@@ -19,7 +19,6 @@
package org.apache.isis.persistence.jdo.datanucleus5.objectadapter;
import org.apache.isis.commons.internal.assertions._Assert;
-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.ParentedOid;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectAdapterProvider.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectAdapterProvider.java
index d8e544b..b8ea86e 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectAdapterProvider.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectAdapterProvider.java
@@ -18,7 +18,6 @@
*/
package org.apache.isis.persistence.jdo.datanucleus5.objectadapter;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.runtime.context.RuntimeContext;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectCreation.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectCreation.java
index f8f943c..38bf130 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectCreation.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectCreation.java
@@ -24,7 +24,6 @@ import javax.annotation.Nullable;
import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.object.callbacks.CallbackFacet;
import org.apache.isis.core.metamodel.facets.object.callbacks.CreatedCallbackFacet;
import org.apache.isis.core.metamodel.facets.object.callbacks.CreatedLifecycleEventFacet;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterProvider.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterProvider.java
index dc2a1e0..929ac74 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterProvider.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterProvider.java
@@ -20,8 +20,6 @@ package org.apache.isis.persistence.jdo.datanucleus5.objectadapter;
import javax.annotation.Nullable;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-
/**
*
* @since 2.0
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/PojoAdapter.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/PojoAdapter.java
index 906d10c..a5d1790 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/PojoAdapter.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/PojoAdapter.java
@@ -24,7 +24,6 @@ import java.util.Optional;
import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.commons.internal.base._Lazy;
-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.RootOid;
import org.apache.isis.core.metamodel.commons.ToString;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisLifecycleListener.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisLifecycleListener.java
index 66a2505..40b778b 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisLifecycleListener.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisLifecycleListener.java
@@ -33,7 +33,7 @@ import javax.jdo.listener.StoreLifecycleListener;
import org.datanucleus.enhancement.Persistable;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.persistence.jdo.datanucleus5.objectadapter.ObjectAdapter;
public class IsisLifecycleListener
implements AttachLifecycleListener, ClearLifecycleListener, CreateLifecycleListener, DeleteLifecycleListener,
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession5.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession5.java
index 1fd699d..92f31fc 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession5.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession5.java
@@ -52,7 +52,6 @@ import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.ObjectNotFoundException;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.oid.PojoRefreshException;
@@ -84,6 +83,7 @@ import org.apache.isis.persistence.jdo.datanucleus5.datanucleus.persistence.quer
import org.apache.isis.persistence.jdo.datanucleus5.datanucleus.persistence.queries.PersistenceQueryFindUsingApplibQueryProcessor;
import org.apache.isis.persistence.jdo.datanucleus5.datanucleus.persistence.queries.PersistenceQueryProcessor;
import org.apache.isis.persistence.jdo.datanucleus5.datanucleus.persistence.spi.JdoObjectIdSerializer;
+import org.apache.isis.persistence.jdo.datanucleus5.objectadapter.ObjectAdapter;
import org.apache.isis.persistence.jdo.datanucleus5.objectadapter.ObjectAdapterContext;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.command.CreateObjectCommand;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.command.DestroyObjectCommand;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQueryFactory.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQueryFactory.java
index 2073f89..d0299a9 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQueryFactory.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQueryFactory.java
@@ -25,10 +25,10 @@ import org.apache.isis.applib.query.Query;
import org.apache.isis.applib.query.QueryDefault;
import org.apache.isis.applib.query.QueryFindAllInstances;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.services.container.query.QueryCardinality;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.persistence.jdo.datanucleus5.objectadapter.ObjectAdapter;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQueryFindUsingApplibQueryDefault.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQueryFindUsingApplibQueryDefault.java
index f49c79f..a7102e6 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQueryFindUsingApplibQueryDefault.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/query/PersistenceQueryFindUsingApplibQueryDefault.java
@@ -23,11 +23,11 @@ import java.util.Collections;
import java.util.Map;
import org.apache.isis.applib.query.Query;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.commons.ToString;
import org.apache.isis.core.metamodel.services.container.query.QueryCardinality;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.persistence.jdo.datanucleus5.objectadapter.ObjectAdapter;
/**
* Corresponds to an object-store specific implementation of {@link Query}.
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/adapterfactory/PojoAdapterTest.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/adapterfactory/PojoAdapterTest.java
index 308831b..410afec 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/adapterfactory/PojoAdapterTest.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/adapterfactory/PojoAdapterTest.java
@@ -27,11 +27,11 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.Oid.Factory;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.persistence.jdo.datanucleus5.objectadapter.ObjectAdapter;
import org.apache.isis.persistence.jdo.datanucleus5.objectadapter.PojoAdapter;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2.Mode;
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/testing/ObjectMemberAbstractTest.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/testing/ObjectMemberAbstractTest.java
index 73ec305..40e85b1 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/testing/ObjectMemberAbstractTest.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/testing/ObjectMemberAbstractTest.java
@@ -42,7 +42,6 @@ import org.apache.isis.applib.services.metamodel.BeanSort;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.core.metamodel._testing.MetaModelContext_forTesting;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.Oid.Factory;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
@@ -68,6 +67,7 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.specimpl.ObjectMemberAbstract;
import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.security.authentication.AuthenticationSessionTracker;
+import org.apache.isis.persistence.jdo.datanucleus5.objectadapter.ObjectAdapter;
import org.apache.isis.persistence.jdo.datanucleus5.objectadapter.PojoAdapter;
public class ObjectMemberAbstractTest {
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoWkt.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoWkt.java
index 60d8d40..38271e9 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoWkt.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoWkt.java
@@ -32,7 +32,6 @@ import org.apache.isis.applib.services.hint.HintStore;
import org.apache.isis.commons.internal.base._NullSafe;
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;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.context.MetaModelContext;