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/10 13:54:46 UTC

[isis] branch v2 updated: ISIS-2158: IsisPresets (for logging) ... add silence variant for MM

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 c88586ff ISIS-2158: IsisPresets (for logging) ... add silence variant for MM
c88586ff is described below

commit c88586ff0fb758987c7d6852beeaea9b87b6195d
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Oct 10 15:54:37 2019 +0200

    ISIS-2158: IsisPresets (for logging) ... add silence variant for MM
---
 core/config/src/main/java/org/apache/isis/config/IsisPresets.java    | 4 +++-
 .../{DebugValidation.properties => DebugMetaModel.properties}        | 1 +
 .../{DebugValidation.properties => SilenceMetaModel.properties}      | 3 ++-
 .../apache/isis/testdomain/domainmodel/AnnotationSyntesizerTest.java | 2 +-
 .../isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java  | 3 +--
 .../isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java | 5 ++---
 .../isis/testdomain/domainmodel/SpecloaderPerformanceTest.java       | 3 +--
 7 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/core/config/src/main/java/org/apache/isis/config/IsisPresets.java b/core/config/src/main/java/org/apache/isis/config/IsisPresets.java
index 4b9711c..52e5970 100644
--- a/core/config/src/main/java/org/apache/isis/config/IsisPresets.java
+++ b/core/config/src/main/java/org/apache/isis/config/IsisPresets.java
@@ -39,7 +39,9 @@ public final class IsisPresets  {
     public static final String DebugPersistence = "classpath:/presets/DebugPersistence.properties";
     public static final String DebugDiscovery = "classpath:/presets/DebugDiscovery.properties";
     public static final String DebugProgrammingModel = "classpath:/presets/DebugProgrammingModel.properties";
-    public static final String DebugValidation = "classpath:/presets/DebugValidation.properties";
+    
+    public static final String DebugMetaModel = "classpath:/presets/DebugMetaModel.properties";
+    public static final String SilenceMetaModel = "classpath:/presets/SilenceMetaModel.properties";
     
     /**
      * @deprecated seems no longer required anyway
diff --git a/core/config/src/main/resources/presets/DebugValidation.properties b/core/config/src/main/resources/presets/DebugMetaModel.properties
similarity index 91%
copy from core/config/src/main/resources/presets/DebugValidation.properties
copy to core/config/src/main/resources/presets/DebugMetaModel.properties
index 7648c2b..92500e0 100644
--- a/core/config/src/main/resources/presets/DebugValidation.properties
+++ b/core/config/src/main/resources/presets/DebugMetaModel.properties
@@ -16,3 +16,4 @@
 #  under the License.
 
 logging.level.org.apache.isis.metamodel.specloader.MetaModelValidatorServiceDefault = DEBUG
+logging.level.org.apache.isis.metamodel.specloader.SpecificationLoaderDefault = DEBUG
\ No newline at end of file
diff --git a/core/config/src/main/resources/presets/DebugValidation.properties b/core/config/src/main/resources/presets/SilenceMetaModel.properties
similarity index 88%
rename from core/config/src/main/resources/presets/DebugValidation.properties
rename to core/config/src/main/resources/presets/SilenceMetaModel.properties
index 7648c2b..03be4e2 100644
--- a/core/config/src/main/resources/presets/DebugValidation.properties
+++ b/core/config/src/main/resources/presets/SilenceMetaModel.properties
@@ -15,4 +15,5 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-logging.level.org.apache.isis.metamodel.specloader.MetaModelValidatorServiceDefault = DEBUG
+logging.level.org.apache.isis.metamodel.specloader.MetaModelValidatorServiceDefault = WARN
+logging.level.org.apache.isis.metamodel.specloader.SpecificationLoaderDefault = WARN
\ No newline at end of file
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/AnnotationSyntesizerTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/AnnotationSyntesizerTest.java
index 1f95a19..64f3fb4 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/AnnotationSyntesizerTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/AnnotationSyntesizerTest.java
@@ -54,7 +54,7 @@ import lombok.val;
                 "isis.reflector.introspector.mode=FULL"
         })
 @TestPropertySource({
-    IsisPresets.DebugValidation,
+    IsisPresets.DebugMetaModel,
     IsisPresets.DebugProgrammingModel,
 
 })
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
index 3f1bcc6..7e36ba3 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
@@ -57,9 +57,8 @@ import lombok.val;
                 "isis.reflector.introspector.mode=FULL"
         })
 @TestPropertySource({
-    IsisPresets.DebugValidation,
+    IsisPresets.DebugMetaModel,
     IsisPresets.DebugProgrammingModel,
-    
 })
 @Incubating("does not work, when executed in sequence with other smoketests")
 class DomainModelTest_usingBadDomain {
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
index dec536e..ae2c465 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
@@ -52,9 +52,8 @@ import lombok.val;
                 "isis.reflector.validator.explicitObjectType=FALSE", // does not override any of the imports
         })
 @TestPropertySource({
-    IsisPresets.DebugValidation,
-    //IsisPresets.DebugProgrammingModel,
-    
+    IsisPresets.DebugMetaModel,
+    IsisPresets.DebugProgrammingModel,  
 })
 //@Transactional
 class DomainModelTest_usingGoodDomain {
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/SpecloaderPerformanceTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/SpecloaderPerformanceTest.java
index 0262253..d427ebd 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/SpecloaderPerformanceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/SpecloaderPerformanceTest.java
@@ -51,9 +51,8 @@ import lombok.val;
                 "isis.reflector.validator.explicitObjectType=FALSE", // does not override any of the imports
         })
 @TestPropertySource({
-    IsisPresets.DebugValidation,
+    IsisPresets.SilenceMetaModel,
     //IsisPresets.DebugProgrammingModel,
-    
 })
 @Incubating("not a real test, just for performance tuning")
 class SpecloaderPerformanceTest {