You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/10/16 12:07:26 UTC
[1/2] isis git commit: ISIS-1195: standardizing some names of domain
events classes in unit tests (all should have "DomainEvent" as suffix)
Repository: isis
Updated Branches:
refs/heads/master 84d973d3d -> 0a77fae81
ISIS-1195: standardizing some names of domain events classes in unit tests (all should have "DomainEvent" as suffix)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/3fa87f41
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/3fa87f41
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/3fa87f41
Branch: refs/heads/master
Commit: 3fa87f41aa2bd153f2f973c5fb50bbf3cb170367
Parents: 84d973d
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Oct 16 10:36:09 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Oct 16 10:36:09 2015 +0100
----------------------------------------------------------------------
.../eventbus/CollectionRemovedFromEvent.java | 4 +-
...entHelperTest_newActionInteractionEvent.java | 9 +++--
...perTest_newCollectionDomainEvent_forAdd.java | 10 +++--
...Test_newCollectionDomainEvent_forRemove.java | 10 +++--
...perTest_newPropertyDomainEvent_forClear.java | 10 +++--
...erTest_newPropertyDomainEvent_forModify.java | 10 +++--
.../ActionAnnotationFacetFactoryTest.java | 37 ++++++++++-------
.../CollectionAnnotationFacetFactoryTest.java | 37 ++++++++++-------
.../PropertyAnnotationFacetFactoryTest.java | 42 ++++++++++++--------
9 files changed, 106 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/3fa87f41/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/CollectionRemovedFromEvent.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/CollectionRemovedFromEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/CollectionRemovedFromEvent.java
index 9718a58..ccebc41 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/CollectionRemovedFromEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/CollectionRemovedFromEvent.java
@@ -37,8 +37,8 @@ public abstract class CollectionRemovedFromEvent<S,T> extends CollectionInteract
}
public CollectionRemovedFromEvent(
- final S source,
- final Identifier identifier,
+ final S source,
+ final Identifier identifier,
final T value) {
super(source, identifier, Of.REMOVE_FROM, value);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/3fa87f41/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newActionInteractionEvent.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newActionInteractionEvent.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newActionInteractionEvent.java
index 59b52c4..2d69a0c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newActionInteractionEvent.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newActionInteractionEvent.java
@@ -32,9 +32,12 @@ public class DomainEventHelperTest_newActionInteractionEvent {
public String foo(final int x, final String y) { return null; }
}
- public static class SomeDomainObjectFooInvokedEvent extends ActionDomainEvent<SomeDomainObject> {
+ public static class SomeDomainObjectFooInvokedDomainEvent extends ActionDomainEvent<SomeDomainObject> {
private static final long serialVersionUID = 1L;
- public SomeDomainObjectFooInvokedEvent(final SomeDomainObject source, final Identifier identifier, final Object... arguments) {
+ public SomeDomainObjectFooInvokedDomainEvent(
+ final SomeDomainObject source,
+ final Identifier identifier,
+ final Object... arguments) {
super(source, identifier, arguments);
}
}
@@ -73,7 +76,7 @@ public class DomainEventHelperTest_newActionInteractionEvent {
final Identifier identifier = Identifier.actionIdentifier(SomeDomainObject.class, "foo", new Class[]{int.class, String.class});
final ActionDomainEvent<SomeDomainObject> ev = new DomainEventHelper(null).newActionDomainEvent(
- SomeDomainObjectFooInvokedEvent.class, identifier, sdo, new Object[]{1, "bar"});
+ SomeDomainObjectFooInvokedDomainEvent.class, identifier, sdo, new Object[]{1, "bar"});
assertThat((SomeDomainObject)ev.getSource(), is(sdo));
assertThat(ev.getIdentifier(), is(identifier));
assertThat(ev.getArguments(), is(not(nullValue())));
http://git-wip-us.apache.org/repos/asf/isis/blob/3fa87f41/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forAdd.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forAdd.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forAdd.java
index cd5e37a..9230f11 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forAdd.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forAdd.java
@@ -33,9 +33,13 @@ public class DomainEventHelperTest_newCollectionDomainEvent_forAdd {
}
public static class SomeReferencedObject {}
- public static class SomeDomainObjectCollectionEvent extends CollectionDomainEvent<SomeDomainObject, SomeReferencedObject> {
+ public static class SomeDomainObjectCollectionDomainEvent extends CollectionDomainEvent<SomeDomainObject, SomeReferencedObject> {
private static final long serialVersionUID = 1L;
- public SomeDomainObjectCollectionEvent(SomeDomainObject source, Identifier identifier, Of of, SomeReferencedObject value) {
+ public SomeDomainObjectCollectionDomainEvent(
+ SomeDomainObject source,
+ Identifier identifier,
+ Of of,
+ SomeReferencedObject value) {
super(source, identifier, of, value);
}
}
@@ -75,7 +79,7 @@ public class DomainEventHelperTest_newCollectionDomainEvent_forAdd {
final Identifier identifier = Identifier.propertyOrCollectionIdentifier(SomeDomainObject.class, "references");
final CollectionDomainEvent<SomeDomainObject, SomeReferencedObject> ev = new DomainEventHelper(null).newCollectionDomainEvent(
- SomeDomainObjectCollectionEvent.class, AbstractDomainEvent.Phase.EXECUTED, identifier, sdo, CollectionDomainEvent.Of.ADD_TO, other);
+ SomeDomainObjectCollectionDomainEvent.class, AbstractDomainEvent.Phase.EXECUTED, identifier, sdo, CollectionDomainEvent.Of.ADD_TO, other);
assertThat(ev.getSource(), is(sdo));
assertThat(ev.getIdentifier(), is(identifier));
assertThat(ev.getOf(), is(CollectionDomainEvent.Of.ADD_TO));
http://git-wip-us.apache.org/repos/asf/isis/blob/3fa87f41/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forRemove.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forRemove.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forRemove.java
index f3f9bdf..8d8c634 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forRemove.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forRemove.java
@@ -33,9 +33,13 @@ public class DomainEventHelperTest_newCollectionDomainEvent_forRemove {
}
public static class SomeReferencedObject {}
- public static class SomeDomainObjectCollectionRemovedFromEvent extends CollectionDomainEvent<SomeDomainObject, SomeReferencedObject> {
+ public static class SomeDomainObjectCollectionRemovedFromDomainEvent extends CollectionDomainEvent<SomeDomainObject, SomeReferencedObject> {
private static final long serialVersionUID = 1L;
- public SomeDomainObjectCollectionRemovedFromEvent(SomeDomainObject source, Identifier identifier, Of of, SomeReferencedObject value) {
+ public SomeDomainObjectCollectionRemovedFromDomainEvent(
+ SomeDomainObject source,
+ Identifier identifier,
+ Of of,
+ SomeReferencedObject value) {
super(source, identifier, of, value);
}
}
@@ -75,7 +79,7 @@ public class DomainEventHelperTest_newCollectionDomainEvent_forRemove {
Identifier identifier = Identifier.propertyOrCollectionIdentifier(SomeDomainObject.class, "references");
final CollectionDomainEvent<SomeDomainObject, SomeReferencedObject> ev = new DomainEventHelper(null).newCollectionDomainEvent(
- SomeDomainObjectCollectionRemovedFromEvent.class, AbstractDomainEvent.Phase.EXECUTED, identifier, sdo, CollectionDomainEvent.Of.REMOVE_FROM, other);
+ SomeDomainObjectCollectionRemovedFromDomainEvent.class, AbstractDomainEvent.Phase.EXECUTED, identifier, sdo, CollectionDomainEvent.Of.REMOVE_FROM, other);
assertThat(ev.getSource(), is(sdo));
assertThat(ev.getIdentifier(), is(identifier));
assertThat(ev.getOf(), is(CollectionDomainEvent.Of.REMOVE_FROM));
http://git-wip-us.apache.org/repos/asf/isis/blob/3fa87f41/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forClear.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forClear.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forClear.java
index 2615194..96a42fa 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forClear.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forClear.java
@@ -29,9 +29,13 @@ public class DomainEventHelperTest_newPropertyDomainEvent_forClear {
public static class SomeDomainObject {}
- public static class SomeDatePropertyChangedEvent extends PropertyDomainEvent<SomeDomainObject, LocalDate> {
+ public static class SomeDatePropertyChangedDomainEvent extends PropertyDomainEvent<SomeDomainObject, LocalDate> {
private static final long serialVersionUID = 1L;
- public SomeDatePropertyChangedEvent(SomeDomainObject source, Identifier identifier, LocalDate oldValue, LocalDate newValue) {
+ public SomeDatePropertyChangedDomainEvent(
+ SomeDomainObject source,
+ Identifier identifier,
+ LocalDate oldValue,
+ LocalDate newValue) {
super(source, identifier, oldValue, newValue);
}
}
@@ -62,7 +66,7 @@ public class DomainEventHelperTest_newPropertyDomainEvent_forClear {
LocalDate newValue = null;
final PropertyDomainEvent<SomeDomainObject, LocalDate> ev =
- new DomainEventHelper(null).newPropertyDomainEvent(SomeDatePropertyChangedEvent.class, identifier, sdo, oldValue, newValue);
+ new DomainEventHelper(null).newPropertyDomainEvent(SomeDatePropertyChangedDomainEvent.class, identifier, sdo, oldValue, newValue);
assertThat(ev.getSource(), is(sdo));
assertThat(ev.getIdentifier(), is(identifier));
assertThat(ev.getOldValue(), is(oldValue));
http://git-wip-us.apache.org/repos/asf/isis/blob/3fa87f41/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forModify.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forModify.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forModify.java
index bea8c40..c1d4c6d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forModify.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forModify.java
@@ -28,9 +28,13 @@ public class DomainEventHelperTest_newPropertyDomainEvent_forModify {
public static class SomeDomainObject {}
- public static class SomeDatePropertyChangedEvent extends PropertyDomainEvent<SomeDomainObject, LocalDate> {
+ public static class SomeDatePropertyChangedDomainEvent extends PropertyDomainEvent<SomeDomainObject, LocalDate> {
private static final long serialVersionUID = 1L;
- public SomeDatePropertyChangedEvent(SomeDomainObject source, Identifier identifier, LocalDate oldValue, LocalDate newValue) {
+ public SomeDatePropertyChangedDomainEvent(
+ SomeDomainObject source,
+ Identifier identifier,
+ LocalDate oldValue,
+ LocalDate newValue) {
super(source, identifier, oldValue, newValue);
}
}
@@ -61,7 +65,7 @@ public class DomainEventHelperTest_newPropertyDomainEvent_forModify {
LocalDate newValue = new LocalDate(2013,5,2);
final PropertyDomainEvent<SomeDomainObject, LocalDate> ev =
- new DomainEventHelper(null).newPropertyDomainEvent(SomeDatePropertyChangedEvent.class, identifier, sdo, oldValue, newValue);
+ new DomainEventHelper(null).newPropertyDomainEvent(SomeDatePropertyChangedDomainEvent.class, identifier, sdo, oldValue, newValue);
assertThat(ev.getSource(), is(sdo));
assertThat(ev.getIdentifier(), is(identifier));
assertThat(ev.getOldValue(), is(oldValue));
http://git-wip-us.apache.org/repos/asf/isis/blob/3fa87f41/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
index 6486e73..6e51972 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
@@ -166,13 +166,16 @@ public class ActionAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4
class Customer {
- class SomeActionInvoked extends ActionInvokedEvent<Customer> {
- public SomeActionInvoked(final Customer source, final Identifier identifier, final Object... arguments) {
+ class SomeActionInvokedDomainEvent extends ActionInvokedEvent<Customer> {
+ public SomeActionInvokedDomainEvent(
+ final Customer source,
+ final Identifier identifier,
+ final Object... arguments) {
super(source, identifier, arguments);
}
}
- @PostsActionInvokedEvent(Customer.SomeActionInvoked.class)
+ @PostsActionInvokedEvent(SomeActionInvokedDomainEvent.class)
public void someAction() {
}
}
@@ -200,7 +203,7 @@ public class ActionAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4
Assert.assertNotNull(invocationFacet);
Assert.assertTrue(invocationFacet instanceof ActionInvocationFacetForPostsActionInvokedEventAnnotation);
final ActionInvocationFacetForPostsActionInvokedEventAnnotation invocationFacetImpl = (ActionInvocationFacetForPostsActionInvokedEventAnnotation) invocationFacet;
- assertThat(invocationFacetImpl.getEventType(), classEqualTo(Customer.SomeActionInvoked.class));
+ assertThat(invocationFacetImpl.getEventType(), classEqualTo(Customer.SomeActionInvokedDomainEvent.class));
}
@Test
@@ -208,13 +211,16 @@ public class ActionAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4
class Customer {
- class SomeActionInvoked extends ActionInteractionEvent<Customer> {
- public SomeActionInvoked(final Customer source, final Identifier identifier, final Object... arguments) {
+ class SomeActionInvokedDomainEvent extends ActionInteractionEvent<Customer> {
+ public SomeActionInvokedDomainEvent(
+ final Customer source,
+ final Identifier identifier,
+ final Object... arguments) {
super(source, identifier, arguments);
}
}
- @ActionInteraction(Customer.SomeActionInvoked.class)
+ @ActionInteraction(SomeActionInvokedDomainEvent.class)
public void someAction() {
}
}
@@ -236,13 +242,13 @@ public class ActionAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4
Assert.assertNotNull(domainEventFacet);
Assert.assertTrue(domainEventFacet instanceof ActionDomainEventFacetForActionInteractionAnnotation);
final ActionDomainEventFacetForActionInteractionAnnotation domainEventFacetImpl = (ActionDomainEventFacetForActionInteractionAnnotation) domainEventFacet;
- assertThat(domainEventFacetImpl.getEventType(), classEqualTo(Customer.SomeActionInvoked.class));
+ assertThat(domainEventFacetImpl.getEventType(), classEqualTo(Customer.SomeActionInvokedDomainEvent.class));
final Facet invocationFacet = facetedMethod.getFacet(ActionInvocationFacet.class);
Assert.assertNotNull(invocationFacet);
Assert.assertTrue(invocationFacet instanceof ActionInvocationFacetForDomainEventFromActionInteractionAnnotation);
final ActionInvocationFacetForDomainEventFromActionInteractionAnnotation invocationFacetImpl = (ActionInvocationFacetForDomainEventFromActionInteractionAnnotation) invocationFacet;
- assertThat(invocationFacetImpl.getEventType(), classEqualTo(Customer.SomeActionInvoked.class));
+ assertThat(invocationFacetImpl.getEventType(), classEqualTo(Customer.SomeActionInvokedDomainEvent.class));
}
@Test
@@ -250,13 +256,16 @@ public class ActionAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4
class Customer {
- class SomeActionInvoked extends ActionDomainEvent<Customer> {
- public SomeActionInvoked(final Customer source, final Identifier identifier, final Object... arguments) {
+ class SomeActionInvokedDomainEvent extends ActionDomainEvent<Customer> {
+ public SomeActionInvokedDomainEvent(
+ final Customer source,
+ final Identifier identifier,
+ final Object... arguments) {
super(source, identifier, arguments);
}
}
- @Action(domainEvent=Customer.SomeActionInvoked.class)
+ @Action(domainEvent= SomeActionInvokedDomainEvent.class)
public void someAction() {
}
}
@@ -278,13 +287,13 @@ public class ActionAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4
Assert.assertNotNull(domainEventFacet);
Assert.assertTrue(domainEventFacet instanceof ActionDomainEventFacetForActionAnnotation);
final ActionDomainEventFacetForActionAnnotation domainEventFacetImpl = (ActionDomainEventFacetForActionAnnotation) domainEventFacet;
- assertThat(domainEventFacetImpl.getEventType(), classEqualTo(Customer.SomeActionInvoked.class));
+ assertThat(domainEventFacetImpl.getEventType(), classEqualTo(Customer.SomeActionInvokedDomainEvent.class));
final Facet invocationFacet = facetedMethod.getFacet(ActionInvocationFacet.class);
Assert.assertNotNull(invocationFacet);
Assert.assertTrue(invocationFacet instanceof ActionInvocationFacetForDomainEventFromActionAnnotation);
final ActionInvocationFacetForDomainEventFromActionAnnotation invocationFacetImpl = (ActionInvocationFacetForDomainEventFromActionAnnotation) invocationFacet;
- assertThat(invocationFacetImpl.getEventType(), classEqualTo(Customer.SomeActionInvoked.class));
+ assertThat(invocationFacetImpl.getEventType(), classEqualTo(Customer.SomeActionInvokedDomainEvent.class));
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/3fa87f41/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
index cf2f608..d65906a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
@@ -162,20 +162,26 @@ public class CollectionAnnotationFacetFactoryTest extends AbstractFacetFactoryJU
class Order {
}
class Customer {
- class OrdersAddedTo extends CollectionAddedToEvent<Customer, Order> {
- public OrdersAddedTo(final Customer source, final Identifier identifier, final Order value) {
+ class OrdersAddedToDomainEvent extends CollectionAddedToEvent<Customer, Order> {
+ public OrdersAddedToDomainEvent(
+ final Customer source,
+ final Identifier identifier,
+ final Order value) {
super(source, identifier, value);
}
}
- class OrdersRemovedFrom extends CollectionRemovedFromEvent<Customer, Order> {
- public OrdersRemovedFrom(final Customer source, final Identifier identifier, final Order value) {
+ class OrdersRemovedFromDomainEvent extends CollectionRemovedFromEvent<Customer, Order> {
+ public OrdersRemovedFromDomainEvent(
+ final Customer source,
+ final Identifier identifier,
+ final Order value) {
super(source, identifier, value);
}
}
- @PostsCollectionAddedToEvent(OrdersAddedTo.class)
- @PostsCollectionRemovedFromEvent(OrdersRemovedFrom.class)
+ @PostsCollectionAddedToEvent(OrdersAddedToDomainEvent.class)
+ @PostsCollectionRemovedFromEvent(OrdersRemovedFromDomainEvent.class)
public List<Order> getOrders() {
return null;
}
@@ -218,14 +224,14 @@ public class CollectionAnnotationFacetFactoryTest extends AbstractFacetFactoryJU
Assert.assertNotNull(addToFacet);
Assert.assertTrue(addToFacet instanceof CollectionAddToFacetForPostsCollectionAddedToEventAnnotation);
final CollectionAddToFacetForPostsCollectionAddedToEventAnnotation addToFacetImpl = (CollectionAddToFacetForPostsCollectionAddedToEventAnnotation) addToFacet;
- assertThat(addToFacetImpl.value(), classEqualTo(Customer.OrdersAddedTo.class));
+ assertThat(addToFacetImpl.value(), classEqualTo(Customer.OrdersAddedToDomainEvent.class));
// then
final Facet removeFromFacet = facetedMethod.getFacet(CollectionRemoveFromFacet.class);
Assert.assertNotNull(removeFromFacet);
Assert.assertTrue(removeFromFacet instanceof CollectionRemoveFromFacetForPostsCollectionRemovedFromEventAnnotation);
final CollectionRemoveFromFacetForPostsCollectionRemovedFromEventAnnotation removeFromFacetImpl = (CollectionRemoveFromFacetForPostsCollectionRemovedFromEventAnnotation) removeFromFacet;
- assertThat(removeFromFacetImpl.value(), classEqualTo(Customer.OrdersRemovedFrom.class));
+ assertThat(removeFromFacetImpl.value(), classEqualTo(Customer.OrdersRemovedFromDomainEvent.class));
}
// @Test
@@ -234,18 +240,19 @@ public class CollectionAnnotationFacetFactoryTest extends AbstractFacetFactoryJU
class Order {
}
class Customer {
- class OrdersChanged extends CollectionInteractionEvent<Customer, Order> {
- public OrdersChanged(final Customer source, final Identifier identifier, final Of of) {
+ class OrdersChangedDomainEvent extends CollectionInteractionEvent<Customer, Order> {
+ public OrdersChangedDomainEvent(final Customer source, final Identifier identifier, final Of of) {
super(source, identifier, of);
}
- public OrdersChanged(final Customer source, final Identifier identifier, final Of of,
+ public OrdersChangedDomainEvent(
+ final Customer source, final Identifier identifier, final Of of,
final Order value) {
super(source, identifier, of, value);
}
}
- @CollectionInteraction(OrdersChanged.class)
+ @CollectionInteraction(OrdersChangedDomainEvent.class)
public List<Order> getOrders() {
return null;
}
@@ -275,21 +282,21 @@ public class CollectionAnnotationFacetFactoryTest extends AbstractFacetFactoryJU
Assert.assertNotNull(domainEventFacet);
Assert.assertTrue(domainEventFacet instanceof CollectionDomainEventFacetForCollectionInteractionAnnotation);
final CollectionDomainEventFacetForCollectionInteractionAnnotation domainEventFacetImpl = (CollectionDomainEventFacetForCollectionInteractionAnnotation) domainEventFacet;
- assertThat(domainEventFacetImpl.value(), classEqualTo(Customer.OrdersChanged.class));
+ assertThat(domainEventFacetImpl.value(), classEqualTo(Customer.OrdersChangedDomainEvent.class));
// then
final Facet addToFacet = facetedMethod.getFacet(CollectionAddToFacet.class);
Assert.assertNotNull(addToFacet);
Assert.assertTrue(addToFacet instanceof CollectionAddToFacetForDomainEventFromCollectionInteractionAnnotation);
final CollectionAddToFacetForDomainEventFromCollectionInteractionAnnotation addToFacetImpl = (CollectionAddToFacetForDomainEventFromCollectionInteractionAnnotation) addToFacet;
- assertThat(addToFacetImpl.value(), classEqualTo(Customer.OrdersChanged.class));
+ assertThat(addToFacetImpl.value(), classEqualTo(Customer.OrdersChangedDomainEvent.class));
// then
final Facet removeFromFacet = facetedMethod.getFacet(CollectionRemoveFromFacet.class);
Assert.assertNotNull(removeFromFacet);
Assert.assertTrue(removeFromFacet instanceof CollectionRemoveFromFacetForDomainEventFromCollectionInteractionAnnotation);
final CollectionRemoveFromFacetForDomainEventFromCollectionInteractionAnnotation removeFromFacetImpl = (CollectionRemoveFromFacetForDomainEventFromCollectionInteractionAnnotation) removeFromFacet;
- assertThat(removeFromFacetImpl.value(), classEqualTo(Customer.OrdersChanged.class));
+ assertThat(removeFromFacetImpl.value(), classEqualTo(Customer.OrdersChangedDomainEvent.class));
}
// @Test
http://git-wip-us.apache.org/repos/asf/isis/blob/3fa87f41/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
index 30be3dc..a0024d1 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
@@ -166,12 +166,12 @@ public class PropertyAnnotationFacetFactoryTest extends AbstractFacetFactoryJUni
public void withDeprecatedPostsPropertyChangedEvent_andGetterFacet_andSetterFacet() {
class Customer {
- class NamedChanged extends PropertyChangedEvent<Customer, String> {
- public NamedChanged(final Customer source, final String oldValue, final String newValue) {
+ class NamedChangedDomainEvent extends PropertyChangedEvent<Customer, String> {
+ public NamedChangedDomainEvent(final Customer source, final String oldValue, final String newValue) {
super(source, oldValue, newValue);
}
}
- @PostsPropertyChangedEvent(Customer.NamedChanged.class)
+ @PostsPropertyChangedEvent(NamedChangedDomainEvent.class)
public String getName() {
return null;
}
@@ -206,14 +206,14 @@ public class PropertyAnnotationFacetFactoryTest extends AbstractFacetFactoryJUni
Assert.assertNotNull(setterFacet);
Assert.assertTrue(setterFacet instanceof PropertySetterFacetForPostsPropertyChangedEventAnnotation);
final PropertySetterFacetForPostsPropertyChangedEventAnnotation setterFacetImpl = (PropertySetterFacetForPostsPropertyChangedEventAnnotation) setterFacet;
- assertThat(setterFacetImpl.value(), classEqualTo(Customer.NamedChanged.class));
+ assertThat(setterFacetImpl.value(), classEqualTo(Customer.NamedChangedDomainEvent.class));
// then
final Facet clearFacet = facetedMethod.getFacet(PropertyClearFacet.class);
Assert.assertNotNull(clearFacet);
Assert.assertTrue(clearFacet instanceof PropertyClearFacetForPostsPropertyChangedEventAnnotation);
final PropertyClearFacetForPostsPropertyChangedEventAnnotation clearFacetImpl = (PropertyClearFacetForPostsPropertyChangedEventAnnotation) clearFacet;
- assertThat(clearFacetImpl.value(), classEqualTo(Customer.NamedChanged.class));
+ assertThat(clearFacetImpl.value(), classEqualTo(Customer.NamedChangedDomainEvent.class));
}
@@ -221,12 +221,16 @@ public class PropertyAnnotationFacetFactoryTest extends AbstractFacetFactoryJUni
public void withPropertyInteractionEvent() {
class Customer {
- class NamedChanged extends PropertyInteractionEvent<Customer, String> {
- public NamedChanged(final Customer source, final Identifier identifier, final String oldValue, final String newValue) {
+ class NamedChangedDomainEvent extends PropertyInteractionEvent<Customer, String> {
+ public NamedChangedDomainEvent(
+ final Customer source,
+ final Identifier identifier,
+ final String oldValue,
+ final String newValue) {
super(source, identifier, oldValue, newValue);
}
}
- @PropertyInteraction(Customer.NamedChanged.class)
+ @PropertyInteraction(NamedChangedDomainEvent.class)
public String getName() {
return null;
}
@@ -254,33 +258,37 @@ public class PropertyAnnotationFacetFactoryTest extends AbstractFacetFactoryJUni
Assert.assertNotNull(domainEventFacet);
Assert.assertTrue(domainEventFacet instanceof PropertyDomainEventFacetForPropertyInteractionAnnotation);
final PropertyDomainEventFacetForPropertyInteractionAnnotation domainEventFacetImpl = (PropertyDomainEventFacetForPropertyInteractionAnnotation) domainEventFacet;
- assertThat(domainEventFacetImpl.value(), classEqualTo(Customer.NamedChanged.class));
+ assertThat(domainEventFacetImpl.value(), classEqualTo(Customer.NamedChangedDomainEvent.class));
// then
final Facet setterFacet = facetedMethod.getFacet(PropertySetterFacet.class);
Assert.assertNotNull(setterFacet);
Assert.assertTrue(setterFacet instanceof PropertySetterFacetForDomainEventFromPropertyInteractionAnnotation);
final PropertySetterFacetForDomainEventFromPropertyInteractionAnnotation setterFacetImpl = (PropertySetterFacetForDomainEventFromPropertyInteractionAnnotation) setterFacet;
- assertThat(setterFacetImpl.value(), classEqualTo(Customer.NamedChanged.class));
+ assertThat(setterFacetImpl.value(), classEqualTo(Customer.NamedChangedDomainEvent.class));
// then
final Facet clearFacet = facetedMethod.getFacet(PropertyClearFacet.class);
Assert.assertNotNull(clearFacet);
Assert.assertTrue(clearFacet instanceof PropertyClearFacetForDomainEventFromPropertyInteractionAnnotation);
final PropertyClearFacetForDomainEventFromPropertyInteractionAnnotation clearFacetImpl = (PropertyClearFacetForDomainEventFromPropertyInteractionAnnotation) clearFacet;
- assertThat(clearFacetImpl.value(), classEqualTo(Customer.NamedChanged.class));
+ assertThat(clearFacetImpl.value(), classEqualTo(Customer.NamedChangedDomainEvent.class));
}
@Test
public void withPropertyDomainEvent() {
class Customer {
- class NamedChanged extends PropertyDomainEvent<Customer, String> {
- public NamedChanged(final Customer source, final Identifier identifier, final String oldValue, final String newValue) {
+ class NamedChangedDomainEvent extends PropertyDomainEvent<Customer, String> {
+ public NamedChangedDomainEvent(
+ final Customer source,
+ final Identifier identifier,
+ final String oldValue,
+ final String newValue) {
super(source, identifier, oldValue, newValue);
}
}
- @Property(domainEvent=Customer.NamedChanged.class)
+ @Property(domainEvent= NamedChangedDomainEvent.class)
public String getName() {
return null;
}
@@ -308,21 +316,21 @@ public class PropertyAnnotationFacetFactoryTest extends AbstractFacetFactoryJUni
Assert.assertNotNull(domainEventFacet);
Assert.assertTrue(domainEventFacet instanceof PropertyDomainEventFacetForPropertyAnnotation);
final PropertyDomainEventFacetForPropertyAnnotation domainEventFacetImpl = (PropertyDomainEventFacetForPropertyAnnotation) domainEventFacet;
- assertThat(domainEventFacetImpl.value(), classEqualTo(Customer.NamedChanged.class));
+ assertThat(domainEventFacetImpl.value(), classEqualTo(Customer.NamedChangedDomainEvent.class));
// then
final Facet setterFacet = facetedMethod.getFacet(PropertySetterFacet.class);
Assert.assertNotNull(setterFacet);
Assert.assertTrue(setterFacet instanceof PropertySetterFacetForDomainEventFromPropertyAnnotation);
final PropertySetterFacetForDomainEventFromPropertyAnnotation setterFacetImpl = (PropertySetterFacetForDomainEventFromPropertyAnnotation) setterFacet;
- assertThat(setterFacetImpl.value(), classEqualTo(Customer.NamedChanged.class));
+ assertThat(setterFacetImpl.value(), classEqualTo(Customer.NamedChangedDomainEvent.class));
// then
final Facet clearFacet = facetedMethod.getFacet(PropertyClearFacet.class);
Assert.assertNotNull(clearFacet);
Assert.assertTrue(clearFacet instanceof PropertyClearFacetForDomainEventFromPropertyAnnotation);
final PropertyClearFacetForDomainEventFromPropertyAnnotation clearFacetImpl = (PropertyClearFacetForDomainEventFromPropertyAnnotation) clearFacet;
- assertThat(clearFacetImpl.value(), classEqualTo(Customer.NamedChanged.class));
+ assertThat(clearFacetImpl.value(), classEqualTo(Customer.NamedChangedDomainEvent.class));
}
@Test
[2/2] isis git commit: ISIS-1213: mixed actions should be
automatically contributed as both actions and associations unless
@ActionLayout is used to restrict their applicability.
Posted by da...@apache.org.
ISIS-1213: mixed actions should be automatically contributed as both actions and associations unless @ActionLayout is used to restrict their applicability.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/0a77fae8
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/0a77fae8
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/0a77fae8
Branch: refs/heads/master
Commit: 0a77fae81269a3919160c5cb054da9e1674b2b3f
Parents: 3fa87f4
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Oct 16 10:37:07 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Oct 16 10:37:07 2015 +0100
----------------------------------------------------------------------
.../org/apache/isis/applib/annotation/NotContributed.java | 3 ++-
.../derived/NotContributedFacetDerivedFromMixinFacet.java | 7 ++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/0a77fae8/core/applib/src/main/java/org/apache/isis/applib/annotation/NotContributed.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/NotContributed.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/NotContributed.java
index 5e37325..0ea2741 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/NotContributed.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/NotContributed.java
@@ -55,7 +55,8 @@ public @interface NotContributed {
public enum As {
ACTION,
ASSOCIATION,
- EITHER;
+ EITHER,
+ NEITHER; /* ie contributed as both ! */
/**
* @deprecated
http://git-wip-us.apache.org/repos/asf/isis/blob/0a77fae8/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromMixinFacet.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromMixinFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromMixinFacet.java
index ba6f38f..8e8fea3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromMixinFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromMixinFacet.java
@@ -18,15 +18,20 @@
*/
package org.apache.isis.core.metamodel.facets.actions.notcontributed.derived;
+import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.NotContributed;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.actions.notcontributed.NotContributedFacetAbstract;
+/**
+ * By default, any mixin actions are contributed as both actions and associations. This can be overridden using
+ * {@link ActionLayout#contributed()}.
+ */
public class NotContributedFacetDerivedFromMixinFacet extends NotContributedFacetAbstract {
public NotContributedFacetDerivedFromMixinFacet(
final FacetHolder holder) {
- super(NotContributed.As.EITHER, holder, Derivation.DERIVED);
+ super(NotContributed.As.NEITHER, holder, Derivation.DERIVED);
}
}