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/10 14:07:05 UTC
[06/50] [abbrv] isis git commit: ISIS-1194: refactor PojoRecreator to
pass its dependencies through constructor rather than via IsisContext.
ISIS-1194: refactor PojoRecreator to pass its dependencies through constructor rather than via IsisContext.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/9c17f787
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/9c17f787
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/9c17f787
Branch: refs/heads/ISIS-1194
Commit: 9c17f787066c1592b62961f8b384ad4f3a5fb296
Parents: 2998ff6
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 10 08:12:34 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 10 08:15:26 2015 +0100
----------------------------------------------------------------------
.../adaptermanager/AdapterManagerDefault.java | 4 -
.../adaptermanager/PojoRecreator.java | 17 +-
.../system/persistence/PersistenceSession.java | 5 +-
...AdapterManagerDefault_aggregateAdapters.java | 158 -------------------
.../persistence/PersistenceSessionTest.java | 3 +-
5 files changed, 19 insertions(+), 168 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/9c17f787/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java
index 085e24a..ae2a3f5 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java
@@ -97,10 +97,6 @@ public class AdapterManagerDefault implements AdapterManager, Iterable<ObjectAda
// constructor
// //////////////////////////////////////////////////////////////////
- public AdapterManagerDefault() {
- this(new PojoRecreator());
- }
-
/**
* For object store implementations (eg JDO) that do not provide any mechanism
* to allow transient objects to be reattached; can instead provide a
http://git-wip-us.apache.org/repos/asf/isis/blob/9c17f787/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/PojoRecreator.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/PojoRecreator.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/PojoRecreator.java
index 1a06af4..9821c14 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/PojoRecreator.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/PojoRecreator.java
@@ -23,12 +23,21 @@ import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
-import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.persistence.ObjectStore;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
public class PojoRecreator {
+ private final PersistenceSession persistenceSession;
+ private final SpecificationLoaderSpi specificationLoader;
+
+ public PojoRecreator(
+ final PersistenceSession persistenceSession,
+ final SpecificationLoaderSpi specificationLoader) {
+ this.persistenceSession = persistenceSession;
+ this.specificationLoader = specificationLoader;
+ }
+
public Object recreatePojo(RootOid oid) {
if(oid.isTransient() || oid.isViewModel()) {
return recreatePojoDefault(oid);
@@ -75,11 +84,11 @@ public class PojoRecreator {
protected SpecificationLoaderSpi getSpecificationLoader() {
- return IsisContext.getSpecificationLoader();
+ return specificationLoader;
}
protected PersistenceSession getPersistenceSession() {
- return IsisContext.getPersistenceSession();
+ return persistenceSession;
}
protected ObjectStore getObjectStore() {
http://git-wip-us.apache.org/repos/asf/isis/blob/9c17f787/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 8b035a4..a2d9bf2 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
@@ -60,6 +60,7 @@ import org.apache.isis.core.runtime.persistence.NotPersistableException;
import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
import org.apache.isis.core.runtime.persistence.adapter.PojoAdapterFactory;
import org.apache.isis.core.runtime.persistence.adaptermanager.AdapterManagerDefault;
+import org.apache.isis.core.runtime.persistence.adaptermanager.PojoRecreator;
import org.apache.isis.core.runtime.persistence.objectstore.algorithm.PersistAlgorithm;
import org.apache.isis.core.runtime.persistence.objectstore.transaction.CreateObjectCommand;
import org.apache.isis.core.runtime.persistence.objectstore.transaction.DestroyObjectCommand;
@@ -132,7 +133,9 @@ public class PersistenceSession implements SessionScopedComponent, DebuggableWit
this.objectFactory = new ObjectFactory(this, servicesInjector);
this.oidGenerator = new OidGenerator(this, specificationLoader);
- this.adapterManager = new AdapterManagerDefault();
+
+ final PojoRecreator pojoRecreator = new PojoRecreator(this, specificationLoader);
+ this.adapterManager = new AdapterManagerDefault(pojoRecreator);
this.persistAlgorithm = new PersistAlgorithm();
this.objectAdapterFactory = new PojoAdapterFactory(adapterManager, specificationLoader, authenticationSession);
http://git-wip-us.apache.org/repos/asf/isis/blob/9c17f787/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault_aggregateAdapters.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault_aggregateAdapters.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault_aggregateAdapters.java
deleted file mode 100644
index c828339..0000000
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault_aggregateAdapters.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.runtime.persistence.adaptermanager;
-
-import com.google.common.collect.Lists;
-
-import org.jmock.auto.Mock;
-import org.junit.Before;
-import org.junit.Rule;
-
-import org.apache.isis.applib.annotation.Aggregated;
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.profiles.Localization;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.oid.RootOid;
-import org.apache.isis.core.metamodel.app.IsisMetaModel;
-import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
-import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
-import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.core.runtime.persistence.adapter.PojoAdapterFactory;
-import org.apache.isis.core.runtime.system.persistence.OidGenerator;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.isis.progmodels.dflt.ProgrammingModelFacetsJava5;
-
-public class AdapterManagerDefault_aggregateAdapters {
-
- public static class Customer {
- // {{ Name (property)
- private Name name;
-
- @MemberOrder(sequence = "1")
- public Name getName() {
- return name;
- }
-
- public void setName(final Name name) {
- this.name = name;
- }
- // }}
- }
-
- @Aggregated
- public static class Name {}
-
- public static class CustomerRepository {
- public Customer x() { return null; }
- }
-
-
- @Rule
- public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
-
- @Mock
- private OneToManyAssociation mockCollection;
-
- @Mock
- private RuntimeContext mockRuntimeContext;
-
- @Mock
- private OidGenerator mockOidGenerator;
-
- @Mock
- protected Localization mockLocalization;
-
- @Mock
- private AuthenticationSession mockAuthenticationSession;
- @Mock
- private SpecificationLoaderSpi mockSpecificationLoader;
-
- @Mock
- private IsisConfiguration mockConfiguration;
-
- private IsisMetaModel isisMetaModel;
-
- private PojoAdapterFactory adapterFactory;
-
- private AdapterManagerDefault adapterManager;
-
- private Customer rootObject;
- private Name aggregatedObject;
-
- private ObjectAdapter persistentParentAdapter;
- private ObjectAdapter aggregatedAdapter;
-
-
-
-
- @Before
- public void setUp() throws Exception {
- org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
-
- context.ignoring(mockRuntimeContext);
- context.ignoring(mockAuthenticationSession);
- context.ignoring(mockConfiguration);
-
- isisMetaModel = new IsisMetaModel(
- mockRuntimeContext,
- new ProgrammingModelFacetsJava5(),
- Lists.newArrayList(new CustomerRepository()));
- isisMetaModel.init();
-
- adapterFactory = new PojoAdapterFactory(adapterManager, mockSpecificationLoader, mockAuthenticationSession) {
- @Override
- protected Localization getLocalization() {
- return mockLocalization;
- }
- };
-
- adapterManager = new AdapterManagerDefault() {
- @Override
- protected SpecificationLoaderSpi getSpecificationLoader() {
- return isisMetaModel.getSpecificationLoader();
- }
- @Override
- protected PojoAdapterFactory getObjectAdapterFactory() {
- return adapterFactory;
- }
- @Override
- public OidGenerator getOidGenerator() {
- return mockOidGenerator;
- }
- @Override
- protected ServicesInjector getServicesInjector() {
- return isisMetaModel.getDependencyInjector();
- }
- };
-
- rootObject = new Customer();
- aggregatedObject = new Name();
-
- persistentParentAdapter = adapterManager.mapRecreatedPojo(
- RootOid.create(ObjectSpecId.of("CUS"), "1"), rootObject);
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/9c17f787/core/runtime/src/test/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionTest.java
index 13bb93f..ce387c9 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionTest.java
@@ -44,6 +44,7 @@ import org.apache.isis.core.metamodel.specloader.InjectorMethodEvaluatorDefault;
import org.apache.isis.core.runtime.persistence.adapter.PojoAdapter;
import org.apache.isis.core.runtime.persistence.adapter.PojoAdapterFactory;
import org.apache.isis.core.runtime.persistence.adaptermanager.AdapterManagerDefault;
+import org.apache.isis.core.runtime.persistence.adaptermanager.PojoRecreator;
import org.apache.isis.core.runtime.persistence.internal.RuntimeContextFromSession;
import org.apache.isis.core.runtime.persistence.objectstore.transaction.CreateObjectCommand;
import org.apache.isis.core.runtime.persistence.objectstore.transaction.DestroyObjectCommand;
@@ -149,7 +150,7 @@ public class PersistenceSessionTest {
servicesInjector = new ServicesInjectorDefault(
Collections.<Object>singletonList(container),new InjectorMethodEvaluatorDefault());
- adapterManager = new AdapterManagerDefault();
+ adapterManager = new AdapterManagerDefault(new PojoRecreator(persistenceSession, mockSpecificationLoader));
adapterFactory = new PojoAdapterFactory(adapterManager, mockSpecificationLoader, mockAuthenticationSession);
persistenceSession = new PersistenceSession(mockPersistenceSessionFactory, mockConfiguration,
mockSpecificationLoader, mockAuthenticationSession) {