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/11/05 06:51:55 UTC
[isis] branch v2 updated: ISIS-2158: ObjectAdapterProvider: remove
obsolete methods
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 81972a7 ISIS-2158: ObjectAdapterProvider: remove obsolete methods
81972a7 is described below
commit 81972a7683758284e26e9bb253c4664f5168e44f
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Nov 5 07:48:19 2019 +0100
ISIS-2158: ObjectAdapterProvider: remove obsolete methods
---
.../metamodel/adapter/ObjectAdapterProvider.java | 34 ----------------------
.../jdo/objectadapter/ObjectAdapterContext.java | 12 --------
...ObjectAdapterContext_ObjectAdapterProvider.java | 17 -----------
3 files changed, 63 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/ObjectAdapterProvider.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/ObjectAdapterProvider.java
index 1249822..9dfaf43 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/ObjectAdapterProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/adapter/ObjectAdapterProvider.java
@@ -22,7 +22,6 @@ import javax.annotation.Nullable;
import org.apache.isis.metamodel.adapter.oid.Oid;
import org.apache.isis.metamodel.adapter.oid.RootOid;
-import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
@@ -60,23 +59,6 @@ public interface ObjectAdapterProvider {
RootOid parentOid,
OneToManyAssociation collection);
- /**
- * Returns an ObjectAdapter that holds the ObjectSpecification used for
- * interrogating the domain object's metadata.
- * <p>
- * Does _not_ perform dependency injection on the domain object. Also bypasses
- * caching (if any), that is each call to this method creates a new unique instance.
- * </p>
- *
- * @param viewModelPojo domain object
- * @return
- */
- ManagedObject disposableAdapterForViewModel(Object viewModelPojo);
-
- ObjectSpecification specificationForViewModel(Object viewModelPojo);
-
- ObjectAdapter adapterForViewModel(Object viewModelPojo, String mementoStr);
-
// -- DOMAIN OBJECT CREATION SUPPORT
@@ -115,22 +97,6 @@ public interface ObjectAdapterProvider {
}
@Override
- default ManagedObject disposableAdapterForViewModel(Object viewModelPojo) {
- return getObjectAdapterProvider().disposableAdapterForViewModel(viewModelPojo);
- }
-
- @Override
- default ObjectSpecification specificationForViewModel(Object viewModelPojo) {
- return getObjectAdapterProvider().specificationForViewModel(viewModelPojo);
- }
-
- @Override
- default ObjectAdapter adapterForViewModel(final Object viewModelPojo, final String mementoString) {
- return getObjectAdapterProvider().adapterForViewModel(viewModelPojo, mementoString);
- }
-
-
- @Override
default ObjectAdapter newTransientInstance(ObjectSpecification objectSpec) {
return getObjectAdapterProvider().newTransientInstance(objectSpec);
}
diff --git a/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext.java
index 411aeaa..652000e 100644
--- a/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext.java
+++ b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext.java
@@ -244,18 +244,6 @@ final public class ObjectAdapterContext {
// ------------------------------------------------------------------------------------------------
- // package private
- ObjectAdapter adapterForViewModel(Object viewModelPojo, String mementoString) {
-
- final ObjectSpecification objectSpecification =
- specificationLoader.loadSpecification(viewModelPojo.getClass());
- final ObjectSpecId objectSpecId = objectSpecification.getSpecId();
- final RootOid newRootOid = Oid.Factory.viewmodelOf(objectSpecId, mementoString);
-
- final ObjectAdapter viewModelAdapter = recreatePojo(newRootOid, viewModelPojo);
- return viewModelAdapter;
- }
-
/**
* Note that there is no management of {@link Version}s here. That is
* because the {@link PersistenceSession} is expected to manage this.
diff --git a/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext_ObjectAdapterProvider.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext_ObjectAdapterProvider.java
index 2e7d56e..f2ed119 100644
--- a/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext_ObjectAdapterProvider.java
+++ b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext_ObjectAdapterProvider.java
@@ -81,23 +81,6 @@ class ObjectAdapterContext_ObjectAdapterProvider implements ObjectAdapterProvide
return objectAdapterContext.injectServices(newAdapter);
}
- @Override
- public ObjectSpecification specificationForViewModel(Object viewModelPojo) {
- final ObjectSpecification objectSpecification =
- specificationLoader.loadSpecification(viewModelPojo.getClass());
- return objectSpecification;
- }
-
- @Override
- public ManagedObject disposableAdapterForViewModel(final Object viewModelPojo) {
- return ManagedObject.of(specificationLoader::loadSpecification, viewModelPojo);
- }
-
- @Override
- public ObjectAdapter adapterForViewModel(Object viewModelPojo, String mementoString) {
- return objectAdapterContext.adapterForViewModel(viewModelPojo, mementoString);
- }
-
// -- DOMAIN OBJECT CREATION SUPPORT
@Override