mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Avoid Illegal reflective access warnings with devtools
This commit improves RestartClassLoader to use a method introduced in SmartClassLoader to avoid triggering a warning on Java 11 and later. See https://github.com/spring-projects/spring-framework/issues/26403 Closes gh-24857
This commit is contained in:
parent
698672e1cb
commit
75fc896321
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2020 the original author or authors.
|
* Copyright 2012-2021 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -22,6 +22,7 @@ import java.net.URL;
|
|||||||
import java.net.URLClassLoader;
|
import java.net.URLClassLoader;
|
||||||
import java.security.AccessController;
|
import java.security.AccessController;
|
||||||
import java.security.PrivilegedAction;
|
import java.security.PrivilegedAction;
|
||||||
|
import java.security.ProtectionDomain;
|
||||||
import java.util.Enumeration;
|
import java.util.Enumeration;
|
||||||
|
|
||||||
import org.apache.commons.logging.Log;
|
import org.apache.commons.logging.Log;
|
||||||
@ -167,6 +168,11 @@ public class RestartClassLoader extends URLClassLoader implements SmartClassLoad
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Class<?> publicDefineClass(String name, byte[] b, ProtectionDomain protectionDomain) {
|
||||||
|
return defineClass(name, b, 0, b.length, protectionDomain);
|
||||||
|
}
|
||||||
|
|
||||||
private URL createFileUrl(String name, ClassLoaderFile file) {
|
private URL createFileUrl(String name, ClassLoaderFile file) {
|
||||||
try {
|
try {
|
||||||
return new URL("reloaded", null, -1, "/" + name, new ClassLoaderFileURLStreamHandler(file));
|
return new URL("reloaded", null, -1, "/" + name, new ClassLoaderFileURLStreamHandler(file));
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2020 the original author or authors.
|
* Copyright 2012-2021 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -25,6 +25,7 @@ import java.net.URLClassLoader;
|
|||||||
import java.nio.charset.StandardCharsets;
|
import java.nio.charset.StandardCharsets;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.Enumeration;
|
import java.util.Enumeration;
|
||||||
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.jar.JarOutputStream;
|
import java.util.jar.JarOutputStream;
|
||||||
import java.util.zip.ZipEntry;
|
import java.util.zip.ZipEntry;
|
||||||
@ -34,6 +35,7 @@ import org.junit.jupiter.api.BeforeEach;
|
|||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
import org.junit.jupiter.api.io.TempDir;
|
import org.junit.jupiter.api.io.TempDir;
|
||||||
|
|
||||||
|
import org.springframework.aop.framework.ProxyFactory;
|
||||||
import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile.Kind;
|
import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile.Kind;
|
||||||
import org.springframework.util.FileCopyUtils;
|
import org.springframework.util.FileCopyUtils;
|
||||||
import org.springframework.util.StreamUtils;
|
import org.springframework.util.StreamUtils;
|
||||||
@ -200,6 +202,14 @@ class RestartClassLoaderTests {
|
|||||||
assertThat(loaded.getClassLoader()).isEqualTo(this.reloadClassLoader);
|
assertThat(loaded.getClassLoader()).isEqualTo(this.reloadClassLoader);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void proxyOnClassFromSystemClassLoaderDoesNotYieldWarning() {
|
||||||
|
ProxyFactory pf = new ProxyFactory(new HashMap<>());
|
||||||
|
pf.setProxyTargetClass(true);
|
||||||
|
pf.getProxy(this.reloadClassLoader);
|
||||||
|
// Warning would happen outside the boundary of the test
|
||||||
|
}
|
||||||
|
|
||||||
private String readString(InputStream in) throws IOException {
|
private String readString(InputStream in) throws IOException {
|
||||||
return new String(FileCopyUtils.copyToByteArray(in));
|
return new String(FileCopyUtils.copyToByteArray(in));
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user