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 2014/12/17 09:07:00 UTC
[5/6] isis git commit: ISIS-284: enhancing ServicesInstaller so can
be used within mvn metamodel (basically: a flag to optionally ignore any
services that cannot be instantiated);
also fixes to IsisMetaModel to correctly set up the MetaModelValidator (co
ISIS-284: enhancing ServicesInstaller so can be used within mvn metamodel (basically: a flag to optionally ignore any services that cannot be instantiated); also fixes to IsisMetaModel to correctly set up the MetaModelValidator (composite).
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/448516e4
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/448516e4
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/448516e4
Branch: refs/heads/master
Commit: 448516e485c275b897c1937cda210b627e7b5894
Parents: 2b62e17
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Dec 17 00:53:23 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Dec 17 00:53:23 2014 +0000
----------------------------------------------------------------------
.../isis/core/metamodel/app/IsisMetaModel.java | 20 +++++++----
.../runtime/services/ServiceInstantiator.java | 36 ++++++++++++++++++--
.../ServicesInstallerFromAnnotation.java | 2 +-
...InstallerFromConfigurationAndAnnotation.java | 4 +++
.../services/ServicesInstallerUtils.java | 17 +--------
5 files changed, 53 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/448516e4/core/metamodel/src/main/java/org/apache/isis/core/metamodel/app/IsisMetaModel.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/app/IsisMetaModel.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/app/IsisMetaModel.java
index 6809407..48b0bc8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/app/IsisMetaModel.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/app/IsisMetaModel.java
@@ -19,7 +19,11 @@
package org.apache.isis.core.metamodel.app;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
import com.google.common.collect.Lists;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.commons.config.IsisConfiguration;
@@ -27,7 +31,6 @@ import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
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.runtimecontext.RuntimeContext;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
@@ -37,6 +40,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
import org.apache.isis.core.metamodel.specloader.ObjectReflectorDefault;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
+import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.ValidationFailures;
import static org.apache.isis.core.commons.ensure.Ensure.ensureThatArg;
@@ -67,7 +71,7 @@ public class IsisMetaModel implements ApplicationScopedComponent {
private IsisConfiguration configuration;
private ProgrammingModel programmingModel;
private Set<FacetDecorator> facetDecorators;
- private MetaModelValidator metaModelValidator;
+ private MetaModelValidatorComposite metaModelValidator;
private ValidationFailures validationFailures;
@@ -118,7 +122,8 @@ public class IsisMetaModel implements ApplicationScopedComponent {
this.facetDecorators = new TreeSet<>();
setProgrammingModelFacets(programmingModel);
- this.metaModelValidator = new MetaModelValidatorDefault();
+ this.metaModelValidator = new MetaModelValidatorComposite();
+ programmingModel.refineMetaModelValidator(metaModelValidator, configuration);
}
/**
@@ -259,16 +264,17 @@ public class IsisMetaModel implements ApplicationScopedComponent {
/**
* The {@link MetaModelValidator} in force, either defaulted or specified
- * {@link #setMetaModelValidator(MetaModelValidator) explicitly}.
+ * {@link #setMetaModelValidator(org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite) explicitly}.
*/
- public MetaModelValidator getMetaModelValidator() {
+ public MetaModelValidatorComposite getMetaModelValidator() {
return metaModelValidator;
}
/**
* Optionally specify the {@link MetaModelValidator}.
+ * @param metaModelValidator
*/
- public void setMetaModelValidator(final MetaModelValidator metaModelValidator) {
+ public void setMetaModelValidator(final MetaModelValidatorComposite metaModelValidator) {
this.metaModelValidator = metaModelValidator;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/448516e4/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServiceInstantiator.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServiceInstantiator.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServiceInstantiator.java
index 36d5145..322c2a2 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServiceInstantiator.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServiceInstantiator.java
@@ -70,12 +70,19 @@ public final class ServiceInstantiator {
private final static Logger LOG = LoggerFactory.getLogger(ServiceInstantiator.class);
-
public ServiceInstantiator() {
}
// //////////////////////////////////////
+ private boolean ignoreFailures;
+ public void setIgnoreFailures(boolean ignoreFailures) {
+ this.ignoreFailures = ignoreFailures;
+ }
+
+ // //////////////////////////////////////
+
+
/**
* initially null, but checked before first use that has been set (through {@link #setConfiguration(org.apache.isis.core.commons.config.IsisConfiguration)}).
*/
@@ -91,9 +98,33 @@ public final class ServiceInstantiator {
}
}
+ // //////////////////////////////////////
+
+ public Object createInstance(String type) {
+ final Class<?> cls = loadClass(type);
+ if(cls == null || cls.isAnonymousClass()) {
+ // eg a test class
+ return null;
+ }
+
+ return createInstance(cls);
+ }
+
+ private Class<?> loadClass(final String className) {
+ try {
+ LOG.debug("loading class for service: " + className);
+ //return Thread.currentThread().getContextClassLoader().loadClass(className);
+ return Class.forName(className);
+ } catch (final ClassNotFoundException ex) {
+ if(ignoreFailures) {
+ return null;
+ }
+ throw new InitialisationException(String.format("Cannot find class '%s' for service", className));
+ }
+ }
// //////////////////////////////////////
-
+
public <T> T createInstance(final Class<T> cls) {
ensureInitialized();
if(cls.isAnnotationPresent(RequestScoped.class)) {
@@ -333,4 +364,5 @@ public final class ServiceInstantiator {
}
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/448516e4/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromAnnotation.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromAnnotation.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromAnnotation.java
index 2762787..a14ed16 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromAnnotation.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromAnnotation.java
@@ -222,7 +222,7 @@ public class ServicesInstallerFromAnnotation extends InstallerAbstract implement
String order = domainServiceLayout != null ? domainServiceLayout.menuOrder(): null;
if(order == null || order.equals("" + Integer.MAX_VALUE)) {
final DomainService domainService = cls.getAnnotation(DomainService.class);
- order = domainService.menuOrder();
+ order = domainService != null ? domainService.menuOrder() : "" + Integer.MAX_VALUE;
}
return order;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/448516e4/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromConfigurationAndAnnotation.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromConfigurationAndAnnotation.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromConfigurationAndAnnotation.java
index dc4d762..44dbd52 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromConfigurationAndAnnotation.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromConfigurationAndAnnotation.java
@@ -52,6 +52,10 @@ public class ServicesInstallerFromConfigurationAndAnnotation extends InstallerAb
servicesInstallerFromAnnotation = new ServicesInstallerFromAnnotation(serviceInstantiator);
}
+ public void setIgnoreFailures(boolean ignoreFailures) {
+ this.serviceInstantiator.setIgnoreFailures(ignoreFailures);
+ }
+
@Override
public void setConfigurationBuilder(IsisConfigurationBuilder isisConfigurationBuilder) {
servicesInstallerFromConfiguration.setConfigurationBuilder(isisConfigurationBuilder);
http://git-wip-us.apache.org/repos/asf/isis/blob/448516e4/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerUtils.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerUtils.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerUtils.java
index ba95105..2321dcc 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerUtils.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerUtils.java
@@ -78,24 +78,9 @@ final class ServicesInstallerUtils {
type = serviceName;
}
- final Class<?> cls = loadClass(type);
- if(cls.isAnonymousClass()) {
- // eg a test class
- return null;
- }
- return serviceInstantiator.createInstance(cls);
- }
-
- private static Class<?> loadClass(final String className) {
- try {
- LOG.debug("loading class for service: " + className);
- return Thread.currentThread().getContextClassLoader().loadClass(className);
- } catch (final ClassNotFoundException ex) {
- throw new InitialisationException(String.format("Cannot find class '%s' for service", className));
- }
+ return serviceInstantiator.createInstance(type);
}
-
static List<Object> instantiateServicesFrom(SortedMap<String, SortedSet<String>> positionedServices, final ServiceInstantiator serviceInstantiator) {
LinkedHashSet<String> serviceNameList = flatten(positionedServices);