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/20 13:33:59 UTC
[24/51] [abbrv] isis git commit: ISIS-1407: removed
SpecificationLoaderAware.
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
index 63da828..d0ed28a 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
@@ -29,32 +29,36 @@ import org.datanucleus.api.jdo.JDOPersistenceManagerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
-import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.persistence.FixturesInstalledFlag;
-import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller;
import org.apache.isis.objectstore.jdo.datanucleus.JDOStateManagerForIsis;
import org.apache.isis.objectstore.jdo.service.RegisterEntities;
-public class PersistenceSessionFactory
- implements ApplicationScopedComponent, FixturesInstalledFlag {
+/**
+ *
+ * Factory for {@link PersistenceSession}.
+ *
+ * <p>
+ * Implementing class is added to {@link ServicesInjector} as an (internal) domain service; all public methods
+ * must be annotated using {@link Programmatic}.
+ * </p>
+ */
+public class PersistenceSessionFactory implements ApplicationScopedComponent, FixturesInstalledFlag {
private static final Logger LOG = LoggerFactory.getLogger(PersistenceSessionFactory.class);
//region > constructor
- private final DeploymentType deploymentType;
private final IsisConfigurationDefault configuration;
- public PersistenceSessionFactory(
- final DeploymentType deploymentType,
- final IsisConfigurationDefault isisConfiguration) {
- this.deploymentType = deploymentType;
+ public PersistenceSessionFactory(final IsisConfigurationDefault isisConfiguration) {
this.configuration = isisConfiguration;
}
@@ -64,11 +68,11 @@ public class PersistenceSessionFactory
private DataNucleusApplicationComponents applicationComponents;
- public final void init() {
+ @Programmatic
+ public void init() {
this.applicationComponents = createDataNucleusApplicationComponents(configuration);
}
-
private DataNucleusApplicationComponents createDataNucleusApplicationComponents(
final IsisConfiguration configuration) {
@@ -161,8 +165,9 @@ public class PersistenceSessionFactory
/**
* Called by {@link org.apache.isis.core.runtime.system.session.IsisSessionFactory#openSession(AuthenticationSession)}.
*/
+ @Programmatic
public PersistenceSession createPersistenceSession(
- final ServicesInjectorSpi servicesInjector,
+ final ServicesInjector servicesInjector,
final SpecificationLoader specificationLoader,
final AuthenticationSession authenticationSession) {
@@ -184,11 +189,13 @@ public class PersistenceSessionFactory
private Boolean fixturesInstalled;
+ @Programmatic
@Override
public Boolean isFixturesInstalled() {
return fixturesInstalled;
}
+ @Programmatic
@Override
public void setFixturesInstalled(final Boolean fixturesInstalled) {
this.fixturesInstalled = fixturesInstalled;
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
index 881bb98..9522be5 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
@@ -29,8 +29,7 @@ import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
-import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
@@ -69,7 +68,7 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
private final DeploymentType deploymentType;
private final IsisConfiguration configuration;
private final SpecificationLoader specificationLoaderSpi;
- private final ServicesInjectorSpi servicesInjector;
+ private final ServicesInjector servicesInjector;
private final AuthenticationManager authenticationManager;
private final AuthorizationManager authorizationManager;
private final PersistenceSessionFactory persistenceSessionFactory;
@@ -78,7 +77,7 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
public IsisSessionFactory(
final DeploymentType deploymentType,
final IsisConfiguration configuration,
- final ServicesInjectorSpi servicesInjector,
+ final ServicesInjector servicesInjector,
final SpecificationLoader specificationLoader,
final AuthenticationManager authenticationManager,
final AuthorizationManager authorizationManager,
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
index 9a4cac4..516bcb6 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
@@ -43,7 +43,7 @@ import org.apache.isis.core.commons.components.TransactionScopedComponent;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.util.ToString;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.services.publishing.PublishingServiceInternal;
import org.apache.isis.core.metamodel.transactions.TransactionState;
import org.apache.isis.core.runtime.persistence.objectstore.transaction.CreateObjectCommand;
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
index 7655703..5182e33 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
@@ -42,7 +42,7 @@ import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManagerBase;
import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommand;
import org.apache.isis.core.runtime.services.RequestScopedService;
import org.apache.isis.core.runtime.system.context.IsisContext;
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
index 96698fb..79368a6 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
@@ -48,8 +48,8 @@ import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.commons.lang.ClassUtil;
import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
-import org.apache.isis.core.metamodel.services.ServicesInjectorDefault;
-import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.SpecificationLoaderInstaller;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
@@ -266,8 +266,8 @@ public abstract class IsisComponentProvider {
return authorizationManager;
}
- public ServicesInjectorDefault provideServiceInjector() {
- return new ServicesInjectorDefault(services);
+ public ServicesInjector provideServiceInjector() {
+ return new ServicesInjector(services);
}
public FixturesInstaller provideFixturesInstaller() {
@@ -276,7 +276,7 @@ public abstract class IsisComponentProvider {
public SpecificationLoader provideSpecificationLoader(
final DeploymentType deploymentType,
- final ServicesInjectorSpi servicesInjector,
+ final ServicesInjector servicesInjector,
final Collection<MetaModelRefiner> metaModelRefiners) throws IsisSystemException {
final SpecificationLoaderInstaller reflectorInstaller = new JavaReflectorInstaller(getConfiguration());
@@ -287,7 +287,7 @@ public abstract class IsisComponentProvider {
public PersistenceSessionFactory providePersistenceSessionFactory(
final DeploymentType deploymentType,
- final ServicesInjectorSpi servicesInjector) {
+ final ServicesInjector servicesInjector) {
final PersistenceMechanismInstaller persistenceMechanismInstaller =
new DataNucleusPersistenceMechanismInstaller(getConfiguration());
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
index ef7d119..bbe76bb 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
@@ -35,7 +35,7 @@ import org.apache.isis.core.metamodel.layoutmetadata.LayoutMetadataReader;
import org.apache.isis.core.metamodel.layoutmetadata.json.LayoutMetadataReaderFromJson;
import org.apache.isis.core.metamodel.metamodelvalidator.dflt.MetaModelValidatorDefault;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
-import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
@@ -135,7 +135,7 @@ public class IsisComponentProviderDefault2 extends IsisComponentProvider {
@Override
public SpecificationLoader provideSpecificationLoader(
final DeploymentType deploymentType,
- final ServicesInjectorSpi servicesInjector,
+ final ServicesInjector servicesInjector,
final Collection<MetaModelRefiner> metaModelRefiners) throws IsisSystemException {
final DeploymentCategory deploymentCategory = deploymentType.getDeploymentCategory();
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java
index 6ff1c64..2b41de3 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java
@@ -25,7 +25,7 @@ import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.components.InstallerAbstract;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
-import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.installerregistry.installerapi.PersistenceMechanismInstaller;
import org.apache.isis.core.runtime.system.DeploymentType;
@@ -66,9 +66,9 @@ public class DataNucleusPersistenceMechanismInstaller extends InstallerAbstract
@Override
public PersistenceSessionFactory createPersistenceSessionFactory(
final DeploymentType deploymentType,
- final ServicesInjectorSpi servicesInjector) {
+ final ServicesInjector servicesInjector) {
- return new PersistenceSessionFactory(deploymentType, getConfiguration());
+ return new PersistenceSessionFactory(getConfiguration());
}
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/IsisConfigurationForJdoIntegTests.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/IsisConfigurationForJdoIntegTests.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/IsisConfigurationForJdoIntegTests.java
index 7e859fd..db9b05d 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/IsisConfigurationForJdoIntegTests.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/IsisConfigurationForJdoIntegTests.java
@@ -36,7 +36,7 @@ import org.apache.isis.objectstore.jdo.service.RegisterEntities;
/**
* If instantiated by the integration testing framework, this object will be registered as the implementation of
* the {@link ConfigurationServiceInternal} (internal) domain service, using
- * {@link org.apache.isis.core.metamodel.services.ServicesInjectorDefault#addFallbackIfRequired(Class, Object)}.
+ * {@link org.apache.isis.core.metamodel.services.ServicesInjector#addFallbackIfRequired(Class, Object)}.
*/
public class IsisConfigurationForJdoIntegTests extends IsisConfigurationDefault {
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/JDOStateManagerForIsis.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/JDOStateManagerForIsis.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/JDOStateManagerForIsis.java
index 32d0527..88e77af 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/JDOStateManagerForIsis.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/JDOStateManagerForIsis.java
@@ -27,7 +27,7 @@ import org.datanucleus.state.ReferentialStateManagerImpl;
import org.datanucleus.store.FieldValues;
import org.datanucleus.store.fieldmanager.FieldManager;
-import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.runtime.system.context.IsisContext;
public class JDOStateManagerForIsis extends ReferentialStateManagerImpl {
@@ -214,7 +214,7 @@ public class JDOStateManagerForIsis extends ReferentialStateManagerImpl {
getServicesInjector().injectServicesInto(pc);
}
- protected ServicesInjectorSpi getServicesInjector() {
+ protected ServicesInjector getServicesInjector() {
return IsisContext.getPersistenceSession().getServicesInjector();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
index 19fb80d..1ff10a5 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
@@ -45,7 +45,7 @@ import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
-import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.runtime.persistence.ObjectPersistenceException;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
@@ -196,7 +196,7 @@ public class IsisJdoSupportImpl implements IsisJdoSupport {
return IsisContext.getPersistenceSession();
}
- protected ServicesInjectorSpi getServicesInjector() {
+ protected ServicesInjector getServicesInjector() {
return getPersistenceSession().getServicesInjector();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/runtime/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTest.java
index ff16b30..3237b51 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTest.java
@@ -25,7 +25,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import static org.hamcrest.CoreMatchers.is;
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java
index 3e1e4ab..1cb45ec 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java
@@ -33,7 +33,7 @@ import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacetAbstract;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.feature.ObjectMemberDependencies;
import org.apache.isis.core.metamodel.specloader.specimpl.ObjectActionDefault;
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java
index e9dab8f..4c3ae79 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java
@@ -36,7 +36,7 @@ import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionAddToFacet;
import org.apache.isis.core.metamodel.facets.propcoll.notpersisted.NotPersistedFacet;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.feature.ObjectMemberDependencies;
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext5.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext5.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext5.java
index 0f11391..246067d 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext5.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext5.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.viewer.restfulobjects.rendering;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
/**
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
index 3267ab9..226ae18 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
@@ -43,7 +43,7 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/conneg/RestfulObjectsJaxbWriterForXml.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/conneg/RestfulObjectsJaxbWriterForXml.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/conneg/RestfulObjectsJaxbWriterForXml.java
index b259fdc..783dc6d 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/conneg/RestfulObjectsJaxbWriterForXml.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/conneg/RestfulObjectsJaxbWriterForXml.java
@@ -29,7 +29,7 @@ import javax.xml.bind.Marshaller;
import org.jboss.resteasy.plugins.providers.jaxb.JAXBXmlRootElementProvider;
import org.apache.isis.applib.services.bookmark.BookmarkService;
-import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.schema.utils.jaxbadapters.PersistentEntityAdapter;
@@ -58,7 +58,7 @@ public class RestfulObjectsJaxbWriterForXml extends JAXBXmlRootElementProvider {
@Override
protected BookmarkService getBookmarkService() {
final PersistenceSession persistenceSession = IsisContext.getPersistenceSession();
- final ServicesInjectorSpi servicesInjector = persistenceSession.getServicesInjector();
+ final ServicesInjector servicesInjector = persistenceSession.getServicesInjector();
return servicesInjector.lookupService(BookmarkService.class);
}
});
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java
index 44a4d0b..916d500 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java
@@ -30,7 +30,7 @@ import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
index ad14fc4..fae5b0c 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
@@ -38,7 +38,7 @@ import org.apache.isis.core.commons.url.UrlEncodingUtils;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.services.ServiceUtil;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/SwaggerSpecResource.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/SwaggerSpecResource.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/SwaggerSpecResource.java
index 4032013..d051294 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/SwaggerSpecResource.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/SwaggerSpecResource.java
@@ -29,7 +29,7 @@ import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import org.apache.isis.applib.services.swagger.SwaggerService;
-import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
@@ -114,7 +114,7 @@ public class SwaggerSpecResource {
@Inject
SwaggerService swaggerService;
- ServicesInjectorSpi getServicesInjector() {
+ ServicesInjector getServicesInjector() {
return getPersistenceSession().getServicesInjector();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/LocalizerForIsis.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/LocalizerForIsis.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/LocalizerForIsis.java
index c8d0340..66be00a 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/LocalizerForIsis.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/LocalizerForIsis.java
@@ -33,7 +33,7 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.viewer.wicket.viewer.IsisWicketApplication;
@@ -148,7 +148,7 @@ public class LocalizerForIsis extends Localizer {
.lookupService(TranslationService.class);
}
- protected ServicesInjectorSpi getServicesInjector() {
+ protected ServicesInjector getServicesInjector() {
return getPersistenceSession().getServicesInjector();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
index 6bcf74c..8e2c289 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
@@ -49,7 +49,7 @@ import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerComposite;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerForType;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.session.IsisSession;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
index b569d86..dcd2626 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
@@ -60,7 +60,7 @@ import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
-import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ActionType;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -688,7 +688,7 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> {
return new ActionModel(this);
}
- protected ServicesInjectorSpi getServicesInjector() {
+ protected ServicesInjector getServicesInjector() {
return getPersistenceSession().getServicesInjector();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
index d8daeac..58d9ce3 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
@@ -43,12 +43,12 @@ import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facets.collections.sortedby.SortedByFacet;
import org.apache.isis.core.metamodel.facets.object.paged.PagedFacet;
import org.apache.isis.core.metamodel.facets.object.plural.PluralFacet;
-import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
@@ -510,7 +510,7 @@ public class EntityCollectionModel extends ModelAbstract<List<ObjectAdapter>> im
return getPersistenceSessionStatic();
}
- private static ServicesInjectorSpi getServicesInjector() {
+ private static ServicesInjector getServicesInjector() {
return getPersistenceSessionStatic().getServicesInjector();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
index 284c3ee..eada635 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
@@ -43,7 +43,7 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index 87d142c..b7435ad 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -60,7 +60,7 @@ import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerComposite;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.authentication.MessageBroker;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
@@ -429,7 +429,7 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
// System components
// ///////////////////////////////////////////////////
- protected ServicesInjectorSpi getServicesInjector() {
+ protected ServicesInjector getServicesInjector() {
return getPersistenceSession().getServicesInjector();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
index f2e5b2f..a3c4235 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
@@ -28,7 +28,7 @@ import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.runtime.system.IsisSystem;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
@@ -150,7 +150,7 @@ public abstract class PanelAbstract<T extends IModel<?>> extends Panel
return IsisContext.getPersistenceSession();
}
- protected ServicesInjectorSpi getServicesInjector() {
+ protected ServicesInjector getServicesInjector() {
return getPersistenceSession().getServicesInjector();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/wrapper/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
----------------------------------------------------------------------
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
index 52aa5e9..cc52a94 100644
--- a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
+++ b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
@@ -56,7 +56,6 @@ import org.apache.isis.core.metamodel.adapter.mgr.AdapterManagerAware;
import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionService;
import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionServiceAware;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoaderAware;
import org.apache.isis.core.wrapper.dispatchers.InteractionEventDispatcher;
import org.apache.isis.core.wrapper.dispatchers.InteractionEventDispatcherTypeSafe;
import org.apache.isis.core.wrapper.handlers.ProxyContextHandler;
@@ -75,14 +74,11 @@ import org.apache.isis.core.wrapper.proxy.ProxyCreator;
*/
@DomainService(nature = NatureOfService.DOMAIN)
public class WrapperFactoryDefault implements WrapperFactory,
- SpecificationLoaderAware, AdapterManagerAware, PersistenceSessionServiceAware {
+ AdapterManagerAware, PersistenceSessionServiceAware {
private final List<InteractionListener> listeners = new ArrayList<InteractionListener>();
private final Map<Class<? extends InteractionEvent>, InteractionEventDispatcher> dispatchersByEventClass = new HashMap<Class<? extends InteractionEvent>, InteractionEventDispatcher>();
- private SpecificationLoader specificationLoader;
- private AdapterManager adapterManager;
- private PersistenceSessionService persistenceSessionService;
private final ProxyContextHandler proxyContextHandler;
@@ -257,7 +253,8 @@ public class WrapperFactoryDefault implements WrapperFactory,
}
protected <T> T createProxy(final T domainObject, final ExecutionMode mode) {
- return proxyContextHandler.proxy(domainObject, this, mode, authenticationSessionProvider, getSpecificationLoader(), getAdapterManager(), getPersistenceSessionService());
+ return proxyContextHandler.proxy(domainObject, this, mode, authenticationSessionProvider, specificationLoader,
+ getAdapterManager(), getPersistenceSessionService());
}
@Override
@@ -304,11 +301,11 @@ public class WrapperFactoryDefault implements WrapperFactory,
dispatcher.dispatch(interactionEvent);
}
- // /////////////////////////////////////////////////////////////
- // Listeners
- // /////////////////////////////////////////////////////////////
+ private AdapterManager adapterManager;
+ private PersistenceSessionService persistenceSessionService;
+
protected AdapterManager getAdapterManager() {
return adapterManager;
}
@@ -319,14 +316,6 @@ public class WrapperFactoryDefault implements WrapperFactory,
}
- protected SpecificationLoader getSpecificationLoader() {
- return specificationLoader;
- }
- @Programmatic
- @Override
- public void setSpecificationLoader(final SpecificationLoader specificationLookup) {
- this.specificationLoader = specificationLookup;
- }
protected PersistenceSessionService getPersistenceSessionService() {
return persistenceSessionService;
@@ -341,5 +330,7 @@ public class WrapperFactoryDefault implements WrapperFactory,
@Inject
AuthenticationSessionProvider authenticationSessionProvider;
+ @Inject
+ SpecificationLoader specificationLoader;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/ProxyContextHandler.java
----------------------------------------------------------------------
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/ProxyContextHandler.java b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/ProxyContextHandler.java
index 945a274..2b38ef5 100644
--- a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/ProxyContextHandler.java
+++ b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/ProxyContextHandler.java
@@ -43,8 +43,15 @@ public class ProxyContextHandler {
public ProxyContextHandler(final ProxyCreator proxyCreator) {
this.proxyCreator = proxyCreator;
}
-
- public <T> T proxy(final T domainObject, final WrapperFactory wrapperFactory, final ExecutionMode mode, final AuthenticationSessionProvider authenticationSessionProvider, final SpecificationLoader specificationLookup, final AdapterManager adapterManager, final PersistenceSessionService persistenceSessionService) {
+
+ public <T> T proxy(
+ final T domainObject,
+ final WrapperFactory wrapperFactory,
+ final ExecutionMode mode,
+ final AuthenticationSessionProvider authenticationSessionProvider,
+ final SpecificationLoader specificationLookup,
+ final AdapterManager adapterManager,
+ final PersistenceSessionService persistenceSessionService) {
Ensure.ensureThatArg(wrapperFactory, is(not(nullValue())));
Ensure.ensureThatArg(authenticationSessionProvider, is(not(nullValue())));
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
----------------------------------------------------------------------
diff --git a/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java b/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
index 55342aa..7cd2c9f 100644
--- a/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
+++ b/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
@@ -29,6 +29,8 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
+import org.apache.isis.applib.services.command.Command;
+import org.apache.isis.applib.services.command.CommandContext;
import org.apache.isis.applib.services.wrapper.DisabledException;
import org.apache.isis.applib.services.wrapper.HiddenException;
import org.apache.isis.applib.services.wrapper.InvalidException;
@@ -36,6 +38,7 @@ import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
+import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
@@ -50,13 +53,16 @@ import org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySe
import org.apache.isis.core.metamodel.facets.properties.validating.method.PropertyValidateFacetViaMethod;
import org.apache.isis.core.metamodel.runtimecontext.MessageBrokerService;
import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionService;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
+import org.apache.isis.core.metamodel.services.command.CommandDtoServiceInternal;
+import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
import org.apache.isis.core.metamodel.spec.feature.ObjectMemberDependencies;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.specimpl.OneToOneAssociationDefault;
import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
import org.apache.isis.core.runtime.authentication.standard.SimpleSession;
+import org.apache.isis.core.runtime.services.command.CommandDtoServiceInternalDefault;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.progmodel.wrapper.dom.employees.Employee;
@@ -86,6 +92,12 @@ public class WrapperFactoryDefaultTest_wrappedObject {
@Mock
private ServicesInjector mockServicesInjector;
@Mock
+ private CommandContext mockCommandContext;
+ @Mock
+ private Command mockCommand;
+ @Mock
+ private CommandDtoServiceInternal mockCommandDtoServiceInternal;
+ @Mock
private SpecificationLoader mockSpecificationLoader;
@Mock
private DeploymentCategoryProvider mockDeploymentCategoryProvider;
@@ -122,49 +134,52 @@ public class WrapperFactoryDefaultTest_wrappedObject {
@Before
public void setUp() {
+
objectMemberDependencies = new ObjectMemberDependencies(
mockSpecificationLoader, mockServicesInjector,
mockPersistenceSessionService);
-
+
employeeRepository = new EmployeeRepositoryImpl();
employeeDO = new Employee();
employeeDO.setName("Smith");
- employeeDO.setEmployeeRepository(employeeRepository);
-
- wrapperFactory = createWrapperFactory();
- wrapperFactory.setAdapterManager(mockAdapterManager);
- wrapperFactory.setPersistenceSessionService(mockPersistenceSessionService);
- wrapperFactory.setSpecificationLoader(mockSpecificationLoader);
+ employeeDO.setEmployeeRepository(employeeRepository);
context.checking(new Expectations() {
{
+ allowing(mockEmployeeAdapter).getOid();
+ will(returnValue(RootOid.create(ObjectSpecId.of("EMP"), "1")));
+
+ allowing(mockEmployeeSpec).getCorrespondingClass();
+ will(returnValue(Employee.class));
+
+ allowing(mockStringSpec).getCorrespondingClass();
+ will(returnValue(String.class));
+
+ allowing(mockServicesInjector).lookupService(CommandContext.class);
+ will(returnValue(mockCommandContext));
+
+ allowing(mockCommandContext).getCommand();
+ will(returnValue(mockCommand));
+
+ allowing(mockServicesInjector).lookupService(CommandDtoServiceInternal.class);
+ will(returnValue(new CommandDtoServiceInternalDefault()));
+
allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
will(returnValue(mockAuthenticationSessionProvider));
+ allowing(mockDeploymentCategoryProvider).getDeploymentCategory();
+ will(returnValue(DeploymentCategory.PRODUCTION));
+
+ allowing(mockServicesInjector).lookupService(SpecificationLoader.class);
+ will(returnValue(mockSpecificationLoader));
+
allowing(mockSpecificationLoader).loadSpecification(String.class);
will(returnValue(mockStringSpec));
allowing(mockStringSpec).getShortIdentifier();
will(returnValue(String.class.getName()));
- }
- });
-
-
- final Method employeeGetNameMethod = methodOf(Employee.class, "getName");
- final Method employeeSetNameMethod = methodOf(Employee.class, "setName", String.class);
- final Method employeeModifyNameMethod = methodOf(Employee.class, "modifyName", String.class);
- final Method employeeHideNameMethod = methodOf(Employee.class, "hideName");
- final Method employeeDisableNameMethod = methodOf(Employee.class, "disableName");
- final Method employeeValidateNameMethod = methodOf(Employee.class, "validateName", String.class);
- final Method employeeClearNameMethod = methodOf(Employee.class, "clearName");
- employeeNameMember = new OneToOneAssociationDefault(
- facetedMethodForProperty(
- employeeSetNameMethod, employeeGetNameMethod, employeeModifyNameMethod, employeeClearNameMethod, employeeHideNameMethod, employeeDisableNameMethod, employeeValidateNameMethod),
- objectMemberDependencies);
-
- context.checking(new Expectations() {
- {
+
allowing(mockDeploymentCategoryProvider).getDeploymentCategory();
will(returnValue(DeploymentCategory.PRODUCTION));
@@ -174,6 +189,9 @@ public class WrapperFactoryDefaultTest_wrappedObject {
allowing(mockAdapterManager).getAdapterFor(employeeDO);
will(returnValue(mockEmployeeAdapter));
+ allowing(mockAdapterManager).adapterFor(employeeDO);
+ will(returnValue(mockEmployeeAdapter));
+
allowing(mockEmployeeAdapter).getSpecification();
will(returnValue(mockEmployeeSpec));
@@ -182,7 +200,30 @@ public class WrapperFactoryDefaultTest_wrappedObject {
allowing(mockEmployeeSpec).getMember(methodOf(Employee.class, "getEmployeeRepository"));
will(returnValue(null));
+ }
+ });
+
+ wrapperFactory = createWrapperFactory();
+ wrapperFactory.setAdapterManager(mockAdapterManager);
+ wrapperFactory.setPersistenceSessionService(mockPersistenceSessionService);
+ wrapperFactory.specificationLoader = mockSpecificationLoader;
+ wrapperFactory.authenticationSessionProvider = mockAuthenticationSessionProvider;
+
+ final Method employeeGetNameMethod = methodOf(Employee.class, "getName");
+ final Method employeeSetNameMethod = methodOf(Employee.class, "setName", String.class);
+ final Method employeeModifyNameMethod = methodOf(Employee.class, "modifyName", String.class);
+ final Method employeeHideNameMethod = methodOf(Employee.class, "hideName");
+ final Method employeeDisableNameMethod = methodOf(Employee.class, "disableName");
+ final Method employeeValidateNameMethod = methodOf(Employee.class, "validateName", String.class);
+ final Method employeeClearNameMethod = methodOf(Employee.class, "clearName");
+ employeeNameMember = new OneToOneAssociationDefault(
+ facetedMethodForProperty(
+ employeeSetNameMethod, employeeGetNameMethod, employeeModifyNameMethod, employeeClearNameMethod, employeeHideNameMethod, employeeDisableNameMethod, employeeValidateNameMethod),
+ objectMemberDependencies);
+
+ context.checking(new Expectations() {
+ {
allowing(mockEmployeeSpec).getMember(employeeGetNameMethod);
will(returnValue(employeeNameMember));
@@ -191,13 +232,13 @@ public class WrapperFactoryDefaultTest_wrappedObject {
allowing(mockEmployeeSpec).getMember(employeeModifyNameMethod);
will(returnValue(employeeNameMember));
-
+
allowing(mockEmployeeSpec).getMember(employeeClearNameMethod);
will(returnValue(employeeNameMember));
-
+
allowing(mockEmployeeAdapter).getObject();
will(returnValue(employeeDO));
-
+
allowing(mockEmployeeAdapter).representsPersistent();
will(returnValue(true));
}
@@ -236,7 +277,22 @@ public class WrapperFactoryDefaultTest_wrappedObject {
public void shouldBeAbleToReadVisibleProperty() {
allowingEmployeeHasSmithAdapter();
-
+
+ context.checking(new Expectations() {{
+ oneOf(mockConfiguration).getBoolean("isis.reflector.facet.filterVisibility", true);
+ will(returnValue(true));
+
+ allowing(mockAdapterForStringSmith).getSpecification();
+ will(returnValue(mockStringSpec));
+
+ ignoring(mockStringSpec);
+
+ allowing(mockAdapterForStringSmith).isDestroyed();
+ will(returnValue(false));
+
+ allowing(mockPersistenceSessionService).adapterFor("Smith");
+ will(returnValue(mockAdapterForStringSmith));
+ }});
// then
assertThat(employeeWO.getName(), is(employeeDO.getName()));
@@ -263,9 +319,23 @@ public class WrapperFactoryDefaultTest_wrappedObject {
context.checking(new Expectations() {
{
+ allowing(mockAdapterForStringJones).titleString(null);
+
+ ignoring(mockCommand);
+
+ oneOf(mockConfiguration).getBoolean("isis.reflector.facet.filterVisibility", true);
+ will(returnValue(true));
- oneOf(mockAdapterManager).adapterFor("Jones");
+ allowing(mockAdapterForStringJones).isDestroyed();
+ will(returnValue(false));
+
+ allowing(mockAdapterForStringJones).getSpecification();
+ will(returnValue(mockStringSpec));
+
+ allowing(mockPersistenceSessionService).adapterFor("Jones");
will(returnValue(mockAdapterForStringJones));
+
+ ignoring(mockStringSpec);
}
});
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
----------------------------------------------------------------------
diff --git a/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java b/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
index 225162c..dd05e8a 100644
--- a/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
+++ b/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
@@ -55,6 +55,7 @@ import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacetAbstr
import org.apache.isis.core.metamodel.facets.properties.accessor.PropertyAccessorFacetViaAccessor;
import org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySetterFacetViaSetterMethod;
import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionService;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
@@ -97,6 +98,8 @@ public class WrapperFactoryDefaultTest_wrappedObject_transient {
@Mock
private Identifier mockPasswordIdentifier;
+ @Mock
+ private ServicesInjector mockServicesInjector;
@Mock
protected ObjectAdapter mockPasswordAdapter;
@@ -125,16 +128,22 @@ public class WrapperFactoryDefaultTest_wrappedObject_transient {
wrapperFactory.setAdapterManager(mockAdapterManager);
wrapperFactory.authenticationSessionProvider = mockAuthenticationSessionProvider;
wrapperFactory.setPersistenceSessionService(mockPersistenceSessionService);
- wrapperFactory.setSpecificationLoader(mockSpecificationLoader);
-
+ wrapperFactory.specificationLoader = mockSpecificationLoader;
+
context.checking(new Expectations() {
{
+ allowing(mockServicesInjector).lookupService(SpecificationLoader.class);
+ will(returnValue(mockSpecificationLoader));
+
allowing(mockDeploymentCategoryProvider).getDeploymentCategory();
will(returnValue(DeploymentCategory.PRODUCTION));
allowing(mockAdapterManager).getAdapterFor(employeeDO);
will(returnValue(mockEmployeeAdapter));
+ allowing(mockAdapterManager).adapterFor(employeeDO);
+ will(returnValue(mockEmployeeAdapter));
+
allowing(mockAdapterManager).adapterFor(passwordValue);
will(returnValue(mockPasswordAdapter));
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/mothballed/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/legacy/IsisTestRunner.java
----------------------------------------------------------------------
diff --git a/mothballed/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/legacy/IsisTestRunner.java b/mothballed/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/legacy/IsisTestRunner.java
index cdd1170..aabf5a2 100644
--- a/mothballed/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/legacy/IsisTestRunner.java
+++ b/mothballed/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/legacy/IsisTestRunner.java
@@ -32,7 +32,7 @@ import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
import org.apache.isis.core.commons.config.IsisConfigurationBuilderDefault;
import org.apache.isis.core.integtestsupport.legacy.components.IsisSystemUsingInstallersWithinJunit;
-import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
import org.apache.isis.core.runtime.authentication.exploration.AuthenticationRequestExploration;
import org.apache.isis.core.runtime.fixtures.authentication.AuthenticationRequestLogonFixture;
@@ -204,7 +204,7 @@ public class IsisTestRunner extends JUnit4ClassRunner {
return IsisContext.getPersistenceSession();
}
- private static ServicesInjectorSpi getServicesInjector() {
+ private static ServicesInjector getServicesInjector() {
return getPersistenceSession().getServicesInjector();
}