From a3ddee214e4c9af0723f566a10b5c4b63e616de1 Mon Sep 17 00:00:00 2001 From: Yanming Zhou Date: Tue, 15 Apr 2025 16:51:18 +0800 Subject: [PATCH] Mark applicable Scope's methods as default Signed-off-by: Yanming Zhou --- .../springframework/beans/factory/config/Scope.java | 8 ++++++-- .../beans/factory/config/TestTypes.java | 10 ---------- .../context/support/SimpleThreadScope.java | 5 ----- .../annotation/configuration/ScopingTests.java | 9 --------- .../annotation/configuration/Spr10744Tests.java | 10 ---------- .../event/AnnotationDrivenEventListenerTests.java | 10 ---------- .../expression/ApplicationContextExpressionTests.java | 4 ---- .../groovy/GroovyBeanDefinitionReaderTests.java | 10 ---------- .../context/testfixture/SimpleMapScope.java | 10 ---------- .../messaging/simp/SimpSessionScope.java | 5 ----- .../transaction/support/SimpleTransactionScope.java | 5 ----- .../web/context/request/RequestScope.java | 11 ----------- .../web/context/support/ServletContextScope.java | 11 ----------- 13 files changed, 6 insertions(+), 102 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/Scope.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/Scope.java index aa641f2c2ac4..63fa1e2ce1e5 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/Scope.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/Scope.java @@ -130,7 +130,9 @@ public interface Scope { * @return the corresponding object, or {@code null} if none found * @throws IllegalStateException if the underlying scope is not currently active */ - @Nullable Object resolveContextualObject(String key); + default @Nullable Object resolveContextualObject(String key) { + return null; + } /** * Return the conversation ID for the current underlying scope, if any. @@ -147,6 +149,8 @@ public interface Scope { * conversation ID for the current scope * @throws IllegalStateException if the underlying scope is not currently active */ - @Nullable String getConversationId(); + default @Nullable String getConversationId() { + return null; + } } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/TestTypes.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/TestTypes.java index 944238a9e341..2bff8c89a4ea 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/TestTypes.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/TestTypes.java @@ -44,14 +44,4 @@ public Object remove(String name) { public void registerDestructionCallback(String name, Runnable callback) { } - @Override - public Object resolveContextualObject(String key) { - return null; - } - - @Override - public String getConversationId() { - return null; - } - } diff --git a/spring-context/src/main/java/org/springframework/context/support/SimpleThreadScope.java b/spring-context/src/main/java/org/springframework/context/support/SimpleThreadScope.java index eac43c1da0a1..245dcfaa25da 100644 --- a/spring-context/src/main/java/org/springframework/context/support/SimpleThreadScope.java +++ b/spring-context/src/main/java/org/springframework/context/support/SimpleThreadScope.java @@ -83,11 +83,6 @@ public void registerDestructionCallback(String name, Runnable callback) { "Consider using RequestScope in a web environment."); } - @Override - public @Nullable Object resolveContextualObject(String key) { - return null; - } - @Override public String getConversationId() { return Thread.currentThread().getName(); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java index 7f08bf2df2da..3084e7b1eb1e 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java @@ -353,11 +353,6 @@ public Object get(String name, ObjectFactory objectFactory) { return beans.get(name); } - @Override - public String getConversationId() { - return null; - } - @Override public void registerDestructionCallback(String name, Runnable callback) { throw new IllegalStateException("Not supposed to be called"); @@ -368,10 +363,6 @@ public Object remove(String name) { return beans.remove(name); } - @Override - public Object resolveContextualObject(String key) { - return null; - } } } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr10744Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr10744Tests.java index 7590bfe08099..2f791699cd2b 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr10744Tests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr10744Tests.java @@ -83,16 +83,6 @@ public Object remove(String name) { @Override public void registerDestructionCallback(String name, Runnable callback) { } - - @Override - public Object resolveContextualObject(String key) { - return null; - } - - @Override - public String getConversationId() { - return null; - } } diff --git a/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java b/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java index 08322749c59a..44e6c7a8c4a0 100644 --- a/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java +++ b/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java @@ -1090,16 +1090,6 @@ public Object remove(String name) { @Override public void registerDestructionCallback(String name, Runnable callback) { } - - @Override - public Object resolveContextualObject(String key) { - return null; - } - - @Override - public String getConversationId() { - return null; - } } diff --git a/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java b/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java index 0b87f3f2118c..96c6933aa112 100644 --- a/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java +++ b/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java @@ -94,10 +94,6 @@ public Object resolveContextualObject(String key) { return null; } } - @Override - public String getConversationId() { - return null; - } }); ac.getBeanFactory().setConversionService(new DefaultConversionService()); diff --git a/spring-context/src/test/java/org/springframework/context/groovy/GroovyBeanDefinitionReaderTests.java b/spring-context/src/test/java/org/springframework/context/groovy/GroovyBeanDefinitionReaderTests.java index b9b44ac032b8..b39df33f99da 100644 --- a/spring-context/src/test/java/org/springframework/context/groovy/GroovyBeanDefinitionReaderTests.java +++ b/spring-context/src/test/java/org/springframework/context/groovy/GroovyBeanDefinitionReaderTests.java @@ -1214,21 +1214,11 @@ public Object remove(String name) { public void registerDestructionCallback(String name, Runnable callback) { } - @Override - public String getConversationId() { - return null; - } - @Override public Object get(String name, ObjectFactory objectFactory) { instanceCount++; return objectFactory.getObject(); } - - @Override - public Object resolveContextualObject(String s) { - return null; - } } class BirthdayCardSender { diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/SimpleMapScope.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/SimpleMapScope.java index ceaac176616b..065535b58bb2 100644 --- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/SimpleMapScope.java +++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/SimpleMapScope.java @@ -68,20 +68,10 @@ public void registerDestructionCallback(String name, Runnable callback) { this.callbacks.add(callback); } - @Override - public Object resolveContextualObject(String key) { - return null; - } - public void close() { for (Runnable runnable : this.callbacks) { runnable.run(); } } - @Override - public String getConversationId() { - return null; - } - } diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpSessionScope.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpSessionScope.java index a6e9163987c3..925543d73ac5 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpSessionScope.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpSessionScope.java @@ -70,11 +70,6 @@ public void registerDestructionCallback(String name, Runnable callback) { SimpAttributesContextHolder.currentAttributes().registerDestructionCallback(name, callback); } - @Override - public @Nullable Object resolveContextualObject(String key) { - return null; - } - @Override public String getConversationId() { return SimpAttributesContextHolder.currentAttributes().getSessionId(); diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/SimpleTransactionScope.java b/spring-tx/src/main/java/org/springframework/transaction/support/SimpleTransactionScope.java index 49c0d2b8a84f..4119c84e779d 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/support/SimpleTransactionScope.java +++ b/spring-tx/src/main/java/org/springframework/transaction/support/SimpleTransactionScope.java @@ -81,11 +81,6 @@ public void registerDestructionCallback(String name, Runnable callback) { } } - @Override - public @Nullable Object resolveContextualObject(String key) { - return null; - } - @Override public @Nullable String getConversationId() { return TransactionSynchronizationManager.getCurrentTransactionName(); diff --git a/spring-web/src/main/java/org/springframework/web/context/request/RequestScope.java b/spring-web/src/main/java/org/springframework/web/context/request/RequestScope.java index 3ee24707d302..3a7db8991457 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/RequestScope.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/RequestScope.java @@ -16,8 +16,6 @@ package org.springframework.web.context.request; -import org.jspecify.annotations.Nullable; - /** * Request-backed {@link org.springframework.beans.factory.config.Scope} * implementation. @@ -44,13 +42,4 @@ protected int getScope() { return RequestAttributes.SCOPE_REQUEST; } - /** - * There is no conversation id concept for a request, so this method - * returns {@code null}. - */ - @Override - public @Nullable String getConversationId() { - return null; - } - } diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextScope.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextScope.java index f5637bf44416..a4b744ef2364 100644 --- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextScope.java +++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextScope.java @@ -96,17 +96,6 @@ public void registerDestructionCallback(String name, Runnable callback) { } } - @Override - public @Nullable Object resolveContextualObject(String key) { - return null; - } - - @Override - public @Nullable String getConversationId() { - return null; - } - - /** * Invoke all registered destruction callbacks. * To be called on ServletContext shutdown.