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

DATACMNS-1630 - Removed custom copy of ShadowingClassLoader in favor of Spring's one.

Browse Source
This commit is contained in:
Oliver Drotbohm
2019-12-09 17:37:08 +01:00
parent eff3850806
commit 9b63646e82
3 changed files with 12 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/test/java/org/springframework/data/classloadersupport/HidingClassLoader.java
View File

@@ -20,6 +20,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.stream.Collectors;
import org.springframework.instrument.classloading.ShadowingClassLoader;
import org.springframework.util.Assert;
/**
@@ -40,7 +41,7 @@ public class HidingClassLoader extends ShadowingClassLoader {
HidingClassLoader(Collection<String> hidden) {
super(URLClassLoader.getSystemClassLoader());
super(URLClassLoader.getSystemClassLoader(), false);
this.hidden = hidden;
}
@@ -71,6 +72,15 @@ public class HidingClassLoader extends ShadowingClassLoader {
return super.loadClass(name);
}
/*
* (non-Javadoc)
* @see org.springframework.data.classloadersupport.ShadowingClassLoader#isEligibleForShadowing(java.lang.String)
*/
@Override
protected boolean isEligibleForShadowing(String className) {
return isExcluded(className);
}
/*
* (non-Javadoc)
* @see java.lang.ClassLoader#findClass(java.lang.String)

176
src/test/java/org/springframework/data/classloadersupport/ShadowingClassLoader.java
View File

@@ -1,176 +0,0 @@
/*
* Copyright 2002-2019 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.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.classloadersupport;
import java.io.IOException;
import java.io.InputStream;
import java.lang.instrument.ClassFileTransformer;
import java.lang.instrument.IllegalClassFormatException;
import java.net.URL;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import org.springframework.core.DecoratingClassLoader;
import org.springframework.util.Assert;
import org.springframework.util.FileCopyUtils;
import org.springframework.util.StringUtils;
/**
* Copy of Spring Frameworks {@link org.springframework.instrument.classloading.ShadowingClassLoader} tweaked to not
* register default exclusions. ClassLoader decorator that shadows an enclosing ClassLoader, applying registered
* transformers to all affected classes.
*
* @author Rob Harrop
* @author Juergen Hoeller
* @author Costin Leau
* @author Jens Schauder
* @author Oliver Gierke
* @since 2.0
* @see #addTransformer
* @see org.springframework.core.OverridingClassLoader
* @see https://jira.spring.io/browse/SPR-15439
*/
public class ShadowingClassLoader extends DecoratingClassLoader {
private final ClassLoader enclosingClassLoader;
private final List<ClassFileTransformer> classFileTransformers = new LinkedList<ClassFileTransformer>();
private final Map<String, Class<?>> classCache = new HashMap<String, Class<?>>();
/**
* Create a new ShadowingClassLoader, decorating the given ClassLoader.
*
* @param enclosingClassLoader the ClassLoader to decorate
*/
public ShadowingClassLoader(ClassLoader enclosingClassLoader) {
Assert.notNull(enclosingClassLoader, "Enclosing ClassLoader must not be null");
this.enclosingClassLoader = enclosingClassLoader;
}
/**
* Add the given ClassFileTransformer to the list of transformers that this ClassLoader will apply.
*
* @param transformer the ClassFileTransformer
*/
public void addTransformer(ClassFileTransformer transformer) {
Assert.notNull(transformer, "Transformer must not be null");
this.classFileTransformers.add(transformer);
}
/**
* Copy all ClassFileTransformers from the given ClassLoader to the list of transformers that this ClassLoader will
* apply.
*
* @param other the ClassLoader to copy from
*/
public void copyTransformers(ShadowingClassLoader other) {
Assert.notNull(other, "Other ClassLoader must not be null");
this.classFileTransformers.addAll(other.classFileTransformers);
}
@Override
public Class<?> loadClass(String name) throws ClassNotFoundException {
if (shouldShadow(name)) {
Class<?> cls = this.classCache.get(name);
if (cls != null) {
return cls;
}
return doLoadClass(name);
} else {
return this.enclosingClassLoader.loadClass(name);
}
}
/**
* Determine whether the given class should be excluded from shadowing.
*
* @param className the name of the class
* @return whether the specified class should be shadowed
*/
private boolean shouldShadow(String className) {
return (!className.equals(getClass().getName()) && !className.endsWith("ShadowingClassLoader")
&& isEligibleForShadowing(className));
}
/**
* Determine whether the specified class is eligible for shadowing by this class loader.
*
* @param className the class name to check
* @return whether the specified class is eligible
* @see #isExcluded
*/
protected boolean isEligibleForShadowing(String className) {
return isExcluded(className);
}
private Class<?> doLoadClass(String name) throws ClassNotFoundException {
String internalName = StringUtils.replace(name, ".", "/") + ".class";
InputStream is = this.enclosingClassLoader.getResourceAsStream(internalName);
if (is == null) {
throw new ClassNotFoundException(name);
}
try {
byte[] bytes = FileCopyUtils.copyToByteArray(is);
bytes = applyTransformers(name, bytes);
Class<?> cls = defineClass(name, bytes, 0, bytes.length);
// Additional check for defining the package, if not defined yet.
if (cls.getPackage() == null) {
int packageSeparator = name.lastIndexOf('.');
if (packageSeparator != -1) {
String packageName = name.substring(0, packageSeparator);
definePackage(packageName, null, null, null, null, null, null, null);
}
}
this.classCache.put(name, cls);
return cls;
} catch (IOException ex) {
throw new ClassNotFoundException("Cannot load resource for class [" + name + "]", ex);
}
}
private byte[] applyTransformers(String name, byte[] bytes) {
String internalName = StringUtils.replace(name, ".", "/");
try {
for (ClassFileTransformer transformer : this.classFileTransformers) {
byte[] transformed = transformer.transform(this, internalName, null, null, bytes);
bytes = (transformed != null ? transformed : bytes);
}
return bytes;
} catch (IllegalClassFormatException ex) {
throw new IllegalStateException(ex);
}
}
@Override
public URL getResource(String name) {
return this.enclosingClassLoader.getResource(name);
}
@Override
public InputStream getResourceAsStream(String name) {
return this.enclosingClassLoader.getResourceAsStream(name);
}
@Override
public Enumeration<URL> getResources(String name) throws IOException {
return this.enclosingClassLoader.getResources(name);
}
}

2
src/test/java/org/springframework/data/web/config/SpringDataWebConfigurationIntegrationTests.java
View File

@@ -28,10 +28,10 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.classloadersupport.HidingClassLoader;
import org.springframework.data.classloadersupport.ShadowingClassLoader;
import org.springframework.data.web.ProjectingJackson2HttpMessageConverter;
import org.springframework.data.web.XmlBeamHttpMessageConverter;
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.instrument.classloading.ShadowingClassLoader;
import org.springframework.test.util.ReflectionTestUtils;
import org.springframework.util.ReflectionUtils;
import org.xmlbeam.XBProjector;