root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge 1b072a8880 into 838b4d67a5

This commit is contained in:
Yanming Zhou 2025-04-23 23:40:50 +02:00 committed by GitHub
parent 838b4d67a5 1b072a8880
commit 826c956068
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 19 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-beans/src/main/java/org/springframework/beans/factory/config/Scope.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 the original author or authors.
* Copyright 2002-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -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 <em>conversation ID</em> 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;
}
}

12
spring-beans/src/test/java/org/springframework/beans/factory/config/TestTypes.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -44,14 +44,4 @@ class NoOpScope implements Scope {
public void registerDestructionCallback(String name, Runnable callback) {
}
@Override
public Object resolveContextualObject(String key) {
return null;
}
@Override
public String getConversationId() {
return null;
}
}

7
spring-context/src/main/java/org/springframework/context/support/SimpleThreadScope.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -83,11 +83,6 @@ public class SimpleThreadScope implements Scope {
"Consider using RequestScope in a web environment.");
}
@Override
public @Nullable Object resolveContextualObject(String key) {
return null;
}
@Override
public String getConversationId() {
return Thread.currentThread().getName();

11
spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2024 the original author or authors.
* Copyright 2002-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -353,11 +353,6 @@ class ScopingTests {
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 @@ class ScopingTests {
return beans.remove(name);
}
@Override
public Object resolveContextualObject(String key) {
return null;
}
}
}

12
spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr10744Tests.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2024 the original author or authors.
* Copyright 2002-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -83,16 +83,6 @@ class Spr10744Tests {
@Override
public void registerDestructionCallback(String name, Runnable callback) {
}
@Override
public Object resolveContextualObject(String key) {
return null;
}
@Override
public String getConversationId() {
return null;
}
}

12
spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2024 the original author or authors.
* Copyright 2002-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -1090,16 +1090,6 @@ class AnnotationDrivenEventListenerTests {
@Override
public void registerDestructionCallback(String name, Runnable callback) {
}
@Override
public Object resolveContextualObject(String key) {
return null;
}
@Override
public String getConversationId() {
return null;
}
}

6
spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2024 the original author or authors.
* Copyright 2002-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -94,10 +94,6 @@ class ApplicationContextExpressionTests {
return null;
}
}
@Override
public String getConversationId() {
return null;
}
});
ac.getBeanFactory().setConversionService(new DefaultConversionService());

12
spring-context/src/test/java/org/springframework/context/groovy/GroovyBeanDefinitionReaderTests.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2024 the original author or authors.
* Copyright 2002-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -1214,21 +1214,11 @@ class TestScope implements Scope {
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 {

12
spring-context/src/testFixtures/java/org/springframework/context/testfixture/SimpleMapScope.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -68,20 +68,10 @@ public class SimpleMapScope implements Scope, Serializable {
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;
}
}

7
spring-messaging/src/main/java/org/springframework/messaging/simp/SimpSessionScope.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -70,11 +70,6 @@ public class SimpSessionScope implements Scope {
SimpAttributesContextHolder.currentAttributes().registerDestructionCallback(name, callback);
}
@Override
public @Nullable Object resolveContextualObject(String key) {
return null;
}
@Override
public String getConversationId() {
return SimpAttributesContextHolder.currentAttributes().getSessionId();

7
spring-tx/src/main/java/org/springframework/transaction/support/SimpleTransactionScope.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -81,11 +81,6 @@ public class SimpleTransactionScope implements Scope {
}
}
@Override
public @Nullable Object resolveContextualObject(String key) {
return null;
}
@Override
public @Nullable String getConversationId() {
return TransactionSynchronizationManager.getCurrentTransactionName();

13
spring-web/src/main/java/org/springframework/web/context/request/RequestScope.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 the original author or authors.
* Copyright 2002-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -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 @@ public class RequestScope extends AbstractRequestAttributesScope {
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;
}
}

13
spring-web/src/main/java/org/springframework/web/context/support/ServletContextScope.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -96,17 +96,6 @@ public class ServletContextScope implements Scope, DisposableBean {
}
}
@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.