This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch ISIS-1976-rethink-object-adapters in repository https://gitbox.apache.org/repos/asf/isis.git
commit 6bf096ebe704a7ab31b2cc583d6893ad8e15dc29 Author: Andi Huber <ahu...@apache.org> AuthorDate: Thu Sep 6 07:19:28 2018 +0200 ISIS-1976: remove code that seems for optimization Task-Url: https://issues.apache.org/jira/browse/ISIS-1976 --- .../persistence/adaptermanager/ObjectAdapterContext.java | 13 +------------ .../adaptermanager/ObjectAdapterContext_AdapterManager.java | 5 ++--- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext.java index 18af78f..f942f5a 100644 --- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext.java +++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext.java @@ -32,6 +32,7 @@ import org.slf4j.LoggerFactory; import org.apache.isis.commons.internal.exceptions._Exceptions; import org.apache.isis.commons.internal.functions._Predicates; import org.apache.isis.core.commons.authentication.AuthenticationSession; +import org.apache.isis.core.commons.ensure.Assert; import org.apache.isis.core.commons.ensure.Ensure; import org.apache.isis.core.commons.ensure.IsisAssertException; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; @@ -350,18 +351,6 @@ public class ObjectAdapterContext { } } - @Deprecated // don't expose caching - public void addAdapterHonoringSpecImmutability(Object pojo, ObjectAdapter adapter) { - // add all aggregated collections - final ObjectSpecification objSpec = adapter.getSpecification(); - if (!adapter.isParentedCollection() || adapter.isParentedCollection() && !objSpec.isImmutable()) { - cache.putPojo(pojo, adapter); - } - - // order is important - add to pojo map first, then identity map - oidAdapterMap().add(adapter.getOid(), adapter); - } - public ObjectAdapter disposableAdapterForViewModel(Object viewModelPojo) { final ObjectSpecification objectSpecification = specificationLoader.loadSpecification(viewModelPojo.getClass()); diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_AdapterManager.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_AdapterManager.java index 7936a9d..1af091f 100644 --- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_AdapterManager.java +++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_AdapterManager.java @@ -23,9 +23,7 @@ import java.util.Objects; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.isis.commons.internal.functions._Predicates; import org.apache.isis.core.commons.ensure.Assert; -import org.apache.isis.core.commons.ensure.Ensure; 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.ParentedCollectionOid; @@ -171,7 +169,8 @@ class ObjectAdapterContext_AdapterManager { return adapter; } - objectAdapterContext.addAdapterHonoringSpecImmutability(pojo, adapter); + Assert.assertTrue("expected same", Objects.equals(adapter.getObject(), pojo)); + objectAdapterContext.addAdapter(adapter); // must inject after mapping, otherwise infinite loop servicesInjector.injectServicesInto(pojo);