[causeway] branch master updated: CAUSEWAY-3348: rename annotation ParameterAsTuple->ParameterTuple

[ah...@apache.org]

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

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/causeway.git


The following commit(s) were added to refs/heads/master by this push:
     new eec508357d CAUSEWAY-3348: rename annotation ParameterAsTuple->ParameterTuple
eec508357d is described below

commit eec508357db945ce6f80b2b34511a5827372c556
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Feb 6 07:51:15 2023 +0100

    CAUSEWAY-3348: rename annotation ParameterAsTuple->ParameterTuple
---
 .../annotation/{ParameterAsTuple.java => ParameterTuple.java}       | 4 ++--
 .../causeway/core/config/progmodel/ProgrammingModelConstants.java   | 4 ++--
 .../core/metamodel/specloader/specimpl/_MethodFacadeAutodetect.java | 6 +++---
 .../testdomain/model/interaction/InteractionNpmDemo_patEnabled.java | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/ParameterAsTuple.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/ParameterTuple.java
similarity index 94%
rename from api/applib/src/main/java/org/apache/causeway/applib/annotation/ParameterAsTuple.java
rename to api/applib/src/main/java/org/apache/causeway/applib/annotation/ParameterTuple.java
index e0d1b79416..94e8aed4a2 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/ParameterAsTuple.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/ParameterTuple.java
@@ -36,7 +36,7 @@ import java.lang.annotation.Target;
  * &#64;MemberSupport public Result act(&#64;ParameterTuple Params p) { ... }
  * </pre>
  *
- * @apiNote Java record support will not come before version 3.0
+ * @apiNote Java <b>record</b> support is planned for version 3.0
  *
  * @since 2.0 {@index}
  */
@@ -46,5 +46,5 @@ import java.lang.annotation.Target;
         ElementType.ANNOTATION_TYPE
 })
 @Retention(RetentionPolicy.RUNTIME)
-public @interface ParameterAsTuple {
+public @interface ParameterTuple {
 }
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/progmodel/ProgrammingModelConstants.java b/core/config/src/main/java/org/apache/causeway/core/config/progmodel/ProgrammingModelConstants.java
index 73a28df2cc..11d8907dfd 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/progmodel/ProgrammingModelConstants.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/progmodel/ProgrammingModelConstants.java
@@ -528,9 +528,9 @@ public final class ProgrammingModelConstants {
         ACTION_METHOD_OVERLOADING_NOT_ALLOWED("Action method overloading is not allowed, "
                 + "yet ${type} has action(s) that have a the same member name: ${overloadedNames}"),
         PARAMETER_TUPLE_INVALID_USE_OF_ANNOTATION("${type}#${member}: "
-                + "Can use @ParameterAsTuple only on parameter of a single arg action."),
+                + "Can use @ParameterTuple only on parameter of a single arg action."),
         PARAMETER_TUPLE_TYPE_WITH_AMBIGUOUS_CONSTRUCTORS("${type}#${member}: "
-                + "Tuple type ${patType} referenced by @ParameterAsTuple annotated parameter has no or more than one public constructor."),
+                + "Tuple type ${patType} referenced by @ParameterTuple annotated parameter has no or more than one public constructor."),
         ;
 
         private final String template;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/_MethodFacadeAutodetect.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/_MethodFacadeAutodetect.java
index 6f56cbcc21..175ded877a 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/_MethodFacadeAutodetect.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/_MethodFacadeAutodetect.java
@@ -22,7 +22,7 @@ import java.lang.reflect.Method;
 import java.util.Optional;
 import java.util.stream.Stream;
 
-import org.apache.causeway.applib.annotation.ParameterAsTuple;
+import org.apache.causeway.applib.annotation.ParameterTuple;
 import org.apache.causeway.commons.collections.Can;
 import org.apache.causeway.commons.internal.reflection._Annotations;
 import org.apache.causeway.commons.internal.reflection._ClassCache;
@@ -39,12 +39,12 @@ import lombok.experimental.UtilityClass;
 class _MethodFacadeAutodetect {
 
     /**
-     * Detects whether an action uses the {@link ParameterAsTuple} annotation on its single argument.
+     * Detects whether an action uses the {@link ParameterTuple} annotation on its single argument.
      * If so, we follow Parameters as Tuple (PAT) semantics.
      */
     MethodFacade autodetect(final Method method, final FacetHolder inspectedTypeSpec) {
         final long paramTupleCount = Stream.of(method.getParameters())
-            .map(parameter->_Annotations.synthesize(parameter, ParameterAsTuple.class))
+            .map(parameter->_Annotations.synthesize(parameter, ParameterTuple.class))
             .filter(Optional::isPresent)
             .count();
         if(paramTupleCount == 0) {
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/interaction/InteractionNpmDemo_patEnabled.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/interaction/InteractionNpmDemo_patEnabled.java
index 857cd1202b..86b30b622d 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/interaction/InteractionNpmDemo_patEnabled.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/interaction/InteractionNpmDemo_patEnabled.java
@@ -22,7 +22,7 @@ import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.MemberSupport;
 import org.apache.causeway.applib.annotation.Parameter;
 import org.apache.causeway.applib.annotation.ParameterLayout;
-import org.apache.causeway.applib.annotation.ParameterAsTuple;
+import org.apache.causeway.applib.annotation.ParameterTuple;
 
 import lombok.RequiredArgsConstructor;
 
@@ -51,7 +51,7 @@ public class InteractionNpmDemo_patEnabled {
         }
     }
 
-    @MemberSupport public int act(final @ParameterAsTuple Params p) {
+    @MemberSupport public int act(final @ParameterTuple Params p) {
         return p.a + p.b;
     }