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/06/09 07:08:51 UTC
[03/26] isis git commit: ISIS-1427: SpecificationLoader does not
require DeploymentCategory or Isisconfiguration in its constructor.
ISIS-1427: SpecificationLoader does not require DeploymentCategory or Isisconfiguration in its constructor.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/848d098e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/848d098e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/848d098e
Branch: refs/heads/ISIS-1427
Commit: 848d098e097f1a89e8f143d95f1052e852911989
Parents: 5207999
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Jun 7 19:30:26 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Jun 7 19:30:26 2016 +0100
----------------------------------------------------------------------
.../isis/core/metamodel/specloader/SpecificationLoader.java | 6 ------
.../org/apache/isis/progmodels/dflt/JavaReflectorHelper.java | 1 -
.../metamodel/specloader/SpecificationLoaderTestAbstract.java | 3 +--
3 files changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/848d098e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
index 4dab379..5cf5433 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
@@ -34,11 +34,9 @@ import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.lang.ClassUtil;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.FacetFactory;
import org.apache.isis.core.metamodel.facets.object.autocomplete.AutoCompleteFacet;
@@ -89,7 +87,6 @@ public class SpecificationLoader implements ApplicationScopedComponent {
//region > constructor, fields
private final ClassSubstitutor classSubstitutor = new ClassSubstitutor();
- private final DeploymentCategory deploymentCategory;
private final ProgrammingModel programmingModel;
private final FacetProcessor facetProcessor;
@@ -100,14 +97,11 @@ public class SpecificationLoader implements ApplicationScopedComponent {
private final List<LayoutMetadataReader> layoutMetadataReaders;
public SpecificationLoader(
- final DeploymentCategory deploymentCategory,
- final IsisConfiguration configuration,
final ProgrammingModel programmingModel,
final MetaModelValidator metaModelValidator,
final List<LayoutMetadataReader> layoutMetadataReaders,
final ServicesInjector servicesInjector) {
- this.deploymentCategory = deploymentCategory;
this.servicesInjector = servicesInjector;
this.programmingModel = programmingModel;
http://git-wip-us.apache.org/repos/asf/isis/blob/848d098e/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorHelper.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorHelper.java b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorHelper.java
index 274aa94..43beddd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorHelper.java
+++ b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorHelper.java
@@ -63,7 +63,6 @@ public final class JavaReflectorHelper {
}
return new SpecificationLoader(
- deploymentCategory, configuration,
programmingModel, metaModelValidator, layoutMetadataReaders, servicesInjector);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/848d098e/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
index 18b7d7f..69d56fd 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
@@ -117,8 +117,7 @@ public abstract class SpecificationLoaderTestAbstract {
stubConfiguration);
final SpecificationLoader specificationLoader =
- new SpecificationLoader(DeploymentCategory.PRODUCTION,
- stubConfiguration,
+ new SpecificationLoader(
new ProgrammingModelFacetsJava5(stubConfiguration),
new MetaModelValidatorDefault(),
Lists.<LayoutMetadataReader>newArrayList(