[isis] branch master updated: ISIS-3004: Mark deprecated for removal @DomainService.logicalTypeName

[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/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new fee6b5519d ISIS-3004: Mark deprecated for removal @DomainService.logicalTypeName
fee6b5519d is described below

commit fee6b5519de9be5ec73ff9ca64fde91571edce6c
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Apr 13 07:58:30 2022 +0200

    ISIS-3004: Mark deprecated for removal @DomainService.logicalTypeName
---
 .../java/org/apache/isis/applib/annotation/DomainObject.java   |  4 +++-
 .../java/org/apache/isis/applib/annotation/DomainService.java  | 10 ++++++----
 .../src/main/java/org/apache/isis/applib/annotation/Value.java |  4 +++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainObject.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainObject.java
index 4ea1376bfc..32759711e9 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainObject.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainObject.java
@@ -24,6 +24,8 @@ 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;
 
@@ -184,7 +186,7 @@ public @interface DomainObject {
      * Otherwise, if not specified, the fully qualified class name is used instead.
      * </p>
      *
-     * @see DomainService#logicalTypeName()
+     * @see Named
      */
     String logicalTypeName()
             default "";
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainService.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainService.java
index 7d90bbc702..6d2ea25e9d 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainService.java
@@ -27,7 +27,6 @@ import java.lang.annotation.Target;
 import javax.inject.Named;
 import javax.inject.Singleton;
 
-import org.springframework.core.annotation.AliasFor;
 import org.springframework.stereotype.Service;
 
 import org.apache.isis.applib.services.bookmark.Bookmark;
@@ -74,12 +73,15 @@ public @interface DomainService {
      * This value, if specified, is used in the serialized form of the object's {@link Bookmark}.
      * A {@link Bookmark} is used by the framework to uniquely identify an object over time
      * (same concept as a URN).
-     * Otherwise, if not specified, the fully qualified class name is used instead.
+     * Otherwise, if not specified, the default Spring Bean name is used instead.
      * </p>
-     *
+     * @deprecated use Spring semantics instead, eg. {@link Named} or equivalent
      * @see DomainObject#logicalTypeName()
+     * @see Named
      */
-    @AliasFor(annotation = Named.class, attribute = "value")
+    @Deprecated(forRemoval = true, since = "2.0.0-RC1")
+    // commented out: let the IsisBeanFactoryPostProcessorForSpring take care of that!
+    //@AliasFor(annotation = Named.class, attribute = "value")
     String logicalTypeName()
             default "";
 
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotation/Value.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Value.java
index c24b0d7a1c..e268d2162d 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/Value.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Value.java
@@ -25,6 +25,8 @@ 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;
 
@@ -48,7 +50,7 @@ public @interface Value {
      * </p>
      *
      * @see DomainObject#logicalTypeName()
-     * @see DomainService#logicalTypeName()
+     * @see Named
      */
     String logicalTypeName()
             default "";