You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2023/11/08 10:58:28 UTC

(causeway) branch master updated: CAUSEWAY-3643: [Spring] Support for convention-based annotation attribute overrides is deprecated and will be removed in Spring Framework 6.2.

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 0afd030420 CAUSEWAY-3643: [Spring] Support for convention-based annotation attribute overrides is deprecated and will be removed in Spring Framework 6.2.
0afd030420 is described below

commit 0afd030420998df1026ffbd2538ee21bc78a8869
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Nov 8 11:58:23 2023 +0100

    CAUSEWAY-3643: [Spring] Support for convention-based annotation
    attribute overrides is deprecated and will be removed in Spring
    Framework 6.2.
---
 .../main/java/org/apache/causeway/applib/annotation/Property.java    | 5 +++++
 .../src/main/java/org/apache/causeway/applib/annotation/Where.java   | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Property.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Property.java
index 29406ea4f9..bb3cabcf5b 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Property.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Property.java
@@ -24,6 +24,8 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.springframework.core.annotation.AliasFor;
+
 import org.apache.causeway.applib.events.domain.PropertyDomainEvent;
 import org.apache.causeway.applib.services.command.Command;
 import org.apache.causeway.applib.services.commanddto.conmap.ContentMappingServiceForCommandDto;
@@ -125,6 +127,7 @@ public @interface Property {
      * @see Property#editingDisabledReason()
      * @see DomainObject#editing()
      */
+    @AliasFor(annotation=DomainObject.class, attribute="editing")
     Editing editing()
             default Editing.NOT_SPECIFIED;
 
@@ -136,6 +139,7 @@ public @interface Property {
      *
      * @see Property#editing()
      */
+    @AliasFor(annotation=DomainObject.class, attribute="editingDisabledReason")
     String editingDisabledReason()
             default "";
 
@@ -150,6 +154,7 @@ public @interface Property {
      * @see DomainObject#entityChangePublishing()
      * @apiNote does only apply to persistent properties of entity objects
      */
+    @AliasFor(annotation=DomainObject.class, attribute="entityChangePublishing")
     Publishing entityChangePublishing()
             default Publishing.NOT_SPECIFIED;
 
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Where.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Where.java
index 47a4daef78..f0befd99b3 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Where.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Where.java
@@ -26,7 +26,7 @@ import org.apache.causeway.applib.util.Enums;
  * Represents the location in the user interface where a class member is to be rendered.
  *
  * <p>
- * Used to control visibility (eg using the {@link Property#hidden()} annotation) and
+ * Used to control visibility (eg using the {@link PropertyLayout#hidden()} annotation) and
  * enablement (eg using the {@link Property#editing()} annotation) in different regions
  * of the user interface.
  *