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 15:14:35 UTC
[isis] branch v2 updated: ISIS-1998: use @Mixin as meta-annotation
on @Action, @Property ...
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 589f5db ISIS-1998: use @Mixin as meta-annotation on @Action, @Property ...
589f5db is described below
commit 589f5dbebf75f763ed9b18c1142ec5dc1ed9356d
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Oct 7 17:14:27 2019 +0200
ISIS-1998: use @Mixin as meta-annotation on @Action, @Property ...
---
.../org/apache/isis/applib/annotation/Action.java | 1 +
.../isis/applib/annotation/ActionLayout.java | 1 +
.../apache/isis/applib/annotation/Collection.java | 1 +
.../isis/applib/annotation/CollectionLayout.java | 1 +
.../apache/isis/applib/annotation/Property.java | 1 +
.../isis/applib/annotation/PropertyLayout.java | 1 +
.../IsisBeanFactoryPostProcessorForSpring.java | 11 +++--
.../isis/config/registry/IsisBeanTypeRegistry.java | 29 ++++++------
.../object/mixin/MixinIntendedAsActionTest.java | 53 +++++++++++++++++++++-
.../progmodel/ProgrammingModelAbstract.java | 2 -
.../model/good/ProperActionSupport_action.java | 3 +-
.../DomainModelTest_usingGoodDomain.java | 8 +++-
12 files changed, 87 insertions(+), 25 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Action.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/Action.java
index 4ae8645..dbca63b 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/Action.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/Action.java
@@ -40,6 +40,7 @@ import org.apache.isis.applib.value.Clob;
@Inherited
@Target({ ElementType.METHOD, ElementType.TYPE, ElementType.ANNOTATION_TYPE })
@Retention(RetentionPolicy.RUNTIME)
+@Mixin(method = "act")
public @interface Action {
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/ActionLayout.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/ActionLayout.java
index 09776a9..45239f3 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/ActionLayout.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/ActionLayout.java
@@ -33,6 +33,7 @@ import javax.xml.bind.annotation.XmlType;
@Inherited
@Target({ ElementType.METHOD, ElementType.TYPE, ElementType.ANNOTATION_TYPE })
@Retention(RetentionPolicy.RUNTIME)
+@Mixin(method = "act")
public @interface ActionLayout {
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Collection.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/Collection.java
index 76a0d68..793e444 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/Collection.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/Collection.java
@@ -35,6 +35,7 @@ import org.apache.isis.applib.events.domain.CollectionDomainEvent;
@Inherited
@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.TYPE, ElementType.ANNOTATION_TYPE})
@Retention(RetentionPolicy.RUNTIME)
+@Mixin(method = "coll")
public @interface Collection {
/**
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/CollectionLayout.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/CollectionLayout.java
index 6dff9c8..bc38db5 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/CollectionLayout.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/CollectionLayout.java
@@ -32,6 +32,7 @@ import java.util.Comparator;
@Inherited
@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.TYPE, ElementType.ANNOTATION_TYPE })
@Retention(RetentionPolicy.RUNTIME)
+@Mixin(method = "coll")
public @interface CollectionLayout {
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Property.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/Property.java
index 5f06833..ea9aecf 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/Property.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/Property.java
@@ -43,6 +43,7 @@ import org.apache.isis.applib.value.Clob;
@Inherited
@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.TYPE, ElementType.ANNOTATION_TYPE })
@Retention(RetentionPolicy.RUNTIME)
+@Mixin(method = "prop")
public @interface Property {
/**
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/PropertyLayout.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/PropertyLayout.java
index fce99b6..edd145d 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/PropertyLayout.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/PropertyLayout.java
@@ -33,6 +33,7 @@ import java.lang.annotation.Target;
@Inherited
@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.TYPE, ElementType.ANNOTATION_TYPE })
@Retention(RetentionPolicy.RUNTIME)
+@Mixin(method = "prop")
public @interface PropertyLayout {
/**
diff --git a/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanFactoryPostProcessorForSpring.java b/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanFactoryPostProcessorForSpring.java
index aa89561..d5f68e3 100644
--- a/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanFactoryPostProcessorForSpring.java
+++ b/core/config/src/main/java/org/apache/isis/config/beans/IsisBeanFactoryPostProcessorForSpring.java
@@ -28,9 +28,12 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.Mixin;
import org.apache.isis.applib.annotation.ViewModel;
+import org.apache.isis.commons.internal.reflection._Annotations;
import org.apache.isis.config.registry.IsisBeanTypeRegistry;
import org.apache.isis.config.registry.TypeMetaData;
+import static org.apache.isis.commons.internal.reflection._Annotations.findNearestAnnotation;
+
import lombok.Getter;
import lombok.val;
import lombok.extern.log4j.Log4j2;
@@ -87,18 +90,20 @@ public class IsisBeanFactoryPostProcessorForSpring implements BeanFactoryPostPro
val type = typeMetaData.getUnderlyingClass();
- if(type.isAnnotationPresent(DomainObject.class)) {
+
+ if(findNearestAnnotation(type, DomainObject.class).isPresent()) {
return true;
}
- if(type.isAnnotationPresent(ViewModel.class)) {
+ if(findNearestAnnotation(type, ViewModel.class).isPresent()) {
return true;
}
- if(type.isAnnotationPresent(Mixin.class)) {
+ if(findNearestAnnotation(type, Mixin.class).isPresent()) {
return true;
}
+
return false;
}
diff --git a/core/config/src/main/java/org/apache/isis/config/registry/IsisBeanTypeRegistry.java b/core/config/src/main/java/org/apache/isis/config/registry/IsisBeanTypeRegistry.java
index 3968931..b0221ef 100644
--- a/core/config/src/main/java/org/apache/isis/config/registry/IsisBeanTypeRegistry.java
+++ b/core/config/src/main/java/org/apache/isis/config/registry/IsisBeanTypeRegistry.java
@@ -46,10 +46,10 @@ import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.commons.internal.ioc.BeanSort;
import org.apache.isis.commons.internal.ioc.BeanSortClassifier;
import org.apache.isis.commons.internal.ioc.spring._Spring;
+import org.apache.isis.commons.internal.reflection._Reflect;
import static org.apache.isis.commons.internal.base._With.requires;
-import static org.apache.isis.commons.internal.reflection._Reflect.containsAnnotation;
-import static org.apache.isis.commons.internal.reflection._Reflect.getAnnotation;
+import static org.apache.isis.commons.internal.reflection._Annotations.findNearestAnnotation;
import lombok.AccessLevel;
import lombok.Getter;
@@ -197,7 +197,8 @@ public final class IsisBeanTypeRegistry implements BeanSortClassifier, AutoClose
requires(type, "type");
- if(getAnnotation(type, Vetoed.class)!=null) {
+
+ if(findNearestAnnotation(type, Vetoed.class).isPresent()) {
return BeanSort.UNKNOWN; // exclude from provisioning
}
@@ -205,17 +206,17 @@ public final class IsisBeanTypeRegistry implements BeanSortClassifier, AutoClose
return BeanSort.COLLECTION;
}
- val aDomainService = getAnnotation(type, DomainService.class);
- if(aDomainService!=null) {
+ val aDomainService = findNearestAnnotation(type, DomainService.class);
+ if(aDomainService.isPresent()) {
return BeanSort.MANAGED_BEAN;
}
//this takes precedence over whatever @DomainObject has to say
- if(containsAnnotation(type, "javax.jdo.annotations.PersistenceCapable")) {
+ if(_Reflect.containsAnnotation(type, "javax.jdo.annotations.PersistenceCapable")) {
return BeanSort.ENTITY;
}
- val aDomainObject = getAnnotation(type, DomainObject.class);
+ val aDomainObject = findNearestAnnotation(type, DomainObject.class).orElse(null);
if(aDomainObject!=null) {
switch (aDomainObject.nature()) {
case EXTERNAL_ENTITY:
@@ -228,7 +229,7 @@ public final class IsisBeanTypeRegistry implements BeanSortClassifier, AutoClose
return BeanSort.VIEW_MODEL;
case NOT_SPECIFIED:
- if(getAnnotation(type, ViewModel.class)!=null) {
+ if(findNearestAnnotation(type, ViewModel.class).isPresent()) {
return BeanSort.VIEW_MODEL;
}
if(org.apache.isis.applib.ViewModel.class.isAssignableFrom(type)) {
@@ -242,11 +243,11 @@ public final class IsisBeanTypeRegistry implements BeanSortClassifier, AutoClose
}
}
- if(getAnnotation(type, Mixin.class)!=null) {
+ if(findNearestAnnotation(type, Mixin.class).isPresent()) {
return BeanSort.MIXIN;
}
- if(getAnnotation(type, ViewModel.class)!=null) {
+ if(findNearestAnnotation(type, ViewModel.class).isPresent()) {
return BeanSort.VIEW_MODEL;
}
@@ -266,19 +267,19 @@ public final class IsisBeanTypeRegistry implements BeanSortClassifier, AutoClose
return BeanSort.MANAGED_BEAN;
}
- if(getAnnotation(type, RequestScoped.class)!=null) {
+ if(findNearestAnnotation(type, RequestScoped.class).isPresent()) {
return BeanSort.MANAGED_BEAN;
}
- if(getAnnotation(type, Singleton.class)!=null) {
+ if(findNearestAnnotation(type, Singleton.class).isPresent()) {
return BeanSort.MANAGED_BEAN;
}
- if(getAnnotation(type, Service.class)!=null) {
+ if(findNearestAnnotation(type, Service.class).isPresent()) {
return BeanSort.MANAGED_BEAN;
}
- if(getAnnotation(type, Component.class)!=null) {
+ if(findNearestAnnotation(type, Component.class).isPresent()) {
return BeanSort.MANAGED_BEAN;
}
diff --git a/core/detached-tests/src/test/java/org/apache/isis/metamodel/facets/object/mixin/MixinIntendedAsActionTest.java b/core/detached-tests/src/test/java/org/apache/isis/metamodel/facets/object/mixin/MixinIntendedAsActionTest.java
index 0b246cf..10479ee 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/metamodel/facets/object/mixin/MixinIntendedAsActionTest.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/metamodel/facets/object/mixin/MixinIntendedAsActionTest.java
@@ -32,8 +32,10 @@ import org.junit.jupiter.api.Test;
import org.springframework.util.ReflectionUtils;
import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Mixin;
+import org.apache.isis.applib.annotation.Property;
import org.apache.isis.metamodel.MetaModelContext;
import org.apache.isis.metamodel.adapter.oid.Oid;
import org.apache.isis.metamodel.facets.all.named.NamedFacet;
@@ -113,11 +115,10 @@ class MixinIntendedAsActionTest extends MixinIntendedAs {
private final Customer holder;
- @Action // <-- TODO optional?
public void $$(String newName) { holder.setName(newName); }
}
- @Test @Disabled("under construction")
+ @Test
void actionMixin_shouldHaveProperFacet() {
val mixinFacet = super.runTypeContextOn(Customer_action.class)
@@ -135,7 +136,55 @@ class MixinIntendedAsActionTest extends MixinIntendedAs {
assertEquals("hello", holderPojo.getName());
}
+ // ------------------------------------------
+ // -- advanced mix-in declaration ... @Property
+ // ------------------------------------------
+
+ @Property @RequiredArgsConstructor
+ static class Customer_property {
+
+ private final Customer holder;
+
+ public void $$(String newName) { holder.setName(newName); }
+ }
+
+ @Test
+ void propertyMixin_shouldHaveProperFacet() {
+
+ val mixinFacet = super.runTypeContextOn(Customer_property.class)
+ .getFacet(MixinFacet.class);
+
+ // proper predicates
+ assertNotNull(mixinFacet);
+ assertTrue(mixinFacet.isMixinFor(Customer.class));
+ assertFalse(mixinFacet.isMixinFor(NoCustomer.class));
+ }
+
+ // ------------------------------------------
+ // -- advanced mix-in declaration ... @Property
+ // ------------------------------------------
+
+ @Collection @RequiredArgsConstructor
+ static class Customer_collection {
+
+ private final Customer holder;
+
+ public void $$(String newName) { holder.setName(newName); }
+ }
+
+ @Test
+ void collectionMixin_shouldHaveProperFacet() {
+
+ val mixinFacet = super.runTypeContextOn(Customer_collection.class)
+ .getFacet(MixinFacet.class);
+
+ // proper predicates
+ assertNotNull(mixinFacet);
+ assertTrue(mixinFacet.isMixinFor(Customer.class));
+ assertFalse(mixinFacet.isMixinFor(NoCustomer.class));
+
+ }
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelAbstract.java
index d30f336..2f9bd80 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/progmodel/ProgrammingModelAbstract.java
@@ -86,8 +86,6 @@ public abstract class ProgrammingModelAbstract implements ProgrammingModel {
T instance,
Marker... markers) {
- System.out.println("### " + instance);
-
assertNotInitialized();
val validatorEntry = ProgrammingModelEntry.of(instance, markers);
validatorEntriesByOrder.putElement(order, validatorEntry);
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperActionSupport_action.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperActionSupport_action.java
index 42a66b4..7705807 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperActionSupport_action.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperActionSupport_action.java
@@ -29,8 +29,7 @@ public class ProperActionSupport_action {
private final ProperActionSupport holder;
// proper mix-in action
- @Action
- public ProperActionSupport $$() {
+ public ProperActionSupport act() {
return holder;
}
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 01050c2..b93ec26 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
@@ -83,8 +83,12 @@ class DomainModelTest_usingGoodDomain {
// check whether mix-ins are picked up as they should
val specLoader = MetaModelContext.current().getSpecificationLoader();
val holderSpec = specLoader.loadSpecification(ProperActionSupport.class, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
- val oa = holderSpec.getObjectAction("mixin"); // proper mix-in support
- assertNotNull(oa);
+
+ val oa_mixin = holderSpec.getObjectAction("mixin"); // proper mix-in support
+ assertNotNull(oa_mixin);
+
+ val oa_action = holderSpec.getObjectAction("action"); // proper mix-in support
+ assertNotNull(oa_action);
}