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 2018/09/06 11:16:40 UTC
[isis] 02/02: ISIS-1976: cleaning up
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 2d0170953be32f1291801f7e84a2cacf03e770e5
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Sep 6 13:16:18 2018 +0200
ISIS-1976: cleaning up
Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
.../adaptermanager/ObjectAdapterContext.java | 18 +-----------
...ObjectAdapterContext_ObjectAdapterProvider.java | 32 +++++++++++-----------
.../ObjectAdapterContext_ServiceLookup.java | 2 +-
3 files changed, 18 insertions(+), 34 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 b204e36..44fc112 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
@@ -135,7 +135,6 @@ public class ObjectAdapterContext {
private final Cache cache = new Cache();
- @SuppressWarnings("unused")
private final PersistenceSession persistenceSession;
private final ServicesInjector servicesInjector;
private final SpecificationLoader specificationLoader;
@@ -171,7 +170,7 @@ public class ObjectAdapterContext {
// -- DEBUG
- private void printContextInfo(String msg) {
+ void printContextInfo(String msg) {
String id = Integer.toHexString(this.hashCode());
String session = ""+persistenceSession;
System.out.println("!!!!!!!!!!!!!!!!!!!!!!! "+String.format("%s id=%s session='%s'",
@@ -360,21 +359,6 @@ public class ObjectAdapterContext {
// ------------------------------------------------------------------------------------------------
-// /**
-// * Creates {@link ObjectAdapter adapters} for the service list, ensuring that these are mapped correctly,
-// * and have the same OIDs as in any previous sessions.
-// *
-// * @deprecated https://issues.apache.org/jira/browse/ISIS-1976
-// */
-// @Deprecated
-// private void initServices() {
-// final List<Object> registeredServices = servicesInjector.getRegisteredServices();
-// for (final Object service : registeredServices) {
-// final ObjectAdapter serviceAdapter = objectAdapterProviderMixin.adapterFor(service);
-// Assert.assertFalse("expected to not be 'transient'", serviceAdapter.getOid().isTransient());
-// }
-// }
-
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_ObjectAdapterProvider.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ObjectAdapterProvider.java
index a8f33ce..b231b0c 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ObjectAdapterProvider.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ObjectAdapterProvider.java
@@ -145,6 +145,15 @@ class ObjectAdapterContext_ObjectAdapterProvider implements ObjectAdapterProvide
return adapter;
}
+ @Override
+ public List<ObjectAdapter> getServices() {
+ return serviceAdapters.get();
+ }
+
+ // -- HELPER
+
+ private _Lazy<List<ObjectAdapter>> serviceAdapters = _Lazy.of(this::initServiceAdapters);
+
private List<ObjectAdapter> initServiceAdapters() {
return servicesInjector.streamRegisteredServiceInstances()
.map(this::adapterFor)
@@ -154,15 +163,6 @@ class ObjectAdapterContext_ObjectAdapterProvider implements ObjectAdapterProvide
.collect(Collectors.toList());
}
- private _Lazy<List<ObjectAdapter>> serviceAdapters = _Lazy.of(this::initServiceAdapters);
-
- @Override
- public List<ObjectAdapter> getServices() {
- return serviceAdapters.get();
- }
-
- // -- HELPER
-
// private Oid persistentOrValueOid(Object pojo) {
//
// Oid oid;
@@ -197,13 +197,13 @@ class ObjectAdapterContext_ObjectAdapterProvider implements ObjectAdapterProvide
// return null;
// }
- protected Oid persistentOid(final Object pojo) {
- if (persistenceSession.getPersistenceManager().getObjectId(pojo) == null) {
- return null;
- }
- final RootOid oid = objectAdapterContext.createPersistentOrViewModelOid(pojo);
- return oid;
- }
+// private Oid persistentOid(final Object pojo) {
+// if (persistenceSession.getPersistenceManager().getObjectId(pojo) == null) {
+// return null;
+// }
+// final RootOid oid = objectAdapterContext.createPersistentOrViewModelOid(pojo);
+// return oid;
+// }
private ObjectAdapter existingOrValueAdapter(Object pojo) {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ServiceLookup.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ServiceLookup.java
index 31d3b39..ae92baa 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ServiceLookup.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ServiceLookup.java
@@ -91,7 +91,7 @@ class ObjectAdapterContext_ServiceLookup {
private ServicesByIdResource initLookupResource() {
- System.out.println("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! INIT SERVICE ID LOOKUP RESOURCE");
+ objectAdapterContext.printContextInfo("INIT SERVICE ID LOOKUP RESOURCE");
final ServicesByIdResource lookupResource = new ServicesByIdResource();