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 2017/10/01 13:17:10 UTC

[isis] 03/10: ISIS-1742: removes N-arg constructors from ActionDomainEvent

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 759615085062be7ecfb7d1dc09288feabb52839c
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Sep 30 11:24:07 2017 +0200

    ISIS-1742: removes N-arg constructors from ActionDomainEvent
---
 .../services/eventbus/ActionDomainEvent.java       | 47 +---------------------
 ...nEventHelperTest_newActionInteractionEvent.java |  6 ---
 .../action/ActionAnnotationFacetFactoryTest.java   | 15 +------
 3 files changed, 2 insertions(+), 66 deletions(-)

diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ActionDomainEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ActionDomainEvent.java
index e127603..1e2f117 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ActionDomainEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ActionDomainEvent.java
@@ -18,10 +18,8 @@
  */
 package org.apache.isis.applib.services.eventbus;
 
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
-import org.apache.isis.applib.Identifier;
+
 import org.apache.isis.applib.annotation.ActionSemantics;
 import org.apache.isis.applib.annotation.SemanticsOf;
 import org.apache.isis.applib.services.command.Command;
@@ -67,8 +65,6 @@ public abstract class ActionDomainEvent<S> extends AbstractDomainEvent<S> {
     //endregion
 
 
-    //region > constructors
-
     /**
      * If used then the framework will set state via (non-API) setters.
      *
@@ -79,47 +75,6 @@ public abstract class ActionDomainEvent<S> extends AbstractDomainEvent<S> {
     public ActionDomainEvent() {
     }
 
-    /**
-     * @deprecated - the {@link #ActionDomainEvent() no-arg constructor} is recommended instead, to reduce boilerplate.
-     */
-    @Deprecated
-    public ActionDomainEvent(
-            final S source,
-            final Identifier identifier) {
-        super(source, identifier);
-    }
-
-    /**
-     * @deprecated - the {@link #ActionDomainEvent() no-arg constructor} is recommended instead, to reduce boilerplate.
-     */
-    @Deprecated
-    public ActionDomainEvent(
-            final S source,
-            final Identifier identifier,
-            final Object... arguments) {
-        this(source, identifier,
-                asList(arguments));
-    }
-
-    private static List<Object> asList(final Object[] arguments) {
-        return arguments != null
-                ? Arrays.asList(arguments)
-                : Collections.emptyList();
-    }
-
-    /**
-     * @deprecated - the {@link #ActionDomainEvent() no-arg constructor} is recommended instead, to reduce boilerplate.
-     */
-    @Deprecated
-    public ActionDomainEvent(
-            final S source,
-            final Identifier identifier,
-            final List<Object> arguments) {
-        this(source, identifier);
-        this.arguments = Collections.unmodifiableList(arguments);
-    }
-    //endregion
-
     //region > command
     private Command command;
 
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 959a554..7831447 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
@@ -34,12 +34,6 @@ public class DomainEventHelperTest_newActionInteractionEvent {
     
     public static class SomeDomainObjectFooInvokedDomainEvent extends ActionDomainEvent<SomeDomainObject> {
         private static final long serialVersionUID = 1L;
-        public SomeDomainObjectFooInvokedDomainEvent(
-                final SomeDomainObject source,
-                final Identifier identifier,
-                final Object... arguments) {
-            super(source, identifier, arguments);
-        }
     }
     
     @Test
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 4233f26..2479b0c 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
@@ -175,14 +175,7 @@ public class ActionAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4
 
             class Customer {
 
-                class SomeActionInvokedDomainEvent extends ActionDomainEvent<Customer> {
-                    public SomeActionInvokedDomainEvent(
-                            final Customer source,
-                            final Identifier identifier,
-                            final Object... arguments) {
-                        super(source, identifier, arguments);
-                    }
-                }
+                class SomeActionInvokedDomainEvent extends ActionDomainEvent<Customer> { }
 
                 @Action(domainEvent = SomeActionInvokedDomainEvent.class)
                 public void someAction() {
@@ -266,12 +259,6 @@ public class ActionAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4
             class Customer {
 
                 class SomeActionInvokedDomainEvent extends ActionDomainEvent<Customer> {
-                    public SomeActionInvokedDomainEvent(
-                            final Customer source,
-                            final Identifier identifier,
-                            final Object... arguments) {
-                        super(source, identifier, arguments);
-                    }
                 }
 
                 @Action(domainEvent= SomeActionInvokedDomainEvent.class)

-- 
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.