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 2018/11/23 13:19:19 UTC
[isis] 02/02: Merge branch 'master' into v2
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
commit 7c06c1aacb95c4fab0e360ef06428cd07ab45d93
Merge: 972218a e85504a
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Nov 23 13:18:10 2018 +0000
Merge branch 'master' into v2
# Conflicts:
# adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Property_domainEvent.adoc
.../asciidoc/guides/rgant/_rgant-Action_domainEvent.adoc | 8 ++++----
.../guides/rgsvc/_rgsvc_core-domain-api_EventBusService.adoc | 5 ++---
..._programming-model_domain-services_event-subscribers.adoc | 12 +++++-------
.../ugfun/_ugfun_ui-hints_object-titles-and-icons.adoc | 12 ++++++------
.../ugvw/_ugvw_hints-and-tips_highlight-current-row.adoc | 4 ++--
.../modules/simple/subscribers/SimpleObjectListener.java | 4 ----
6 files changed, 19 insertions(+), 26 deletions(-)
diff --cc adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_domainEvent.adoc
index 0599b80,ed63229..b91e65f
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_domainEvent.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_domainEvent.adoc
@@@ -66,8 -66,8 +66,8 @@@ Subscribers can be either coarse-graine
----
@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(ActionDomainEvent ev) {
...
}
@@@ -103,8 -103,8 +103,8 @@@ Thus the general form is
[source,java]
----
--@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(ActionDomainEvent ev) {
switch(ev.getEventPhase()) {
case HIDE:
diff --cc adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_EventBusService.adoc
index b7e92aa,01978c1..c4953c6
--- 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
@@@ -117,9 -117,8 +117,8 @@@ will propagate an instance of the defau
----
@DomainService(nature=NatureOfService.DOMAIN)
public class MySubscribingDomainService
-- @Programmatic
- @org.axonframework.eventhandling.EventHandler // if using axon
- @com.google.common.eventbus.Subscribe // if using guava
- @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) { ... }
...
}
diff --cc adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_programming-model_domain-services_event-subscribers.adoc
index 2485e6d,14f74d6..00b6942
--- 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
@@@ -23,11 -23,11 +23,11 @@@ We suggest naming such classes `XxxSubs
name="...",
}
public class CustomerOrderSubscriptions
- extends AbstractSubscriber { // <2>
- extends AbstractSubscriber { // <2>
++ extends AbstractSubscriber { // <2>
- @org.axonframework.eventhandling.EventHandler // <3>
- @com.google.common.eventbus.Subscribe // <3>
- public void on(final Customer.DeletedEvent ev) { // <4>
- @org.axonframework.eventhandling.annotation.EventHandler // <3>
- @com.google.common.eventbus.Subscribe // <3>
- public void on(final Customer.DeletedEvent ev) { // <4>
++ @org.axonframework.eventhandling.EventHandler // if using axon
++ @com.google.common.eventbus.Subscribe // if using guava
++ public void on(final Customer.DeletedEvent ev) { // <3>
Customer customer = ev.getSource();
orderRepository.delete(customer);
}
@@@ -38,9 -38,9 +38,7 @@@
----
<1> subscriptions do not appear in the UI at all, so should use the domain nature of service
<2> subclass from the `AbstractSubscriber` convenience superclass
--<3> The framework supports two different implementations for the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] - Axon framework and Guava.
--Subscribers should use the appropriate annotation type depending on the implementation chosen (or as shown here, use both annotations).
--<4> the parameter type of the method corresponds to the event emitted on the event bus.
++<3> the parameter type of the method corresponds to the event emitted on the event bus.
The actual method name does not matter (though it must have `public` visibility).
diff --cc adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_ui-hints_object-titles-and-icons.adoc
index 9306f8b,e821c7c..904f03e
--- 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 +127,8 @@@ The subscriber can then populate this e
@DomainService(nature=NatureOfService.DOMAIN)
public class AuthorSubscriptions extends AbstractSubscriber {
- @org.axonframework.eventhandling.EventHandler // if using axon
- @com.google.common.eventbus.Subscribe // if using guava
- @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 +226,8 @@@ The subscriber can then populate this e
@DomainService(nature=NatureOfService.DOMAIN)
public class OrderSubscriptions extends AbstractSubscriber {
- @org.axonframework.eventhandling.EventHandler // if using axon
- @com.google.common.eventbus.Subscribe // if using guava
- @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 +310,8 @@@ The subscriber can then populate this e
@DomainService(nature=NatureOfService.DOMAIN)
public class OrderSubscriptions extends AbstractSubscriber {
- @org.axonframework.eventhandling.EventHandler // if using axon
- @com.google.common.eventbus.Subscribe // if using guava
- @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 --cc adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_hints-and-tips_highlight-current-row.adoc
index d13fef5,467ad24..cdb6511
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_hints-and-tips_highlight-current-row.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_hints-and-tips_highlight-current-row.adoc
@@@ -36,8 -36,8 +36,8 @@@ Next, we define the domain service to a
public class HomePageViewModel ... {
@DomainService(nature = NatureOfService.DOMAIN)
public static class CssHighlighter 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(DemoObject.CssClassUiEvent ev) {
if(getContext() == null) { return; }
if(ev.getSource() == getContext().getSelected()) { // <1>