You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2019/05/13 14:41:23 UTC
[isis] 01/03: ISIS-2112: re-enable meta-model validation
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch 2112_SpringBoot
in repository https://gitbox.apache.org/repos/asf/isis.git
commit a32cec2da429c42059875e132b61f7c7bd531b69
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon May 13 05:58:22 2019 +0200
ISIS-2112: re-enable meta-model validation
Task-Url: https://issues.apache.org/jira/browse/ISIS-2112
---
core/commons/pom.xml | 3 --
.../metamodel/specloader/IntrospectionMode.java | 35 ++++++++++++++++++----
.../specloader/SpecificationLoaderDefault.java | 20 +++++--------
core/pom.xml | 9 ++++++
.../system/session/IsisSessionFactoryDefault.java | 21 ++++++-------
5 files changed, 56 insertions(+), 32 deletions(-)
diff --git a/core/commons/pom.xml b/core/commons/pom.xml
index 6c4a544..a74d361 100644
--- a/core/commons/pom.xml
+++ b/core/commons/pom.xml
@@ -30,8 +30,6 @@
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.commons</jar-plugin.automaticModuleName>
<git-plugin.propertiesDir>org/apache/isis/commons</git-plugin.propertiesDir>
-
- <lombok.version>[1.18.,)</lombok.version>
</properties>
<build>
@@ -70,7 +68,6 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
- <version>${lombok.version}</version>
</dependency>
<dependency>
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/IntrospectionMode.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/IntrospectionMode.java
index 09739d5..059186d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/IntrospectionMode.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/IntrospectionMode.java
@@ -18,35 +18,58 @@
*/
package org.apache.isis.core.metamodel.specloader;
+import org.apache.isis.commons.internal.context._Context;
+import org.apache.isis.core.metamodel.MetaModelContext;
import org.apache.isis.core.plugins.environment.DeploymentType;
+import lombok.val;
+
public enum IntrospectionMode {
+
/**
- * Lazy (don't introspect members for most classes unless required), irrespective of the deployment mode.
+ * Lazy (don't introspect members for most classes unless required),
+ * irrespective of the deployment mode.
*/
- LAZY{
+ LAZY {
@Override
- public boolean isFullIntrospect(final DeploymentType deploymentType) {
+ protected boolean isFullIntrospect(final DeploymentType deploymentType) {
return false;
}
},
+
/**
* If production deployment mode, then full, otherwise lazy.
*/
LAZY_UNLESS_PRODUCTION {
- @Override public boolean isFullIntrospect(final DeploymentType deploymentType) {
+ @Override
+ protected boolean isFullIntrospect(final DeploymentType deploymentType) {
return deploymentType.isProduction();
}
},
+
/**
* Full introspection, irrespective of deployment mode.
*/
FULL {
@Override
- public boolean isFullIntrospect(final DeploymentType deploymentType) {
+ protected boolean isFullIntrospect(final DeploymentType deploymentType) {
return true;
}
};
- public abstract boolean isFullIntrospect(final DeploymentType deploymentType);
+ /**
+ * @return whether current introspection mode is 'full', dependent on current
+ * deployment mode and configuration
+ */
+ public static boolean isFullIntrospect() {
+
+ val config = MetaModelContext.current().getConfiguration();
+ val introspectionMode = SpecificationLoader.CONFIG_PROPERTY_MODE.from(config);
+ val deploymentMode = _Context.getEnvironment().getDeploymentType();
+
+ return introspectionMode.isFullIntrospect(deploymentMode);
+ }
+
+ protected abstract boolean isFullIntrospect(final DeploymentType deploymentType);
+
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault.java
index ece3bec..4f2f673 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault.java
@@ -37,7 +37,6 @@ import org.apache.isis.core.metamodel.specloader.specimpl.IntrospectionState;
import org.apache.isis.core.metamodel.specloader.specimpl.ObjectSpecificationAbstract;
import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
import org.apache.isis.core.metamodel.specloader.specimpl.standalonelist.ObjectSpecificationOnStandaloneList;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelDeficiencies;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
import org.apache.isis.core.metamodel.specloader.validator.ValidationFailures;
import org.apache.isis.core.runtime.threadpool.ThreadPoolExecutionMode;
@@ -190,22 +189,17 @@ public class SpecificationLoaderDefault implements SpecificationLoader {
private ValidationFailures validationFailures;
- private MetaModelDeficiencies validateThenGetDeficienciesIfAny() {
- final IntrospectionMode mode = CONFIG_PROPERTY_MODE.from(getConfiguration());
- if(!mode.isFullIntrospect(_Context.getEnvironment().getDeploymentType())) {
- log.info("Meta model validation skipped (full introspection of metamodel not configured)");
- return null;
- }
-
- ValidationFailures validationFailures = validate();
- return validationFailures.getDeficienciesIfAny();
- }
-
@Override
public ValidationFailures validate() {
if(validationFailures == null) {
validationFailures = new ValidationFailures();
- metaModelValidator.validate(validationFailures);
+
+ if(IntrospectionMode.isFullIntrospect()) {
+ metaModelValidator.validate(validationFailures);
+ } else {
+ log.info("Meta model validation skipped (full introspection of metamodel not configured)");
+ }
+
}
return validationFailures;
}
diff --git a/core/pom.xml b/core/pom.xml
index 707a6d7..3c86b27 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -112,6 +112,8 @@
<slf4j.version>1.7.21</slf4j.version>
<log4j.version>1.2.17</log4j.version>
+
+ <lombok.version>[1.18.,)</lombok.version>
<joda-time.version>2.9.4</joda-time.version>
@@ -1501,6 +1503,13 @@ ${license.additional-notes}
<version>${joda-time.version}</version>
</dependency>
+ <!-- lombok -->
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ </dependency>
+
<!-- Google Guava (collections and commons) -->
<dependency>
<groupId>com.google.guava</groupId>
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryDefault.java
index e96b5af..a2016ab 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryDefault.java
@@ -47,6 +47,7 @@ import org.apache.isis.core.commons.collections.Bin;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.ServiceInitializer;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.specloader.validator.MetaModelDeficiencies;
import org.apache.isis.core.runtime.fixtures.FixturesInstallerFromConfiguration;
import org.apache.isis.core.runtime.system.IsisSystemException;
import org.apache.isis.core.runtime.system.MessageRegistry;
@@ -239,16 +240,16 @@ public class IsisSessionFactoryDefault implements IsisSessionFactory {
translationService.translate(context, message);
}
- //FIXME [2033] skipping mm validation for now ...
-// val mmDeficiencies = specificationLoader.validateThenGetDeficienciesIfAny();
-// if(mmDeficiencies!=null) {
-// // no need to use a higher level, such as error(...); the calling code will expose any metamodel
-// // validation errors in their own particular way.
-// if(log.isDebugEnabled()) {
-// log.debug("Meta model invalid", mmDeficiencies.getValidationErrorsAsString());
-// }
-// _Context.putSingleton(MetaModelDeficiencies.class, mmDeficiencies);
-// }
+ // meta-model validation ...
+ val mmDeficiencies = specificationLoader.validate().getDeficienciesIfAny();
+ if(mmDeficiencies!=null) {
+ // no need to use a higher level, such as error(...); the calling code will expose any metamodel
+ // validation errors in their own particular way.
+ if(log.isDebugEnabled()) {
+ log.debug("Meta model invalid", mmDeficiencies.getValidationErrorsAsString());
+ }
+ _Context.putSingleton(MetaModelDeficiencies.class, mmDeficiencies);
+ }
},
new InitialisationSession());