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:17 UTC
[isis] branch v2 updated (972218a -> 7c06c1a)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 972218a Merge branch 'master' into v2
new e85504a ISIS-2043: removes accidentally committed test class
new 7c06c1a Merge branch 'master' into v2
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../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(-)
delete mode 100644 example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/subscribers/SimpleObjectListener.java
[isis] 01/02: ISIS-2043: removes accidentally committed test class
Posted by da...@apache.org.
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 e85504a28e2e3da3fb49cfefff8bb3327d7d21e0
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Nov 23 13:13:42 2018 +0000
ISIS-2043: removes accidentally committed test class
---
.../src/main/asciidoc/guides/rgant/_rgant-Property_domainEvent.adoc | 3 ++-
.../domainapp/modules/simple/subscribers/SimpleObjectListener.java | 4 ----
2 files changed, 2 insertions(+), 5 deletions(-)
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 85e528c..b94f991 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
@@ -79,7 +79,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 public void on(ToDoItem.DueByChangedEvent ev) {
+ @com.google.common.eventbus.Subscribe // if using guava
+ public void on(ToDoItem.DueByChangedEvent ev) {
...
}
}
diff --git a/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/subscribers/SimpleObjectListener.java b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/subscribers/SimpleObjectListener.java
deleted file mode 100644
index c377c55..0000000
--- a/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/subscribers/SimpleObjectListener.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package domainapp.modules.simple.subscribers;
-
-public class SimpleObjectListener {
-}
[isis] 02/02: Merge branch 'master' into v2
Posted by da...@apache.org.
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>