Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.0.x'

Browse Source
This commit is contained in:
Sam Brannen
2023-06-24 14:15:05 +02:00
parent 35667e81ea f86a69ebfb
commit 19686adc01
15 changed files with 37 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
integration-tests/src/test/java/org/springframework/expression/spel/support/Spr7538Tests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2023 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.
@@ -21,11 +21,15 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.assertj.core.api.InstanceOfAssertFactories;
import org.junit.jupiter.api.Test;
import org.springframework.core.MethodParameter;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.expression.MethodExecutor;
import org.springframework.expression.TypedValue;
import static org.assertj.core.api.Assertions.assertThat;
class Spr7538Tests {
@@ -49,8 +53,9 @@ class Spr7538Tests {
ReflectiveMethodResolver resolver = new ReflectiveMethodResolver();
MethodExecutor executor = resolver.resolve(context, target, "checkCompleteness", argumentTypes);
Object result = executor.execute(context, target, arguments);
System.out.println("Result: " + result);
TypedValue typedValue = executor.execute(context, target, arguments);
assertThat(typedValue.getValue()).asInstanceOf(InstanceOfAssertFactories.BOOLEAN).isTrue();
assertThat(typedValue.getTypeDescriptor().getType()).isEqualTo(Boolean.class);
}
static class AlwaysTrueReleaseStrategy {

6
spring-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2013 the original author or authors.
* Copyright 2002-2023 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.
@@ -82,6 +82,8 @@ public class IntroductionBenchmarkTests {
}
sw.stop();
System.out.println(sw.prettyPrint());
// TODO Add reasonable assertions.
// System.out.println(sw.prettyPrint());
}
}

3
spring-context/src/test/java/example/scannable/FooServiceImpl.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 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.
@@ -93,7 +93,6 @@ public abstract class FooServiceImpl implements FooService {
@Override
@SuppressWarnings("deprecation")
public Future<String> asyncFoo(int id) {
System.out.println(Thread.currentThread().getName());
Assert.state(ServiceInvocationCounter.getThreadLocalCount() != null, "Thread-local counter not exposed");
return new org.springframework.scheduling.annotation.AsyncResult<>(fooDao().findFoo(id));
}

15
spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java
View File

@@ -102,18 +102,3 @@ class BeforeAdviceBindingTests {
}
}
class AuthenticationLogger {
public void logAuthenticationAttempt(String username) {
System.out.println("User [" + username + "] attempting to authenticate");
}
}
class SecurityManager {
public boolean authenticate(String username, String password) {
return false;
}
}

3
spring-context/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 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.
@@ -187,7 +187,6 @@ class CommonsPool2TargetSourceTests {
// release all objects
for (int i = 0; i < pooledInstances.length; i++) {
System.out.println(i);
targetSource.releaseTarget(pooledInstances[i]);
}
}

