You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/09/15 08:03:39 UTC
[34/50] [abbrv] isis git commit: ISIS-1194: removing ObjectFactory
(unused)
ISIS-1194: removing ObjectFactory (unused)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b8e8cf05
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b8e8cf05
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b8e8cf05
Branch: refs/heads/master
Commit: b8e8cf05bd7180635318a042a951eb85e3d3a9e7
Parents: d9bf269
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Sep 14 10:12:18 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Sep 14 10:12:18 2015 +0100
----------------------------------------------------------------------
.../isis/core/runtime/system/context/IsisContext.java | 1 -
.../core/runtime/system/persistence/PersistenceSession.java | 9 ---------
2 files changed, 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/b8e8cf05/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
index 0b91269..3ba2b4e 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
@@ -510,7 +510,6 @@ public abstract class IsisContext implements DebuggableWithTitle {
debugList.add("Transaction Manager", getTransactionManager());
debugList.add("Service injector", getPersistenceSession().getServicesInjector());
- debugList.add("Object factory", getPersistenceSession().getObjectFactory());
debugList.add("OID generator", getPersistenceSession().getOidGenerator());
debugList.add("Adapter manager", getPersistenceSession().getAdapterManager());
debugList.add("Services", getPersistenceSession().getServices());
http://git-wip-us.apache.org/repos/asf/isis/blob/b8e8cf05/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
index 2a18fd5..f0ee6ac 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
@@ -140,7 +140,6 @@ public class PersistenceSession implements TransactionalResource, SessionScopedC
//region > constructor, fields, finalize()
- private final ObjectFactory objectFactory;
private final PersistenceSessionFactory persistenceSessionFactory;
private final OidGenerator oidGenerator;
@@ -196,7 +195,6 @@ public class PersistenceSession implements TransactionalResource, SessionScopedC
this.oidMarshaller = new OidMarshaller();
- this.objectFactory = new ObjectFactory(this, servicesInjector);
this.oidGenerator = new OidGenerator(this, specificationLoader);
this.adapterManager = new AdapterManagerDefault(this, specificationLoader, oidMarshaller,
@@ -243,7 +241,6 @@ public class PersistenceSession implements TransactionalResource, SessionScopedC
}
// inject any required dependencies into object factory
- servicesInjector.injectInto(objectFactory);
servicesInjector.injectInto(adapterManager);
adapterManager.open();
@@ -1226,12 +1223,6 @@ public class PersistenceSession implements TransactionalResource, SessionScopedC
this.transactionManager = transactionManager;
}
- /**
- * The configured {@link ObjectFactory}.
- */
- public ObjectFactory getObjectFactory() {
- return objectFactory;
- }
//endregion