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 2021/03/08 11:37:45 UTC
[isis] branch master updated: ISIS-2571: cleaning up (debug code)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 570daca ISIS-2571: cleaning up (debug code)
570daca is described below
commit 570daca3a2d68247b0c8c0be6b5d55135ec4496f
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Mar 8 12:37:32 2021 +0100
ISIS-2571: cleaning up (debug code)
---
.../domainservice/annotation/DomainServiceFacetAnnotationFactory.java | 2 --
.../facets/object/objectspecid/ObjectSpecIdMalformedValidator.java | 3 +--
.../org/apache/isis/core/metamodel/progmodel/ProgrammingModel.java | 2 +-
.../metamodel/specloader/validator/MetaModelValidatorVisiting.java | 4 ----
4 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactory.java
index eefd898..0802fdb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactory.java
@@ -82,8 +82,6 @@ implements MetaModelRefiner {
return;
}
- System.err.println("validate " + objectSpec);
-
final String associationNames = objectSpec
.streamAssociations(MixedIn.EXCLUDED)
.map(ObjectAssociation::getName)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectSpecIdMalformedValidator.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectSpecIdMalformedValidator.java
index 8e1d62d..045b11d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectSpecIdMalformedValidator.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/ObjectSpecIdMalformedValidator.java
@@ -26,7 +26,6 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorVisiting;
-import lombok.SneakyThrows;
import lombok.val;
/**
@@ -39,7 +38,7 @@ import lombok.val;
public class ObjectSpecIdMalformedValidator
implements MetaModelRefiner {
- @Override @SneakyThrows
+ @Override
public void refineProgrammingModel(ProgrammingModel programmingModel) {
programmingModel.addValidatorIncludeManagedBeans(
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 46c939c..50145c7 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
@@ -154,7 +154,7 @@ public interface ProgrammingModel {
addValidator(ValidationOrder.A2_AFTER_BUILTIN, supplier.get(), markers);
}
- /** do not include managed beans */
+ /** do include managed beans */
default void addValidatorIncludeManagedBeans(MetaModelValidatorVisiting.Visitor visitor, Marker ... markers) {
addValidator(MetaModelValidatorVisiting.of(visitor,
spec -> !spec.getBeanSort().isUnknown()),
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorVisiting.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorVisiting.java
index 8bcd4e0..3763108 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorVisiting.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorVisiting.java
@@ -91,10 +91,6 @@ extends MetaModelValidatorAbstract {
return; // in support of @Action not being forced, we need to relax
}
- if(spec.isManagedBean()) {
- System.err.printf("%s: (include: %b): %s\n", this.getClass(), includeIf.test(spec), spec);
- }
-
if(!includeIf.test(spec)) {
return;
}