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 2016/05/17 20:03:57 UTC
isis git commit: ISIS-1365: DOCD now delegates to RepositoryService
so far as is possible
Repository: isis
Updated Branches:
refs/heads/master a75d3641d -> 1b8ac93c0
ISIS-1365: DOCD now delegates to RepositoryService so far as is possible
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/1b8ac93c
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/1b8ac93c
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/1b8ac93c
Branch: refs/heads/master
Commit: 1b8ac93c0e0b0b96389fec4c669d99fd94d8f4ef
Parents: a75d364
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue May 17 20:58:20 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue May 17 20:58:20 2016 +0100
----------------------------------------------------------------------
.../container/DomainObjectContainerDefault.java | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/1b8ac93c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
index 34c0a83..0bfcab2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
@@ -115,7 +115,7 @@ public class DomainObjectContainerDefault
if (!spec.containsFacet(ViewModelFacet.class)) {
throw new IsisException("Type must be a ViewModel: " + ofClass);
}
- final ObjectAdapter adapter = doCreateViewModelInstance(spec, memento);
+ final ObjectAdapter adapter = getPersistenceSessionService().createViewModelInstance(spec, memento);
if(adapter.getOid().isViewModel()) {
return (T)adapter.getObject();
} else {
@@ -150,6 +150,8 @@ public class DomainObjectContainerDefault
/**
* Returns a new instance of the specified class that has the same persisted
* state as the specified object.
+ *
+ * @deprecated - use {@link FactoryService#instantiate(Class)}.
*/
@Programmatic
@Override
@@ -170,10 +172,6 @@ public class DomainObjectContainerDefault
return factoryService.mixin(mixinClass, mixedIn);
}
- protected ObjectAdapter doCreateViewModelInstance(final ObjectSpecification spec, final String memento) {
- return getPersistenceSessionService().createViewModelInstance(spec, memento);
- }
-
@Programmatic
@Override
public void remove(final Object persistentObject) {
@@ -371,10 +369,7 @@ public class DomainObjectContainerDefault
@Programmatic
@Override
public void persistIfNotAlready(final Object object) {
- if (isPersistent(object)) {
- return;
- }
- persist(object);
+ repositoryService.persist(object);
}
@@ -505,11 +500,6 @@ public class DomainObjectContainerDefault
return repositoryService.allMatches(query);
}
- <T> List<T> submitQuery(final Query<T> query) {
- final List<ObjectAdapter> allMatching = getPersistenceSessionService().allMatchingQuery(query);
- return ObjectAdapter.Util.unwrapT(allMatching);
- }
-
// //////////////////////////////////////////////////////////////////
@Programmatic