6
spring-context/src/test/java/org/springframework/context/support/Assembler.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2023 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.
@@ -23,7 +23,10 @@ public class Assembler implements TestIF {
@SuppressWarnings("unused")
private Service service;
private Logic l;
@SuppressWarnings("unused")
private String name;
public void setService(Service service) {
@@ -42,7 +45,6 @@ public class Assembler implements TestIF {
}
public void output() {
System.out.println("Bean " + name);
l.output();
}

5
spring-context/src/test/java/org/springframework/context/support/Logic.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2013 the original author or authors.
* Copyright 2002-2023 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.
@@ -20,6 +20,7 @@ import org.springframework.beans.factory.BeanNameAware;
public class Logic implements BeanNameAware {
@SuppressWarnings("unused")
private String name;
@SuppressWarnings("unused")
@@ -35,7 +36,7 @@ public class Logic implements BeanNameAware {
}
public void output() {
System.out.println("Bean " + name);
// System.out.println("Bean " + name);
}
}

8
spring-context/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 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.
@@ -31,6 +31,7 @@ import javax.management.remote.JMXConnectorServer;
import javax.management.remote.JMXConnectorServerFactory;
import javax.management.remote.JMXServiceURL;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.Test;
import org.springframework.aop.framework.ProxyFactory;
@@ -198,9 +199,8 @@ class MBeanClientInterceptorTests extends AbstractMBeanServerTests {
connector.start();
}
catch (BindException ex) {
System.out.println("Skipping remainder of JMX LazyConnectionToRemote test because binding to local port ["
+ port + "] failed: " + ex.getMessage());
return;
Assumptions.abort("Skipping remainder of JMX LazyConnectionToRemote test because binding to local port [" +
port + "] failed: " + ex.getMessage());
}
// should now be able to access data via the lazy proxy

7
spring-context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 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.
@@ -27,6 +27,7 @@ import javax.management.remote.JMXConnectorServerFactory;
import javax.management.remote.JMXServiceURL;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assumptions;
import org.springframework.core.testfixture.net.TestSocketUtils;
@@ -56,9 +57,9 @@ class RemoteMBeanClientInterceptorTests extends MBeanClientInterceptorTests {
this.connectorServer.start();
}
catch (BindException ex) {
System.out.println("Skipping remote JMX tests because binding to local port ["
+ this.servicePort + "] failed: " + ex.getMessage());
runTests = false;
Assumptions.abort("Skipping remote JMX tests because binding to local port [" +
this.servicePort + "] failed: " + ex.getMessage());
}
}

8
spring-context/src/test/resources/org/springframework/aop/aspectj/BeforeAdviceBindingTests.xml
View File

@@ -16,18 +16,10 @@
</aop:aspect>
<!-- variation with external pointcut reference -->
<aop:aspect ref="authenticationLogger">
<aop:pointcut id="authenticationMethodWithString"
expression="execution(boolean *..SecurityManager.authenticate(..)) and args(username,java.lang.String)"/>
<aop:before pointcut-ref="authenticationMethodWithString"
method="logAuthenticationAttempt(java.lang.String)"/>
</aop:aspect>
</aop:config>
<bean id="testAspect" class="org.springframework.aop.aspectj.AdviceBindingTestAspect"/>
<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
<bean id="authenticationLogger" class="org.springframework.aop.aspectj.AuthenticationLogger"/>
</beans>

2
spring-core/src/main/java/org/springframework/core/KotlinReflectionParameterNameDiscoverer.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 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.

4
spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2023 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.
@@ -37,7 +37,7 @@ public class StubMessageListenerAdapter extends MessageListenerAdapter {
@Override
protected void handleListenerException(Throwable ex) {
System.out.println(ex);
// System.out.println(ex);
}
}

4
spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessorTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2023 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.
@@ -131,7 +131,7 @@ public class PersistenceExceptionTranslationPostProcessorTests {
@Before("execution(void *.additionalMethod(*))")
public void log(JoinPoint jp) {
System.out.println("Before " + jp.getSignature().getName());
// System.out.println("Before " + jp.getSignature().getName());
}
}

4
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTagTests.java
View File

@@ -130,8 +130,8 @@ public abstract class AbstractHtmlElementTagTests extends AbstractTagTests {
}
protected final void assertAttributeNotPresent(String output, String attributeName) {
boolean condition = !output.contains(attributeName + "=\"");
assertThat(condition).as("Unexpected attribute '" + attributeName + "' in output '" + output + "'.").isTrue();
assertThat(output).as("Unexpected attribute '" + attributeName + "' in output '" + output + "'.")
.doesNotContain(attributeName + "=\"");
}
protected final void assertBlockTagContains(String output, String desiredContents) {

3
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2023 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.
@@ -103,7 +103,6 @@ public class TextareaTagTests extends AbstractFormTagTests {
assertThat(this.tag.doStartTag()).isEqualTo(Tag.SKIP_BODY);
String output = getOutput();
System.out.println(output);
assertContainsAttribute(output, "name", "name");
assertBlockTagContains(output, HTML_ESCAPED_NAME);
}