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/17 11:46:53 UTC
[04/10] isis git commit: ISIS-1194: minor refactor of
IsisComponentProvider,
return ServicesInjector rather than simple list of services
ISIS-1194: minor refactor of IsisComponentProvider, return ServicesInjector rather than simple list of services
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/fe2b2ba5
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/fe2b2ba5
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/fe2b2ba5
Branch: refs/heads/master
Commit: fe2b2ba55d4b865d4428d56899b7dcc215730e07
Parents: 5e9d281
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Sep 16 07:48:03 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Sep 16 07:48:03 2015 +0100
----------------------------------------------------------------------
.../org/apache/isis/core/runtime/system/IsisSystem.java | 3 +--
.../systemusinginstallers/IsisComponentProvider.java | 5 +++--
.../IsisComponentProviderAbstract.java | 9 ++++++---
.../IsisComponentProviderDefault2.java | 6 +-----
4 files changed, 11 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/fe2b2ba5/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java
index 5e2dafe..bc635b3 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java
@@ -142,8 +142,7 @@ public class IsisSystem implements DebugSelection, ApplicationScopedComponent {
final IsisConfigurationDefault configuration = isisComponentProvider.getConfiguration();
// services
- final List<Object> services = isisComponentProvider.provideServices();
- ServicesInjectorDefault servicesInjector = new ServicesInjectorDefault(services);
+ ServicesInjectorDefault servicesInjector = isisComponentProvider.provideServiceInjector();
servicesInjector.addFallbackIfRequired(FixtureScripts.class, new FixtureScriptsDefault());
servicesInjector.validateServices();
http://git-wip-us.apache.org/repos/asf/isis/blob/fe2b2ba5/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 9faa7bd..6916be9 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
@@ -20,10 +20,10 @@
package org.apache.isis.core.runtime.systemusinginstallers;
import java.util.Collection;
-import java.util.List;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
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.spec.SpecificationLoaderSpi;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
@@ -45,7 +45,8 @@ public interface IsisComponentProvider {
AuthenticationManager provideAuthenticationManager(DeploymentType deploymentType);
AuthorizationManager provideAuthorizationManager(final DeploymentType deploymentType);
- List<Object> provideServices();
+ ServicesInjectorDefault provideServiceInjector();
+
FixturesInstaller provideFixturesInstaller();
http://git-wip-us.apache.org/repos/asf/isis/blob/fe2b2ba5/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderAbstract.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderAbstract.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderAbstract.java
index 78ea3c3..2a645b8 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderAbstract.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderAbstract.java
@@ -41,6 +41,7 @@ import org.apache.isis.applib.services.classdiscovery.ClassDiscoveryServiceUsing
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.services.ServicesInjectorDefault;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
import org.apache.isis.core.runtime.fixtures.FixturesInstaller;
@@ -204,7 +205,7 @@ public abstract class IsisComponentProviderAbstract implements IsisComponentProv
//endregion
//region > API impl.
-
+
@Override
public DeploymentType getDeploymentType() {
return deploymentType;
@@ -231,9 +232,11 @@ public abstract class IsisComponentProviderAbstract implements IsisComponentProv
}
@Override
- public List<Object> provideServices() {
- return services;
+ public ServicesInjectorDefault provideServiceInjector() {
+ return new ServicesInjectorDefault(services);
}
+
//endregion
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/fe2b2ba5/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 10e6e6d..6356335 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
@@ -39,6 +39,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.ServicesInjectorDefault;
import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
@@ -232,11 +233,6 @@ public class IsisComponentProviderDefault2 extends IsisComponentProviderAbstract
}
@Override
- public List<Object> provideServices() {
- return services;
- }
-
- @Override
public FixturesInstaller provideFixturesInstaller() {
return fixturesInstaller;
}