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/03/15 14:52:43 UTC

[causeway] branch master updated: CAUSEWAY-3380: remove deprecated Value#logicalTypeName

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 3c87ade0c5 CAUSEWAY-3380: remove deprecated Value#logicalTypeName
3c87ade0c5 is described below

commit 3c87ade0c5e9d794f0cb604e0c09b5e99fd0fd00
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Mar 15 15:52:37 2023 +0100

    CAUSEWAY-3380: remove deprecated Value#logicalTypeName
---
 .../applib/pages/index/annotation/Value.adoc       | 30 ----------------------
 .../apache/causeway/applib/annotation/Value.java   | 16 ------------
 .../org/apache/causeway/applib/id/LogicalType.java | 13 ----------
 3 files changed, 59 deletions(-)

diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotation/Value.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/Value.adoc
index 19e6432baa..4963e2b56c 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/annotation/Value.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/Value.adoc
@@ -9,36 +9,6 @@ Indicates that the class has value semantics.
 .Value.java
 ----
 @interface Value {
-  @Deprecated(forRemoval = true, since = "2.0.0-M8")
-String logicalTypeName() default "";     // <.>
 }
 ----
 
-<.> xref:#logicalTypeName[logicalTypeName]
-+
---
-[WARNING]
-====
-[red]#_deprecated:_#
-
-use _Named_ instead
-====
-
-The logical name of this value's type, that uniquely and fully qualifies it. The logical name is analogous to - but independent of - the actual fully qualified class name. eg. _sales.Customer_ for a class 'org.mycompany.dom.Customer'
---
-
-== Members
-
-[#logicalTypeName]
-=== logicalTypeName
-
-[WARNING]
-====
-[red]#_deprecated:_#
-
-use _Named_ instead
-====
-
-The logical name of this value's type, that uniquely and fully qualifies it. The logical name is analogous to - but independent of - the actual fully qualified class name. eg. _sales.Customer_ for a class 'org.mycompany.dom.Customer'
-
-If not specified, the fully qualified class name is used instead.
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Value.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Value.java
index 9063cfa6b8..8f615e6123 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Value.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Value.java
@@ -25,8 +25,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.inject.Named;
-
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
@@ -41,18 +39,4 @@ import org.springframework.stereotype.Component;
 @Component @Scope("prototype")
 public @interface Value {
 
-    /**
-     * The logical name of this value's type, that uniquely and fully qualifies it.
-     * The logical name is analogous to - but independent of - the actual fully qualified class name.
-     * eg. {@code sales.Customer} for a class 'org.mycompany.dom.Customer'
-     * <p>
-     * If not specified, the fully qualified class name is used instead.
-     * </p>
-      * @deprecated use {@link Named} instead
-     * @see Named
-     */
-    @Deprecated(forRemoval = true, since = "2.0.0-M8")
-    String logicalTypeName()
-            default "";
-
 }
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/id/LogicalType.java b/api/applib/src/main/java/org/apache/causeway/applib/id/LogicalType.java
index 43dfef4260..a52bf72596 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/id/LogicalType.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/id/LogicalType.java
@@ -32,7 +32,6 @@ import javax.persistence.Table;
 import org.springframework.lang.Nullable;
 
 import org.apache.causeway.applib.annotation.DomainObject;
-import org.apache.causeway.applib.annotation.Value;
 import org.apache.causeway.commons.internal.base._Strings;
 import org.apache.causeway.commons.internal.exceptions._Exceptions;
 import org.apache.causeway.commons.internal.reflection._Annotations;
@@ -128,18 +127,6 @@ implements
             return eager(correspondingClass, named);
         }
 
-        // deprecated naming strategies ...
-
-        {
-            val logicalTypeName = _Strings.emptyToNull(
-                    _Annotations.synthesize(correspondingClass, Value.class)
-                    .map(Value::logicalTypeName)
-                    .orElse(null));
-            if(logicalTypeName!=null) {
-                return eager(correspondingClass, logicalTypeName);
-            }
-        }
-
         // fallback to @Table annotations
         {
             val logicalTypeName =