Fixed CS. This closes #830
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/940c88ee Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/940c88ee Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/940c88ee Branch: refs/heads/master Commit: 940c88ee91aee5b5f9b90d610fc283ff39315fb3 Parents: 5f55d0d Author: Claus Ibsen <davscl...@apache.org> Authored: Mon Feb 8 17:52:31 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Feb 8 17:52:31 2016 +0100 ---------------------------------------------------------------------- .../ClassLoadingAwareObjectInputStream.java | 29 +++++------ .../ClassLoadingAwareObjectInputStreamTest.java | 53 ++++++++++++-------- 2 files changed, 45 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/940c88ee/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/ClassLoadingAwareObjectInputStream.java ---------------------------------------------------------------------- diff --git a/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/ClassLoadingAwareObjectInputStream.java b/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/ClassLoadingAwareObjectInputStream.java index 80a1278..6b8493c 100644 --- a/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/ClassLoadingAwareObjectInputStream.java +++ b/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/ClassLoadingAwareObjectInputStream.java @@ -31,16 +31,14 @@ import org.apache.camel.CamelContext; @SuppressWarnings("rawtypes") public class ClassLoadingAwareObjectInputStream extends ObjectInputStream { - private CamelContext camelContext; - - private static final ClassLoader FALLBACK_CLASS_LOADER = - ClassLoadingAwareObjectInputStream.class.getClassLoader(); + private static final ClassLoader FALLBACK_CLASS_LOADER = ClassLoadingAwareObjectInputStream.class.getClassLoader(); /** * Maps primitive type names to corresponding class objects. */ - private static final HashMap<String, Class> primClasses = new HashMap<String, Class>(8, 1.0F); + private static final HashMap<String, Class> PRIM_CLASSES = new HashMap<String, Class>(8, 1.0F); + private CamelContext camelContext; private final ClassLoader inLoader; public ClassLoadingAwareObjectInputStream(InputStream in) throws IOException { @@ -53,7 +51,6 @@ public class ClassLoadingAwareObjectInputStream extends ObjectInputStream { inLoader = camelContext.getApplicationContextClassLoader(); } - protected Class<?> resolveClass(ObjectStreamClass classDesc) throws IOException, ClassNotFoundException { ClassLoader cl = Thread.currentThread().getContextClassLoader(); return load(classDesc.getName(), cl, inLoader); @@ -93,7 +90,7 @@ public class ClassLoadingAwareObjectInputStream extends ObjectInputStream { } } // fallback - final Class<?> clazz = (Class<?>) primClasses.get(className); + final Class<?> clazz = (Class<?>) PRIM_CLASSES.get(className); if (clazz != null) { return clazz; } else { @@ -102,14 +99,14 @@ public class ClassLoadingAwareObjectInputStream extends ObjectInputStream { } static { - primClasses.put("boolean", boolean.class); - primClasses.put("byte", byte.class); - primClasses.put("char", char.class); - primClasses.put("short", short.class); - primClasses.put("int", int.class); - primClasses.put("long", long.class); - primClasses.put("float", float.class); - primClasses.put("double", double.class); - primClasses.put("void", void.class); + PRIM_CLASSES.put("boolean", boolean.class); + PRIM_CLASSES.put("byte", byte.class); + PRIM_CLASSES.put("char", char.class); + PRIM_CLASSES.put("short", short.class); + PRIM_CLASSES.put("int", int.class); + PRIM_CLASSES.put("long", long.class); + PRIM_CLASSES.put("float", float.class); + PRIM_CLASSES.put("double", double.class); + PRIM_CLASSES.put("void", void.class); } } http://git-wip-us.apache.org/repos/asf/camel/blob/940c88ee/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/ClassLoadingAwareObjectInputStreamTest.java ---------------------------------------------------------------------- diff --git a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/ClassLoadingAwareObjectInputStreamTest.java b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/ClassLoadingAwareObjectInputStreamTest.java index e0695ac..a7247ba 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/ClassLoadingAwareObjectInputStreamTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/ClassLoadingAwareObjectInputStreamTest.java @@ -16,19 +16,24 @@ */ package org.apache.camel.processor.aggregate.jdbc; -import org.apache.camel.CamelContext; -import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.impl.DefaultExchange; -import org.apache.camel.impl.DefaultExchangeHolder; -import org.junit.Test; - -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import static junit.framework.Assert.assertEquals; +import org.apache.camel.CamelContext; +import org.apache.camel.impl.DefaultCamelContext; +import org.apache.camel.impl.DefaultExchange; +import org.apache.camel.impl.DefaultExchangeHolder; +import org.junit.Test; + public class ClassLoadingAwareObjectInputStreamTest { @Test @@ -69,25 +74,31 @@ class MyObject implements Serializable { final byte[] content; public MyObject(String name, byte[] content) { - this.name = name; - this.content = content; + this.name = name; + this.content = content; } - + @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - - MyObject myObject = (MyObject) o; - - if (name != null ? !name.equals(myObject.name) : myObject.name != null) return false; - return Arrays.equals(content, myObject.content); + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + + MyObject myObject = (MyObject) o; + + if (name != null ? !name.equals(myObject.name) : myObject.name != null) { + return false; + } + return Arrays.equals(content, myObject.content); } - + @Override public int hashCode() { - int result = name != null ? name.hashCode() : 0; - result = 31 * result + Arrays.hashCode(content); - return result; + int result = name != null ? name.hashCode() : 0; + result = 31 * result + Arrays.hashCode(content); + return result; } }
