Merge pull request #21 from StaticDefault/master

Added classloader parameter.

src/main/java/com/realtimetech/kson/KsonContext.java

@@ -56,11 +56,18 @@ private static enum ValueMode {
 
 	private HashMap<String, Class<?>> cachedClasses;
 
+	private ClassLoader classLoader;
+
 	public KsonContext() {
 		this(10, 100);
 	}
-
+	
 	public KsonContext(int stackSize, int stringBufferSize) {
+		this(KsonContext.class.getClassLoader(), stackSize, stringBufferSize);
+	}
+
+	public KsonContext(ClassLoader classLoader, int stackSize, int stringBufferSize) {
+		this.classLoader = classLoader;
 		this.working = false;
 		this.valueStack = new FastStack<Object>(stackSize);
 		this.modeStack = new FastStack<ValueMode>(stackSize);
@@ -218,7 +225,7 @@ public UUID deserialize(KsonContext ksonContext, Class<?> object, Object value)
 
 	private Class<?> getClassByName(String name) throws ClassNotFoundException {
 		if (!this.cachedClasses.containsKey(name)) {
-			this.cachedClasses.put(name, Class.forName(name));
+			this.cachedClasses.put(name, classLoader.loadClass(name));
 		}
 
 		return this.cachedClasses.get(name);

src/main/java/com/realtimetech/kson/builder/KsonBuilder.java

@@ -10,6 +10,7 @@ public class KsonBuilder {
 
 	private HashMap<Class<?>, Transformer<?>> registeredTransformers;
 
+	private ClassLoader classLoader;
 	private int stackSize;
 	private int stringBufferSize;
 
@@ -28,12 +29,24 @@ public KsonBuilder registerTransformer(Class<?> clazz, Transformer<?> preTransfo
 		return this;
 	}
 
+	public ClassLoader getClassLoader() {
+		return classLoader;
+	}
+
+	public KsonBuilder setClassLoader(ClassLoader classLoader) {
+		this.classLoader = classLoader;
+
+		return this;
+	}
+
 	public boolean isUseCustomTag() {
 		return useCustomTag;
 	}
 
-	public void setUseCustomTag(boolean useCustomTag) {
+	public KsonBuilder setUseCustomTag(boolean useCustomTag) {
 		this.useCustomTag = useCustomTag;
+
+		return this;
 	}
 
 	public int getStackSize() {
@@ -57,7 +70,7 @@ public KsonBuilder setStringBufferSize(int stringBufferSize) {
 	}
 
 	public KsonContext build() {
-		KsonContext ksonContext = new KsonContext(this.stackSize, this.stringBufferSize);
+		KsonContext ksonContext = new KsonContext(this.classLoader, this.stackSize, this.stringBufferSize);
 
 		ksonContext.setUseCustomTag(this.useCustomTag);