This is an automated email from the ASF dual-hosted git repository. danhaywood 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 15cc987 ISIS-1811: updates docs for Axon eventhandler 15cc987 is described below commit 15cc9879c5bd01a5f5635846721761f895758503 Author: danhaywood <d...@haywood-associates.co.uk> AuthorDate: Sun Oct 14 14:59:48 2018 +0100 ISIS-1811: updates docs for Axon eventhandler has moved to a different package with upgrade. Think this is ISIS-1905 --- .../guides/rgant/_rgant-Action_domainEvent.adoc | 7 ++----- .../guides/rgant/_rgant-Collection_domainEvent.adoc | 7 ++----- .../_rgant-DomainObjectLayout_cssClassUiEvent.adoc | 8 ++++---- .../rgant/_rgant-DomainObjectLayout_iconUiEvent.adoc | 8 ++++---- .../rgant/_rgant-DomainObjectLayout_titleUiEvent.adoc | 8 ++++---- .../_rgant-DomainObject_createdLifecycleEvent.adoc | 8 ++++---- .../rgant/_rgant-DomainObject_loadedLifecycleEvent.adoc | 8 ++++---- .../_rgant-DomainObject_persistedLifecycleEvent.adoc | 8 ++++---- .../_rgant-DomainObject_persistingLifecycleEvent.adoc | 7 ++++--- .../_rgant-DomainObject_removingLifecycleEvent.adoc | 8 ++++---- .../_rgant-DomainObject_updatedLifecycleEvent.adoc | 8 ++++---- .../_rgant-DomainObject_updatingLifecycleEvent.adoc | 8 ++++---- .../guides/rgant/_rgant-Property_domainEvent.adoc | 8 ++------ .../rgsvc/_rgsvc_core-domain-api_EventBusService.adoc | 17 +++-------------- ...ramming-model_domain-services_event-subscribers.adoc | 10 +++++----- .../ugfun/_ugfun_ui-hints_object-titles-and-icons.adoc | 12 ++++++------ .../isis/applib/services/bookmark/BookmarkService.java | 7 ++++--- .../src/main/resources/archetype-resources/pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 2 +- 19 files changed, 66 insertions(+), 85 deletions(-) diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_domainEvent.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_domainEvent.adoc index 504a118..a5710ba 100644 --- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_domainEvent.adoc +++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_domainEvent.adoc @@ -81,17 +81,14 @@ or can be fine-grained (by subscribing to specific event subtypes): ---- @DomainService(nature=NatureOfService.DOMAIN) public class SomeSubscriber extends AbstractSubscriber { - @com.google.common.eventbus.Subscribe + @org.axonframework.eventhandling.EventHandler // if using axon + @com.google.common.eventbus.Subscribe // if using guava public void on(ToDoItem.CompletedEvent ev) { ... } } ---- -[TIP] -==== -If the AxonFramework is being used, replace `@com.google.common.eventbus.Subscribe` with `@org.axonframework.eventhandling.annotation.EventHandler`. -==== The subscriber's method is called (up to) 5 times: diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_domainEvent.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_domainEvent.adoc index 3ac38e7..6bed5a2 100644 --- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_domainEvent.adoc +++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_domainEvent.adoc @@ -94,17 +94,14 @@ or can be fine-grained (by subscribing to specific event subtypes): ---- @DomainService(nature=NatureOfService.DOMAIN) public class SomeSubscriber extends AbstractSubscriber { - @com.google.common.eventbus.Subscribe + @org.axonframework.eventhandling.EventHandler // if using axon + @com.google.common.eventbus.Subscribe // if using guava public void on(ToDoItem.DependenciesChangedEvent ev) { ... } } ---- -[TIP] -==== -If the AxonFramework is being used, replace `@com.google.common.eventbus.Subscribe` with `@org.axonframework.eventhandling.annotation.EventHandler`. -==== The subscriber's method is called (up to) 5 times: diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_cssClassUiEvent.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_cssClassUiEvent.adoc index 6cd44ad..e885673 100644 --- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_cssClassUiEvent.adoc +++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_cssClassUiEvent.adoc @@ -64,8 +64,8 @@ Subscribers can be either coarse-grained (if they subscribe to the top-level eve ---- @DomainService(nature=NatureOfService.DOMAIN) public class SomeSubscriber extends AbstractSubscriber { - @org.axonframework.eventhandling.annotation.EventHandler // if using axon - @com.google.common.eventbus.Subscribe // if using guava + @org.axonframework.eventhandling.EventHandler // if using axon + @com.google.common.eventbus.Subscribe // if using guava public void on(CssClassUiEvent ev) { if(ev.getSource() instanceof ToDoItemDto) { ... } } @@ -78,8 +78,8 @@ or can be fine-grained (by subscribing to specific event subtypes): ---- @DomainService(nature=NatureOfService.DOMAIN) public class SomeSubscriber extends AbstractSubscriber { - @org.axonframework.eventhandling.annotation.EventHandler // if using axon - @com.google.common.eventbus.Subscribe // if using guava + @org.axonframework.eventhandling.EventHandler // if using axon + @com.google.common.eventbus.Subscribe // if using guava public void on(ToDoItemDto.CssClassUiEvent ev) { ... } diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_iconUiEvent.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_iconUiEvent.adoc index bb76208..2062966 100644 --- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_iconUiEvent.adoc +++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_iconUiEvent.adoc @@ -63,8 +63,8 @@ Subscribers can be either coarse-grained (if they subscribe to the top-level eve ---- @DomainService(nature=NatureOfService.DOMAIN) public class SomeSubscriber extends AbstractSubscriber { - @org.axonframework.eventhandling.annotation.EventHandler // if using axon - @com.google.common.eventbus.Subscribe // if using guava + @org.axonframework.eventhandling.EventHandler // if using axon + @com.google.common.eventbus.Subscribe // if using guava public void on(IconUiEvent ev) { if(ev.getSource() instanceof ToDoItemDto) { ... } } @@ -77,8 +77,8 @@ or can be fine-grained (by subscribing to specific event subtypes): ---- @DomainService(nature=NatureOfService.DOMAIN) public class SomeSubscriber extends AbstractSubscriber { - @org.axonframework.eventhandling.annotation.EventHandler // if using axon - @com.google.common.eventbus.Subscribe // if using guava + @org.axonframework.eventhandling.EventHandler // if using axon + @com.google.common.eventbus.Subscribe // if using guava public void on(ToDoItemDto.IconUiEvent ev) { ... } diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_titleUiEvent.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_titleUiEvent.adoc index 62e7aea..a4b1061 100644 --- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_titleUiEvent.adoc +++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_titleUiEvent.adoc @@ -64,8 +64,8 @@ Subscribers can be either coarse-grained (if they subscribe to the top-level eve ---- @DomainService(nature=NatureOfService.DOMAIN) public class SomeSubscriber extends AbstractSubscriber { - @org.axonframework.eventhandling.annotation.EventHandler // if using axon - @com.google.common.eventbus.Subscribe // if using guava + @org.axonframework.eventhandling.EventHandler // if using axon + @com.google.common.eventbus.Subscribe // if using guava public void on(TitleUiEvent ev) { if(ev.getSource() instanceof ToDoItemDto) { ... } } @@ -78,8 +78,8 @@ or can be fine-grained (by subscribing to specific event subtypes): ---- @DomainService(nature=NatureOfService.DOMAIN) public class SomeSubscriber extends AbstractSubscriber { - @org.axonframework.eventhandling.annotation.EventHandler // if using axon - @com.google.common.eventbus.Subscribe // if using guava + @org.axonframework.eventhandling.EventHandler // if using axon + @com.google.common.eventbus.Subscribe // if using guava public void on(ToDoItemDto.TitleUiEvent ev) { ... } diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_createdLifecycleEvent.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_createdLifecycleEvent.adoc index 97e3808..67d67bf 100644 --- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_createdLifecycleEvent.adoc +++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_createdLifecycleEvent.adoc @@ -62,8 +62,8 @@ Subscribers can be either coarse-grained (if they subscribe to the top-level eve ---- @DomainService(nature=NatureOfService.DOMAIN) public class SomeSubscriber extends AbstractSubscriber { - @org.axonframework.eventhandling.annotation.EventHandler // if using axon - @com.google.common.eventbus.Subscribe // if using guava + @org.axonframework.eventhandling.EventHandler // if using axon + @com.google.common.eventbus.Subscribe // if using guava public void on(ObjectCreatedEvent ev) { if(ev.getSource() instanceof ToDoItem) { ... } } @@ -76,8 +76,8 @@ or can be fine-grained (by subscribing to specific event subtypes): ---- @DomainService(nature=NatureOfService.DOMAIN) public class SomeSubscriber extends AbstractSubscriber { - @org.axonframework.eventhandling.annotation.EventHandler // if using axon - @com.google.common.eventbus.Subscribe // if using guava + @org.axonframework.eventhandling.EventHandler // if using axon + @com.google.common.eventbus.Subscribe // if using guava public void on(ToDoItem.ObjectCreatedEvent ev) { ... } diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_loadedLifecycleEvent.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_loadedLifecycleEvent.adoc index 89bdce3..b73beec 100644 --- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_loadedLifecycleEvent.adoc +++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_loadedLifecycleEvent.adoc @@ -53,8 +53,8 @@ Subscribers can be either coarse-grained (if they subscribe to the top-level eve ---- @DomainService(nature=NatureOfService.DOMAIN) public class SomeSubscriber extends AbstractSubscriber { - @org.axonframework.eventhandling.annotation.EventHandler // if using axon - @com.google.common.eventbus.Subscribe // if using guava + @org.axonframework.eventhandling.EventHandler // if using axon + @com.google.common.eventbus.Subscribe // if using guava public void on(ObjectLoadedEvent ev) { if(ev.getSource() instanceof ToDoItem) { ... } } @@ -67,8 +67,8 @@ or can be fine-grained (by subscribing to specific event subtypes): ---- @DomainService(nature=NatureOfService.DOMAIN) public class SomeSubscriber extends AbstractSubscriber { - @org.axonframework.eventhandling.annotation.EventHandler // if using axon - @com.google.common.eventbus.Subscribe // if using guava + @org.axonframework.eventhandling.EventHandler // if using axon + @com.google.common.eventbus.Subscribe // if using guava public void on(ToDoItem.ObjectLoadedEvent ev) { ... } diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_persistedLifecycleEvent.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_persistedLifecycleEvent.adoc index e0303c5..378231e 100644 --- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_persistedLifecycleEvent.adoc +++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_persistedLifecycleEvent.adoc @@ -59,8 +59,8 @@ Subscribers can be either coarse-grained (if they subscribe to the top-level eve ---- @DomainService(nature=NatureOfService.DOMAIN) public class SomeSubscriber extends AbstractSubscriber { - @org.axonframework.eventhandling.annotation.EventHandler // if using axon - @com.google.common.eventbus.Subscribe // if using guava + @org.axonframework.eventhandling.EventHandler // if using axon + @com.google.common.eventbus.Subscribe // if using guava public void on(ObjectPersistedEvent ev) { if(ev.getSource() instanceof ToDoItem) { ... } } @@ -73,8 +73,8 @@ or can be fine-grained (by subscribing to specific event subtypes): ---- @DomainService(nature=NatureOfService.DOMAIN) public class SomeSubscriber extends AbstractSubscriber { - @org.axonframework.eventhandling.annotation.EventHandler // if using axon - @com.google.common.eventbus.Subscribe // if using guava + @org.axonframework.eventhandling.EventHandler // if using axon + @com.google.common.eventbus.Subscribe // if using guava public void on(ToDoItem.ObjectPersistedEvent ev) { ... } diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_persistingLifecycleEvent.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_persistingLifecycleEvent.adoc index 7260566..e04cf3f 100644 --- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_persistingLifecycleEvent.adoc +++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_persistingLifecycleEvent.adoc @@ -60,7 +60,8 @@ Subscribers can be either coarse-grained (if they subscribe to the top-level eve ---- @DomainService(nature=NatureOfService.DOMAIN) public class SomeSubscriber extends AbstractSubscriber { - @com.google.common.eventbus.Subscribe + @org.axonframework.eventhandling.EventHandler // if using axon + @com.google.common.eventbus.Subscribe // if using guava public void on(ObjectPersistingEvent ev) { if(ev.getSource() instanceof ToDoItem) { ... } } @@ -73,8 +74,8 @@ or can be fine-grained (by subscribing to specific event subtypes): ---- @DomainService(nature=NatureOfService.DOMAIN) public class SomeSubscriber extends AbstractSubscriber { - @org.axonframework.eventhandling.annotation.EventHandler // if using axon - @com.google.common.eventbus.Subscribe // if using guava + @org.axonframework.eventhandling.EventHandler // if using axon + @com.google.common.eventbus.Subscribe // if using guava public void on(ToDoItem.ObjectPersistingEvent ev) { ... } diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_removingLifecycleEvent.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_removingLifecycleEvent.adoc index dbd2eb3..7e1adc0 100644 --- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_removingLifecycleEvent.adoc +++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_removingLifecycleEvent.adoc @@ -61,8 +61,8 @@ Subscribers can be either coarse-grained (if they subscribe to the top-level eve ---- @DomainService(nature=NatureOfService.DOMAIN) public class SomeSubscriber extends AbstractSubscriber { - @org.axonframework.eventhandling.annotation.EventHandler // if using axon - @com.google.common.eventbus.Subscribe // if using guava + @org.axonframework.eventhandling.EventHandler // if using axon + @com.google.common.eventbus.Subscribe // if using guava public void on(ObjectRemovingEvent ev) { if(ev.getSource() instanceof ToDoItem) { ... } } @@ -75,8 +75,8 @@ or can be fine-grained (by subscribing to specific event subtypes): ---- @DomainService(nature=NatureOfService.DOMAIN) public class SomeSubscriber extends AbstractSubscriber { - @org.axonframework.eventhandling.annotation.EventHandler // if using axon - @com.google.common.eventbus.Subscribe // if using guava + @org.axonframework.eventhandling.EventHandler // if using axon + @com.google.common.eventbus.Subscribe // if using guava public void on(ToDoItem.ObjectRemovingEvent ev) { ... } diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_updatedLifecycleEvent.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_updatedLifecycleEvent.adoc index e7dfe68..8b3d475 100644 --- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_updatedLifecycleEvent.adoc +++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_updatedLifecycleEvent.adoc @@ -59,8 +59,8 @@ Subscribers can be either coarse-grained (if they subscribe to the top-level eve ---- @DomainService(nature=NatureOfService.DOMAIN) public class SomeSubscriber extends AbstractSubscriber { - @org.axonframework.eventhandling.annotation.EventHandler // if using axon - @com.google.common.eventbus.Subscribe // if using guava + @org.axonframework.eventhandling.EventHandler // if using axon + @com.google.common.eventbus.Subscribe // if using guava public void on(ObjectUpdatedEvent ev) { if(ev.getSource() instanceof ToDoItem) { ... } } @@ -73,8 +73,8 @@ or can be fine-grained (by subscribing to specific event subtypes): ---- @DomainService(nature=NatureOfService.DOMAIN) public class SomeSubscriber extends AbstractSubscriber { - @org.axonframework.eventhandling.annotation.EventHandler // if using axon - @com.google.common.eventbus.Subscribe // if using guava + @org.axonframework.eventhandling.EventHandler // if using axon + @com.google.common.eventbus.Subscribe // if using guava public void on(ToDoItem.ObjectUpdatedEvent ev) { ... } diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_updatingLifecycleEvent.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_updatingLifecycleEvent.adoc index 42a3067..7f90d85 100644 --- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_updatingLifecycleEvent.adoc +++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_updatingLifecycleEvent.adoc @@ -63,8 +63,8 @@ Subscribers can be either coarse-grained (if they subscribe to the top-level eve ---- @DomainService(nature=NatureOfService.DOMAIN) public class SomeSubscriber extends AbstractSubscriber { - @org.axonframework.eventhandling.annotation.EventHandler // if using axon - @com.google.common.eventbus.Subscribe // if using guava + @org.axonframework.eventhandling.EventHandler // if using axon + @com.google.common.eventbus.Subscribe // if using guava public void on(ObjectUpdatingEvent ev) { if(ev.getSource() instanceof ToDoItem) { ... } } @@ -77,8 +77,8 @@ or can be fine-grained (by subscribing to specific event subtypes): ---- @DomainService(nature=NatureOfService.DOMAIN) public class SomeSubscriber extends AbstractSubscriber { - @org.axonframework.eventhandling.annotation.EventHandler // if using axon - @com.google.common.eventbus.Subscribe // if using guava + @org.axonframework.eventhandling.EventHandler // if using axon + @com.google.common.eventbus.Subscribe // if using guava public void on(ToDoItem.ObjectUpdatingEvent ev) { ... } diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Property_domainEvent.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Property_domainEvent.adoc index ac53113..294f80c 100644 --- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Property_domainEvent.adoc +++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Property_domainEvent.adoc @@ -77,18 +77,14 @@ or can be fine-grained (by subscribing to specific event subtypes): ---- @DomainService(nature=NatureOfService.DOMAIN) public class SomeSubscriber extends AbstractSubscriber { - @com.google.common.eventbus.Subscribe + @org.axonframework.eventhandling.EventHandler // if using axon + @com.google.common.eventbus.Subscribe // if using guava public void on(ToDoItem.DueByChangedEvent ev) { ... } } ---- -[TIP] -==== -If the AxonFramework is being used, replace `@com.google.common.eventbus.Subscribe` with `@org.axonframework.eventhandling.annotation.EventHandler`. -==== - The subscriber's method is called (up to) 5 times: * whether to veto visibility (hide) diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_EventBusService.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_EventBusService.adoc index d0376a1..b7e92aa 100644 --- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_EventBusService.adoc +++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_EventBusService.adoc @@ -111,31 +111,20 @@ public class Customer { } ---- -will propagate an instance of the default `o.a.i.applib.services.eventbus.ActionDomainEvent.Default` class. If using the Guava event bus this can be subscribed to using: +will propagate an instance of the default `o.a.i.applib.services.eventbus.ActionDomainEvent.Default` class, which can then be subscribed to: [source,java] ---- @DomainService(nature=NatureOfService.DOMAIN) public class MySubscribingDomainService @Programmatic - @com.google.common.eventbus.Subscribe + @org.axonframework.eventhandling.EventHandler // if using axon + @com.google.common.eventbus.Subscribe // if using guava public void on(ActionDomainEvent ev) { ... } ... } ---- -or if using Axonframework, the subscriber uses a different annotation: - -[source,java] ----- -@DomainService(nature=NatureOfService.DOMAIN) -public class MySubscribingDomainService - @Programmatic - @org.axonframework.eventhandling.annotation.EventHandler - public void on(ActionDomainEvent ev) { ... } - ... -} ----- More commonly though you will probably want to emit domain events of a specific subtype. As a slightly more interesting example, suppose in a library domain that a `LibraryMember` wants to leave the library. A letter should be sent out detailing any books that they still have out on loan: diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_programming-model_domain-services_event-subscribers.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_programming-model_domain-services_event-subscribers.adoc index 14f74d6..2485e6d 100644 --- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_programming-model_domain-services_event-subscribers.adoc +++ b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_programming-model_domain-services_event-subscribers.adoc @@ -16,18 +16,18 @@ We suggest naming such classes `XxxSubscriptions`, for example: [source,java] ---- @DomainService( - nature=NatureOfService.DOMAIN // <1> + nature=NatureOfService.DOMAIN // <1> ) @DomainServiceLayout( menuOrder="10", name="...", } public class CustomerOrderSubscriptions - extends AbstractSubscriber { // <2> + extends AbstractSubscriber { // <2> - @org.axonframework.eventhandling.annotation.EventHandler // <3> - @com.google.common.eventbus.Subscribe // <3> - public void on(final Customer.DeletedEvent ev) { // <4> + @org.axonframework.eventhandling.EventHandler // <3> + @com.google.common.eventbus.Subscribe // <3> + public void on(final Customer.DeletedEvent ev) { // <4> Customer customer = ev.getSource(); orderRepository.delete(customer); } diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_ui-hints_object-titles-and-icons.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_ui-hints_object-titles-and-icons.adoc index d06f440..9306f8b 100644 --- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_ui-hints_object-titles-and-icons.adoc +++ b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_ui-hints_object-titles-and-icons.adoc @@ -127,8 +127,8 @@ The subscriber can then populate this event: @DomainService(nature=NatureOfService.DOMAIN) public class AuthorSubscriptions extends AbstractSubscriber { - @org.axonframework.eventhandling.annotation.EventHandler - @com.google.common.eventbus.Subscribe + @org.axonframework.eventhandling.EventHandler // if using axon + @com.google.common.eventbus.Subscribe // if using guava public void on(Author.TitleUiEvent ev) { Author author = ev.getSource(); ev.setTitle(titleOf(author); @@ -226,8 +226,8 @@ The subscriber can then populate this event: @DomainService(nature=NatureOfService.DOMAIN) public class OrderSubscriptions extends AbstractSubscriber { - @org.axonframework.eventhandling.annotation.EventHandler - @com.google.common.eventbus.Subscribe + @org.axonframework.eventhandling.EventHandler // if using axon + @com.google.common.eventbus.Subscribe // if using guava public void on(Order.IconUiEvent ev) { Order order = ev.getSource(); ev.setIconName(iconNameOf(order); @@ -310,8 +310,8 @@ The subscriber can then populate this event: @DomainService(nature=NatureOfService.DOMAIN) public class OrderSubscriptions extends AbstractSubscriber { - @org.axonframework.eventhandling.annotation.EventHandler - @com.google.common.eventbus.Subscribe + @org.axonframework.eventhandling.EventHandler // if using axon + @com.google.common.eventbus.Subscribe // if using guava public void on(Order.CssClassUiEvent ev) { Order order = ev.getSource(); ev.setIconName(iconNameOf(order); diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java b/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java index 8650a42..66b338d 100644 --- a/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java +++ b/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java @@ -55,12 +55,13 @@ public interface BookmarkService { * If the object is unresolved then the object's missing data should be retrieved from the persistence * mechanism and be used to set up the value objects and associations. * - * If the object is a view model, then is ignored; the behaviour is as for {@link #DONT_RESET} - * @deprecated - retained for previous behaviour, but in most/all cases, + * If the object is a view model, then is ignored; the behaviour is as for {@link #DONT_REFRESH} + * + * @deprecated - retained for backwards compatibility with previous behaviour, but in most/all cases {@link #DONT_REFRESH} makes more sense/is less surprising. */ @Deprecated RESET, - /** + /*p* * Required in order to recreate view models. */ DONT_REFRESH diff --git a/example/archetype/helloworld/src/main/resources/archetype-resources/pom.xml b/example/archetype/helloworld/src/main/resources/archetype-resources/pom.xml index 5a01087..e61cfeb 100644 --- a/example/archetype/helloworld/src/main/resources/archetype-resources/pom.xml +++ b/example/archetype/helloworld/src/main/resources/archetype-resources/pom.xml @@ -35,7 +35,7 @@ <compiler-plugin.source>1.8</compiler-plugin.source> <compiler-plugin.target>1.8</compiler-plugin.target> <compiler-plugin.compilerArgument>-parameters</compiler-plugin.compilerArgument> - <datanucleus-core.version>5.1.6</datanucleus-core.version> + <datanucleus-core.version>5.1.11</datanucleus-core.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <maven-war-plugin.warName>${project.artifactId}</maven-war-plugin.warName> diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml index 67683b9..3015f1e 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml @@ -36,7 +36,7 @@ <compiler-plugin.source>1.8</compiler-plugin.source> <compiler-plugin.target>1.8</compiler-plugin.target> <compiler-plugin.compilerArgument>-parameters</compiler-plugin.compilerArgument> - <datanucleus-core.version>5.1.6</datanucleus-core.version> + <datanucleus-core.version>5.1.11</datanucleus-core.version> <hsqldb.version>2.3.4</hsqldb.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>