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/05 08:38:53 UTC

[isis] branch v2 updated: ISIS-2158: fixes the annotation syntesizer (proxy generator)

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 9c4d001  ISIS-2158: fixes the annotation syntesizer (proxy generator)
9c4d001 is described below

commit 9c4d0014469d83043d4666c4617b1327f260017e
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Oct 5 10:38:43 2019 +0200

    ISIS-2158: fixes the annotation syntesizer (proxy generator)
    
    - did fail when a method had multiple annotations sharing the same
    attribute
---
 ...nthesizedMergedAnnotationInvocationHandler.java |  3 +-
 .../action/ActionAnnotationFacetFactory.java       | 12 +---
 ...port.java => InvalidOrphanedActionSupport.java} |  2 +-
 ....java => InvalidOrphanedCollectionSupport.java} |  2 +-
 ...rt.java => InvalidOrphanedPropertySupport.java} |  2 +-
 ...java => InvalidPropertyAnnotationOnAction.java} | 15 +++--
 .../domainmodel/AnnotationSyntesizerTest.java      | 71 ++++++++++++++++++++++
 .../DomainModelTest_usingBadDomain.java            | 26 ++++++--
 8 files changed, 106 insertions(+), 27 deletions(-)

diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations_SynthesizedMergedAnnotationInvocationHandler.java b/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations_SynthesizedMergedAnnotationInvocationHandler.java
index 9ecd90f..9372bf7 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations_SynthesizedMergedAnnotationInvocationHandler.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations_SynthesizedMergedAnnotationInvocationHandler.java
@@ -190,7 +190,8 @@ implements InvocationHandler {
         
         val defaultValue = method.getDefaultValue();
         
-        val attributeValue = this.mergedAnnotations.stream()
+        // for all discovered annotations of this.type determine the effective (attribute) value
+        val attributeValue = this.mergedAnnotations.stream(this.type)
         .map(annotation->(Object)annotation.getValue(name, type).orElse(null))
         .filter(_NullSafe::isPresent)
         .filter(value->!value.equals(defaultValue))
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
index d03898b..69c1623 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
@@ -97,20 +97,10 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract {
             val actionIfAny = processMethodContext.synthesizeOnMethod(Action.class);
 
             // search for @Action(domainEvent=...), else use the default event type
-            final ActionDomainEventFacetAbstract actionDomainEventFacet =
+            val actionDomainEventFacet =
                     actionIfAny
                     .map(Action::domainEvent)
                     .filter(domainEvent -> domainEvent != ActionDomainEvent.Default.class)
-                    .filter(domainEvent -> {
-
-
-                        if(!ActionDomainEvent.class.isAssignableFrom(domainEvent)) {
-                            System.out.println("#### " + actionMethod + " -> " + domainEvent);
-                            return false;
-                        }
-
-                        return true;
-                    })
                     .map(domainEvent ->
                             (ActionDomainEventFacetAbstract) 
                             new ActionDomainEventFacetForActionAnnotation(
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/OrphanedActionSupport.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/InvalidOrphanedActionSupport.java
similarity index 96%
rename from examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/OrphanedActionSupport.java
rename to examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/InvalidOrphanedActionSupport.java
index cda312f..550ed32 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/OrphanedActionSupport.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/InvalidOrphanedActionSupport.java
@@ -23,7 +23,7 @@ import org.apache.isis.applib.annotation.Model;
 import org.apache.isis.applib.annotation.Nature;
 
 @DomainObject(nature = Nature.VIEW_MODEL)
-public class OrphanedActionSupport {
+public class InvalidOrphanedActionSupport {
 
     // should fail
     @Model
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/OrphanedCollectionSupport.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/InvalidOrphanedCollectionSupport.java
similarity index 96%
rename from examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/OrphanedCollectionSupport.java
rename to examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/InvalidOrphanedCollectionSupport.java
index 6615f91..b4bbe29 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/OrphanedCollectionSupport.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/InvalidOrphanedCollectionSupport.java
@@ -23,7 +23,7 @@ import org.apache.isis.applib.annotation.Model;
 import org.apache.isis.applib.annotation.Nature;
 
 @DomainObject(nature = Nature.VIEW_MODEL)
-public class OrphanedCollectionSupport {
+public class InvalidOrphanedCollectionSupport {
 
     // should fail
     @Model
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/OrphanedPropertySupport.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/InvalidOrphanedPropertySupport.java
similarity index 96%
copy from examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/OrphanedPropertySupport.java
copy to examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/InvalidOrphanedPropertySupport.java
index bd579ed..8b71879 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/OrphanedPropertySupport.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/InvalidOrphanedPropertySupport.java
@@ -23,7 +23,7 @@ import org.apache.isis.applib.annotation.Model;
 import org.apache.isis.applib.annotation.Nature;
 
 @DomainObject(nature = Nature.VIEW_MODEL)
-public class OrphanedPropertySupport {
+public class InvalidOrphanedPropertySupport {
 
     // should fail
     @Model
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/OrphanedPropertySupport.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/InvalidPropertyAnnotationOnAction.java
similarity index 72%
rename from examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/OrphanedPropertySupport.java
rename to examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/InvalidPropertyAnnotationOnAction.java
index bd579ed..aa54d11 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/OrphanedPropertySupport.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/InvalidPropertyAnnotationOnAction.java
@@ -18,17 +18,20 @@
  */
 package org.apache.isis.testdomain.model.bad;
 
+import org.apache.isis.applib.annotation.Action;
 import org.apache.isis.applib.annotation.DomainObject;
-import org.apache.isis.applib.annotation.Model;
 import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.value.Blob;
 
 @DomainObject(nature = Nature.VIEW_MODEL)
-public class OrphanedPropertySupport {
+public class InvalidPropertyAnnotationOnAction {
 
-    // should fail
-    @Model
-    public boolean hideMyProperty() {
-        return false;
+    // TODO as this is no getter representing a property, @Property should not be allowed here 
+    
+    @Action @Property(fileAccept=".xlsx")
+    public Blob exportToJson() {
+        return null;
     }
     
 }
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
new file mode 100644
index 0000000..9693799
--- /dev/null
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/AnnotationSyntesizerTest.java
@@ -0,0 +1,71 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.isis.testdomain.domainmodel;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.util.ReflectionUtils;
+
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.events.domain.ActionDomainEvent;
+import org.apache.isis.commons.internal.reflection._Annotations;
+import org.apache.isis.config.IsisPresets;
+import org.apache.isis.testdomain.Smoketest;
+import org.apache.isis.testdomain.conf.Configuration_headless;
+import org.apache.isis.testdomain.model.bad.Configuration_usingInvalidDomain;
+import org.apache.isis.testdomain.model.bad.InvalidPropertyAnnotationOnAction;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import lombok.val;
+
+@Smoketest
+@SpringBootTest(
+        classes = { 
+                Configuration_headless.class,
+                Configuration_usingInvalidDomain.class
+        }, 
+        properties = {
+                "isis.reflector.introspector.mode=FULL"
+        })
+@TestPropertySource({
+    IsisPresets.DebugValidation,
+    IsisPresets.DebugProgrammingModel,
+    
+})
+class AnnotationSyntesizerTest {
+
+    @Test
+    void propertyAnnotationOnAction_shouldNotContributeToSynthesizedAction() {
+        
+        val actionMethod = ReflectionUtils.findMethod(InvalidPropertyAnnotationOnAction.class, "exportToJson");
+        assertNotNull(actionMethod);
+        
+        val action = _Annotations.synthesizeInherited(actionMethod, Action.class).get();
+        val domainEvent = action.domainEvent();
+        
+        if(!ActionDomainEvent.class.isAssignableFrom(domainEvent)) {
+            fail(String.format("wrong event type resolved on %s -> %s", actionMethod, domainEvent));
+        }
+
+    }
+    
+}
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 74f4fd1..3f1bcc6 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
@@ -20,6 +20,7 @@ package org.apache.isis.testdomain.domainmodel;
 
 import javax.inject.Inject;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.ApplicationContext;
@@ -36,9 +37,10 @@ import org.apache.isis.testdomain.Smoketest;
 import org.apache.isis.testdomain.conf.Configuration_headless;
 import org.apache.isis.testdomain.model.bad.AmbiguousTitle;
 import org.apache.isis.testdomain.model.bad.Configuration_usingInvalidDomain;
-import org.apache.isis.testdomain.model.bad.OrphanedActionSupport;
-import org.apache.isis.testdomain.model.bad.OrphanedCollectionSupport;
-import org.apache.isis.testdomain.model.bad.OrphanedPropertySupport;
+import org.apache.isis.testdomain.model.bad.InvalidOrphanedActionSupport;
+import org.apache.isis.testdomain.model.bad.InvalidOrphanedCollectionSupport;
+import org.apache.isis.testdomain.model.bad.InvalidOrphanedPropertySupport;
+import org.apache.isis.testdomain.model.bad.InvalidPropertyAnnotationOnAction;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -90,7 +92,7 @@ class DomainModelTest_usingBadDomain {
         
         assertThrows(DomainModelException.class, validateDomainModel::run);
         assertTrue(validateDomainModel.anyMatchesContaining(
-                OrphanedActionSupport.class, 
+                InvalidOrphanedActionSupport.class, 
                 "is assumed to support"));
     }
     
@@ -112,7 +114,7 @@ class DomainModelTest_usingBadDomain {
         
         assertThrows(DomainModelException.class, validateDomainModel::run);
         assertTrue(validateDomainModel.anyMatchesContaining(
-                OrphanedPropertySupport.class, 
+                InvalidOrphanedPropertySupport.class, 
                 "is assumed to support"));
     }
     
@@ -123,10 +125,22 @@ class DomainModelTest_usingBadDomain {
         
         assertThrows(DomainModelException.class, validateDomainModel::run);
         assertTrue(validateDomainModel.anyMatchesContaining(
-                OrphanedCollectionSupport.class, 
+                InvalidOrphanedCollectionSupport.class, 
                 "is assumed to support"));
     }
     
+    @Test @Disabled("this case has no vaildation refiner yet")
+    void invalidPropertyAnnotationOnAction_shouldFail() {
+        
+        val validateDomainModel = new ValidateDomainModel();
+        
+        assertThrows(DomainModelException.class, validateDomainModel::run);
+        assertTrue(validateDomainModel.anyMatchesContaining(
+                InvalidPropertyAnnotationOnAction.class, 
+                "TODO"));
+    }
+    
+
     
 
 }