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

Merge branch '5.3.x'

This commit is contained in:
Sam Brannen 2022-07-03 18:05:36 +02:00
parent 94e3738a94 d1d6eb095e
commit ce5076ffe8
7 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-context/src/test/java/org/springframework/context/support/GenericApplicationContextTests.java
View File

@ -262,9 +262,13 @@ class GenericApplicationContextTests {
resource = context.getResource(fileLocation); resource = context.getResource(fileLocation);
assertThat(resource).isInstanceOf(FileUrlResource.class); assertThat(resource).isInstanceOf(FileUrlResource.class);
if (OS.WINDOWS.isCurrentOs()) { // If we are using a FileSystemResourceLoader on Windows, we expect an error
// On Windows we expect an error similar to the following. // similar to the following since "ping:foo" is not a valid file name in the
// java.nio.file.InvalidPathException: Illegal char <:> at index 4: ping:foo // Windows file system and since the PingPongProtocolResolver has not yet been
// registered.
//
// java.nio.file.InvalidPathException: Illegal char <:> at index 4: ping:foo
if (resourceLoader instanceof FileSystemResourceLoader && OS.WINDOWS.isCurrentOs()) {
assertThatExceptionOfType(InvalidPathException.class) assertThatExceptionOfType(InvalidPathException.class)
.isThrownBy(() -> context.getResource(pingLocation)) .isThrownBy(() -> context.getResource(pingLocation))
.withMessageContaining(pingLocation); .withMessageContaining(pingLocation);

4
spring-core/src/main/java/org/springframework/cglib/beans/BulkBean.java
View File

@ -15,11 +15,7 @@
*/ */
package org.springframework.cglib.beans; package org.springframework.cglib.beans;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.security.ProtectionDomain; import java.security.ProtectionDomain;
import java.util.*;
import org.springframework.cglib.core.*; import org.springframework.cglib.core.*;
import org.springframework.asm.ClassVisitor; import org.springframework.asm.ClassVisitor;

2
spring-core/src/main/java/org/springframework/cglib/beans/BulkBeanEmitter.java
View File

@ -15,10 +15,8 @@
*/ */
package org.springframework.cglib.beans; package org.springframework.cglib.beans;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import java.util.*;
import org.springframework.cglib.core.*; import org.springframework.cglib.core.*;
import org.springframework.asm.ClassVisitor; import org.springframework.asm.ClassVisitor;
import org.springframework.asm.Type; import org.springframework.asm.Type;

2
spring-core/src/main/java/org/springframework/cglib/beans/BulkBeanException.java
View File

@ -15,8 +15,6 @@
*/ */
package org.springframework.cglib.beans; package org.springframework.cglib.beans;
import org.springframework.cglib.core.CodeGenerationException;
@SuppressWarnings({"rawtypes", "unchecked", "serial"}) @SuppressWarnings({"rawtypes", "unchecked", "serial"})
public class BulkBeanException extends RuntimeException public class BulkBeanException extends RuntimeException
{ {

5
spring-core/src/main/java/org/springframework/cglib/core/ReflectUtils.java
View File

@ -35,7 +35,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import org.springframework.asm.Attribute;
import org.springframework.asm.Type; import org.springframework.asm.Type;
/** /**
@ -562,10 +561,6 @@ public class ReflectUtils {
public Type[] getExceptionTypes() { public Type[] getExceptionTypes() {
return ReflectUtils.getExceptionTypes(member); return ReflectUtils.getExceptionTypes(member);
} }
public Attribute getAttribute() {
return null;
}
}; };
} }

1
spring-core/src/main/java/org/springframework/cglib/proxy/Enhancer.java
View File

@ -1247,7 +1247,6 @@ public class Enhancer extends AbstractClassGenerator {
se.invoke_constructor(THREAD_LOCAL, CSTRUCT_NULL); se.invoke_constructor(THREAD_LOCAL, CSTRUCT_NULL);
se.putfield(THREAD_CALLBACKS_FIELD); se.putfield(THREAD_CALLBACKS_FIELD);
final Object[] state = new Object[1];
CallbackGenerator.Context context = new CallbackGenerator.Context() { CallbackGenerator.Context context = new CallbackGenerator.Context() {
public ClassLoader getClassLoader() { public ClassLoader getClassLoader() {
return Enhancer.this.getClassLoader(); return Enhancer.this.getClassLoader();

2
src/eclipse/org.eclipse.jdt.core.prefs
View File

@ -44,7 +44,7 @@ org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.forbiddenReference=info
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning