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/10/07 08:08:30 UTC
[isis] branch v2 updated: ISIS-2158: rename
MetaModelValidator.validate(...) -> validateInto(...)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/v2 by this push:
new 37043dd ISIS-2158: rename MetaModelValidator.validate(...) -> validateInto(...)
37043dd is described below
commit 37043dd828a6feac48ac87e8655316a07939b9dc
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Oct 7 10:08:22 2019 +0200
ISIS-2158: rename MetaModelValidator.validate(...) -> validateInto(...)
---
.../metamodelvalidator/dflt/MetaModelValidatorDefault.java | 2 +-
.../isis/metamodel/specloader/SpecificationLoaderDefault.java | 2 +-
.../metamodel/specloader/validator/MetaModelValidator.java | 7 ++++++-
.../specloader/validator/MetaModelValidatorComposite.java | 4 ++--
.../MetaModelValidatorForConflictingOptionality.java | 2 +-
.../validator/MetaModelValidatorForDeprecatedAbstract.java | 3 +--
.../validator/MetaModelValidatorForValidationFailures.java | 2 +-
.../specloader/validator/MetaModelValidatorVisiting.java | 2 +-
.../object/ViewModelSemanticCheckingFacetFactoryTest.java | 11 +++++------
9 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/metamodelvalidator/dflt/MetaModelValidatorDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/metamodelvalidator/dflt/MetaModelValidatorDefault.java
index 32236fd..808f83b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/metamodelvalidator/dflt/MetaModelValidatorDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/metamodelvalidator/dflt/MetaModelValidatorDefault.java
@@ -29,7 +29,7 @@ public class MetaModelValidatorDefault extends MetaModelValidatorAbstract {
* @param validationFailures
*/
@Override
- public void validate(ValidationFailures validationFailures) {
+ public void validateInto(ValidationFailures validationFailures) {
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
index 9018356..608e0d3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
@@ -222,7 +222,7 @@ public class SpecificationLoaderDefault implements SpecificationLoader {
validationFailures = new ValidationFailures();
if(isFullIntrospect()) {
- metaModelValidator.validate(validationFailures);
+ metaModelValidator.validateInto(validationFailures);
} else {
log.info("Meta model validation skipped (full introspection of metamodel not configured)");
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidator.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidator.java
index 3e204bb..fda6611 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidator.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidator.java
@@ -21,6 +21,11 @@ package org.apache.isis.metamodel.specloader.validator;
public interface MetaModelValidator {
- void validate(ValidationFailures validationFailures);
+ /**
+ * Validate and then append any {@link ValidationFailure} to given validationFailures.
+ *
+ * @param validationFailures
+ */
+ void validateInto(ValidationFailures validationFailures);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorComposite.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorComposite.java
index 0ce757b..b99d6ec 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorComposite.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorComposite.java
@@ -50,9 +50,9 @@ public final class MetaModelValidatorComposite extends MetaModelValidatorAbstrac
}
@Override
- public void validate(ValidationFailures validationFailures) {
+ public void validateInto(ValidationFailures validationFailures) {
for (val validator : validators) {
- validator.validate(validationFailures);
+ validator.validateInto(validationFailures);
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorForConflictingOptionality.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorForConflictingOptionality.java
index 79e8231..66e077d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorForConflictingOptionality.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorForConflictingOptionality.java
@@ -33,7 +33,7 @@ public class MetaModelValidatorForConflictingOptionality extends MetaModelValida
}
@Override
- public void validate(final ValidationFailures validationFailures) {
+ public void validateInto(final ValidationFailures validationFailures) {
validationFailures.addAll(failures);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorForDeprecatedAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorForDeprecatedAbstract.java
index 94eaa8f..0511d6a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorForDeprecatedAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorForDeprecatedAbstract.java
@@ -18,7 +18,6 @@
*/
package org.apache.isis.metamodel.specloader.validator;
-import org.apache.isis.config.IsisConfigurationLegacy;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.IdentifiedHolder;
import org.apache.isis.metamodel.facets.FacetFactory;
@@ -64,7 +63,7 @@ public abstract class MetaModelValidatorForDeprecatedAbstract extends MetaModelV
protected abstract String failureMessageFor(Facet facet, FacetFactory.AbstractProcessWithMethodContext<?> processMethodContext);
@Override
- public void validate(ValidationFailures validationFailures) {
+ public void validateInto(ValidationFailures validationFailures) {
if(getConfiguration().getReflector().getValidator().isAllowDeprecated()) {
return;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorForValidationFailures.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorForValidationFailures.java
index 1e20372..10ce038 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorForValidationFailures.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorForValidationFailures.java
@@ -33,7 +33,7 @@ public class MetaModelValidatorForValidationFailures extends MetaModelValidatorA
}
@Override
- public void validate(ValidationFailures validationFailures) {
+ public void validateInto(ValidationFailures validationFailures) {
validationFailures.addAll(failures);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorVisiting.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorVisiting.java
index 8647d3a..48d19c8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorVisiting.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorVisiting.java
@@ -46,7 +46,7 @@ public class MetaModelValidatorVisiting extends MetaModelValidatorAbstract {
@NonNull private final Visitor visitor;
@Override
- public final void validate(ValidationFailures validationFailures) {
+ public final void validateInto(ValidationFailures validationFailures) {
validateAll(validationFailures);
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
index 46a633c..1586c58 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
@@ -18,10 +18,6 @@
*/
package org.apache.isis.metamodel.facets.object;
-import lombok.val;
-
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.metamodel.MetaModelContext;
import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
@@ -32,8 +28,9 @@ import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.config.ConfigurationConstants;
+import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.internal._Config;
+import org.apache.isis.metamodel.MetaModelContext;
import org.apache.isis.metamodel.facets.FacetFactory;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.metamodel.specloader.validator.ValidationFailures;
@@ -43,6 +40,8 @@ import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import lombok.val;
+
public class ViewModelSemanticCheckingFacetFactoryTest {
@Rule
@@ -62,7 +61,7 @@ public class ViewModelSemanticCheckingFacetFactoryTest {
_Exceptions.throwNotImplemented();
final ValidationFailures validationFailures = new ValidationFailures();
- metaModelValidator.validate(validationFailures);
+ metaModelValidator.validateInto(validationFailures);
return validationFailures;
}