DATAREDIS-427 - Polishing.

Use ShadowingClassLoader instead of a self written one.

Original Pull Request: #179

Author: christophstrobl

src/main/java/org/springframework/data/redis/serializer/JdkSerializationRedisSerializer.java

@@ -16,6 +16,8 @@
 package org.springframework.data.redis.serializer;
 
 import org.springframework.core.convert.converter.Converter;
+import org.springframework.core.serializer.DefaultDeserializer;
+import org.springframework.core.serializer.DefaultSerializer;
 import org.springframework.core.serializer.support.DeserializingConverter;
 import org.springframework.core.serializer.support.SerializingConverter;
 import org.springframework.util.Assert;
@@ -45,6 +47,7 @@ public JdkSerializationRedisSerializer() {
 	 * Creates a new {@link JdkSerializationRedisSerializer} using a {@link ClassLoader}.
 	 *
 	 * @param classLoader
+	 * @since 1.7
 	 */
 	public JdkSerializationRedisSerializer(ClassLoader classLoader) {
 		this(new SerializingConverter(), new DeserializingConverter(classLoader));
@@ -56,6 +59,7 @@ public JdkSerializationRedisSerializer(ClassLoader classLoader) {
 	 * 
 	 * @param serializer must not be {@literal null}
 	 * @param deserializer must not be {@literal null}
+	 * @since 1.7
 	 */
 	public JdkSerializationRedisSerializer(Converter<Object, byte[]> serializer, Converter<byte[], Object> deserializer) {
 

src/test/java/org/springframework/data/redis/serializer/SimpleRedisSerializerTests.java

@@ -18,19 +18,16 @@
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
-import java.io.IOException;
-import java.io.InputStream;
 import java.io.Serializable;
-import java.net.URL;
 import java.util.UUID;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.data.redis.Address;
 import org.springframework.data.redis.Person;
+import org.springframework.instrument.classloading.ShadowingClassLoader;
 import org.springframework.oxm.xstream.XStreamMarshaller;
-import org.springframework.util.StreamUtils;
 
 /**
  * @author Jennifer Hickey
@@ -125,10 +122,13 @@ private void verifySerializedObjects(Object... objects) {
 		}
 	}
 
+	/**
+	 * @see DATAREDIS-427
+	 */
 	@Test
 	public void jdkSerializerShouldUseCustomClassLoader() throws ClassNotFoundException {
 
-		ClassLoader customClassLoader = new CustomClassLoader();
+		ClassLoader customClassLoader = new ShadowingClassLoader(ClassLoader.getSystemClassLoader());
 
 		JdkSerializationRedisSerializer serializer = new JdkSerializationRedisSerializer(customClassLoader);
 		SerializableDomainClass domainClass = new SerializableDomainClass();
@@ -178,44 +178,4 @@ public void testJsonSerializer() throws Exception {
 		assertEquals(p1, serializer.deserialize(serializer.serialize(p1)));
 		assertEquals(p1, serializer.deserialize(serializer.serialize(p1)));
 	}
-
-	/**
-	 * Custom class loader that loads class files from the test's class path. This {@link ClassLoader} does not delegate
-	 * to a parent class loader to truly load classes that are defined by this class loader and not interfere with any
-	 * parent class loader. The class loader uses simple class definition which is fine for the test but do not use this
-	 * as sample for production class loaders.
-	 */
-	private static class CustomClassLoader extends ClassLoader {
-
-		public CustomClassLoader() {
-			super(null);
-		}
-
-		@Override
-		protected Class<?> findClass(String name) throws ClassNotFoundException {
-
-			URL resource = SimpleRedisSerializerTests.class.getResource("/" + name.replace('.', '/') + ".class");
-
-			InputStream is = null;
-			try {
-
-				is = resource.openStream();
-				byte[] bytes = StreamUtils.copyToByteArray(is);
-				return defineClass(name, bytes, 0, bytes.length);
-			} catch (IOException o_O) {
-				throw new ClassNotFoundException("Cannot read class file", o_O);
-			} finally {
-
-				if (is != null) {
-					try {
-						is.close();
-					} catch (IOException e) {
-						// ignore
-					}
-				}
-			}
-
-		}
-
-	}
 }