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/05/01 10:48:52 UTC

isis git commit: ISIS-1141: call the facet include/exclude from IsisSystemDefault (as used by integration tests).

Repository: isis
Updated Branches:
  refs/heads/master acb9ac0f8 -> c42eb819f


ISIS-1141: call the facet include/exclude from IsisSystemDefault (as used by integration tests).

This is only a piecemeal solution... a more thorough refactoring will be required in the future, I think :-(


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c42eb819
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c42eb819
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c42eb819

Branch: refs/heads/master
Commit: c42eb819f1bce9e93fe6254f7cb964594533eeda
Parents: acb9ac0
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri May 1 09:48:28 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri May 1 09:48:28 2015 +0100

----------------------------------------------------------------------
 .../isis/applib/events/ActionArgumentEvent.java |  2 +-
 .../integtestsupport/IsisSystemDefault.java     |  8 +++-
 .../metamodel/progmodel/ProgrammingModel.java   | 45 ++++++++++++++++++++
 .../specloader/ReflectorConstants.java          |  4 +-
 .../JavaReflectorInstallerNoDecorators.java     | 24 ++++-------
 5 files changed, 64 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/c42eb819/core/applib/src/main/java/org/apache/isis/applib/events/ActionArgumentEvent.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/ActionArgumentEvent.java b/core/applib/src/main/java/org/apache/isis/applib/events/ActionArgumentEvent.java
index 4fc99d5..e497e8d 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/events/ActionArgumentEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/events/ActionArgumentEvent.java
@@ -70,7 +70,7 @@ public class ActionArgumentEvent extends ValidityEvent {
     
     @Override
     public String getReasonMessage() {
-    	return String.format("Invalid action argument. CssClassFaPosition: %s. Proposed value: %s. Reason: %s", this.getPosition(), this.getProposed(), super.getReasonMessage());
+    	return String.format("Invalid action argument. Position: %s. Proposed value: %s. Reason: %s", this.getPosition(), this.getProposed(), super.getReasonMessage());
     }
     
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/c42eb819/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemDefault.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemDefault.java b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemDefault.java
index 8c2f197..0b69da8 100644
--- a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemDefault.java
+++ b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemDefault.java
@@ -139,7 +139,13 @@ public class IsisSystemDefault extends IsisSystemAbstract {
      * Optional hook method.
      */
     protected ProgrammingModel obtainReflectorProgrammingModel() {
-        return new ProgrammingModelFacetsJava5();
+        final ProgrammingModelFacetsJava5 programmingModel = new ProgrammingModelFacetsJava5();
+
+        // TODO: this is duplicating logic in JavaReflectorInstallerNoDecorators; need to unify.
+
+        ProgrammingModel.Util.includeFacetFactories(getConfiguration(), programmingModel);
+        ProgrammingModel.Util.excludeFacetFactories(getConfiguration(), programmingModel);
+        return programmingModel;
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/isis/blob/c42eb819/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModel.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModel.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModel.java
index 8566af3..590b779 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModel.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModel.java
@@ -21,8 +21,12 @@ package org.apache.isis.core.metamodel.progmodel;
 
 import java.util.List;
 
+import org.apache.isis.core.commons.config.ConfigurationConstants;
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.commons.factory.InstanceUtil;
 import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
 import org.apache.isis.core.metamodel.facets.FacetFactory;
+import org.apache.isis.core.metamodel.specloader.ReflectorConstants;
 
 public interface ProgrammingModel extends MetaModelValidatorRefiner {
 
@@ -40,4 +44,45 @@ public interface ProgrammingModel extends MetaModelValidatorRefiner {
 
     void removeFactory(Class<? extends FacetFactory> facetFactoryClass);
 
+    /**
+     * Key used to lookup comma-separated list of {@link FacetFactory}s to
+     * include.
+     *
+     * @see #FACET_FACTORY_EXCLUDE_CLASS_NAME_LIST
+     */
+    public static final String FACET_FACTORY_INCLUDE_CLASS_NAME_LIST = ConfigurationConstants.ROOT + "reflector.facets.include";
+
+    /**
+     * Key used to lookup comma-separated list of {@link FacetFactory}s to
+     * exclude.
+     *
+     * @see #FACET_FACTORY_INCLUDE_CLASS_NAME_LIST
+     */
+    public static final String FACET_FACTORY_EXCLUDE_CLASS_NAME_LIST = ConfigurationConstants.ROOT + "reflector.facets.exclude";
+
+    /**
+     * This is a bit nasty, but currently the bootstrapping of the metamodel for integration tests vs the webapp differs;
+     * the intent of this class is to centralize some logic that should be applied in both cases.
+     */
+    public static class Util {
+        private Util(){}
+
+        public static void includeFacetFactories(final IsisConfiguration configuration, final ProgrammingModel programmingModel) {
+            final String[] facetFactoriesIncludeClassNames = configuration.getList(ReflectorConstants.FACET_FACTORY_INCLUDE_CLASS_NAME_LIST);
+            if (facetFactoriesIncludeClassNames != null) {
+                for (final String facetFactoryClassName : facetFactoriesIncludeClassNames) {
+                    final Class<? extends FacetFactory> facetFactory = InstanceUtil.loadClass(facetFactoryClassName, FacetFactory.class);
+                    programmingModel.addFactory(facetFactory);
+                }
+            }
+        }
+
+        public static void excludeFacetFactories(final IsisConfiguration configuration, final ProgrammingModel programmingModel) {
+            final String[] facetFactoriesExcludeClassNames = configuration.getList(ReflectorConstants.FACET_FACTORY_EXCLUDE_CLASS_NAME_LIST);
+            for (final String facetFactoryClassName : facetFactoriesExcludeClassNames) {
+                final Class<? extends FacetFactory> facetFactory = InstanceUtil.loadClass(facetFactoryClassName, FacetFactory.class);
+                programmingModel.removeFactory(facetFactory);
+            }
+        }
+    }
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/c42eb819/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ReflectorConstants.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ReflectorConstants.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ReflectorConstants.java
index c603ba0..a71af17 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ReflectorConstants.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ReflectorConstants.java
@@ -57,7 +57,7 @@ public final class ReflectorConstants {
      * @see #PROGRAMMING_MODEL_FACETS_CLASS_NAME
      * @see #FACET_FACTORY_EXCLUDE_CLASS_NAME_LIST
      */
-    public static final String FACET_FACTORY_INCLUDE_CLASS_NAME_LIST = ConfigurationConstants.ROOT + "reflector.facets.include";
+    public static final String FACET_FACTORY_INCLUDE_CLASS_NAME_LIST = ProgrammingModel.FACET_FACTORY_INCLUDE_CLASS_NAME_LIST;
 
     /**
      * Key used to lookup comma-separated list of {@link FacetFactory}s to
@@ -67,7 +67,7 @@ public final class ReflectorConstants {
      * @see #PROGRAMMING_MODEL_FACETS_CLASS_NAME
      * @see #FACET_FACTORY_INCLUDE_CLASS_NAME_LIST
      */
-    public static final String FACET_FACTORY_EXCLUDE_CLASS_NAME_LIST = ConfigurationConstants.ROOT + "reflector.facets.exclude";
+    public static final String FACET_FACTORY_EXCLUDE_CLASS_NAME_LIST = ProgrammingModel.FACET_FACTORY_EXCLUDE_CLASS_NAME_LIST;
 
     /**
      * Key used to lookup comma-separated list of {@link FacetDecorator}s.

http://git-wip-us.apache.org/repos/asf/isis/blob/c42eb819/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstallerNoDecorators.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstallerNoDecorators.java b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstallerNoDecorators.java
index 443e3a9..3841e4d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstallerNoDecorators.java
+++ b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstallerNoDecorators.java
@@ -93,7 +93,7 @@ public class JavaReflectorInstallerNoDecorators extends InstallerAbstract implem
      * {@link IsisConfiguration} using
      * {@link ReflectorConstants#PROGRAMMING_MODEL_FACETS_CLASS_NAME}. If not
      * specified, then defaults to
-     * {@value ReflectorConstants#PROGRAMMING_MODEL_FACETS_CLASS_NAME_DEFAULT}.
+     * {@link ReflectorConstants#PROGRAMMING_MODEL_FACETS_CLASS_NAME_DEFAULT}.
      * 
      * <p>
      * The list of facets can be adjusted using
@@ -104,8 +104,7 @@ public class JavaReflectorInstallerNoDecorators extends InstallerAbstract implem
      */
     protected ProgrammingModel createProgrammingModel(final IsisConfiguration configuration) {
         final ProgrammingModel programmingModel = lookupAndCreateProgrammingModelFacets(configuration);
-        includeFacetFactories(configuration, programmingModel);
-        excludeFacetFactories(configuration, programmingModel);
+        includeAndExcludeFacetFactories(configuration, programmingModel);
         return programmingModel;
     }
 
@@ -115,19 +114,18 @@ public class JavaReflectorInstallerNoDecorators extends InstallerAbstract implem
         return programmingModel;
     }
 
+    private void includeAndExcludeFacetFactories(final IsisConfiguration configuration, final ProgrammingModel programmingModel) {
+        includeFacetFactories(configuration, programmingModel);
+        excludeFacetFactories(configuration, programmingModel);
+    }
+
     /**
      * Factored out of {@link #createProgrammingModel(IsisConfiguration)}
      * so that subclasses that choose to override can still support
      * customization of their {@link ProgrammingModel} in a similar way.
      */
     protected void includeFacetFactories(final IsisConfiguration configuration, final ProgrammingModel programmingModel) {
-        final String[] facetFactoriesIncludeClassNames = configuration.getList(ReflectorConstants.FACET_FACTORY_INCLUDE_CLASS_NAME_LIST);
-        if (facetFactoriesIncludeClassNames != null) {
-            for (final String facetFactoryClassName : facetFactoriesIncludeClassNames) {
-                final Class<? extends FacetFactory> facetFactory = InstanceUtil.loadClass(facetFactoryClassName, FacetFactory.class);
-                programmingModel.addFactory(facetFactory);
-            }
-        }
+        ProgrammingModel.Util.includeFacetFactories(configuration, programmingModel);
     }
 
     /**
@@ -136,11 +134,7 @@ public class JavaReflectorInstallerNoDecorators extends InstallerAbstract implem
      * customization of their {@link ProgrammingModel} in a similar way.
      */
     protected void excludeFacetFactories(final IsisConfiguration configuration, final ProgrammingModel programmingModel) {
-        final String[] facetFactoriesExcludeClassNames = configuration.getList(ReflectorConstants.FACET_FACTORY_EXCLUDE_CLASS_NAME_LIST);
-        for (final String facetFactoryClassName : facetFactoriesExcludeClassNames) {
-            final Class<? extends FacetFactory> facetFactory = InstanceUtil.loadClass(facetFactoryClassName, FacetFactory.class);
-            programmingModel.removeFactory(facetFactory);
-        }
+        ProgrammingModel.Util.excludeFacetFactories(configuration, programmingModel);
     }
 
     /**