begining refactor of VarConver...

Author: SimplyProgrammer

SerialX-core/src/main/java/org/ugp/serialx/GenericScope.java

@@ -286,6 +286,7 @@ public <V extends ValT> V get(KeyT variableKey, V defaultValue)
 	 * @return Value of variable at given path. If no path is given (length is 0) then this {@link GenericScope} will be returned.<br>
 	 * If 1 path argument is given then this behaves similarly to {@link GenericScope#get(Object)}.<br>
 	 * if 2+ path arguments are given then it will search the sub-scopes and return first match value. For example:<br>
+	 * In either way, if there is no suitable result then null will be returned!<br>
 	 * Consider this scope tree:<br>
 	 * <pre>
 	 * <code>
@@ -361,10 +362,7 @@ public <V extends ValT> V get(KeyT variableKey, Class<V> cls, V defaultValue) th
 	 */
 	public boolean containsVariable(KeyT variableKey) 
 	{
-		for (Map.Entry<KeyT, ValT> ent : varEntrySet())
-			if (ent.getKey().equals(variableKey))
-				return true;
-		return false;
+		return variables().containsKey(variableKey);
 	}
 
 	/**
@@ -792,9 +790,9 @@ public boolean isEmpty()
 	 * 
 	 * @since 1.2.0
 	 */
-	public GenericScope<?, ?> getParent()
+	public <T extends GenericScope<?, ?>> T getParent()
 	{
-		return getParent(1);	
+		return (T) getParent(1);	
 	}
 
 	/**
@@ -806,15 +804,15 @@ public boolean isEmpty()
 	 * 
 	 * @since 1.3.2
 	 */
-	public GenericScope<?, ?> getParent(int depth)
+	public <T extends GenericScope<?, ?>> T getParent(int depth)
 	{
 		if (depth < 1)
-			return this;
+			return (T) this;
 
 		GenericScope<?, ?> parentsParent;
 		if (depth == 1 || parent == null || (parentsParent = parent.getParent(--depth)) == null)
-			return parent;
-		return parentsParent;
+			return (T) parent;
+		return (T) parentsParent;
 	}
 
 	/**

SerialX-core/src/main/java/org/ugp/serialx/Utils.java

@@ -855,7 +855,7 @@ public static void post(Serializer serializer, HttpURLConnection conn) throws IO
 	 *
 	 * @since 1.2.2
 	 */
-	public static final class NULL
+	public static final class NULL //TODO: REMOVE!!!!
 	{
 		public static Object toOopNull(Object obj)
 		{
@@ -871,7 +871,7 @@ public boolean equals(Object obj)
 		@Override
 		public String toString() 
 		{
-			return "null";
+			return "NULL";
 		}
 	}
 }

SerialX-juss/src/main/java/org/ugp/serialx/juss/converters/VariableConverter.java

@@ -14,8 +14,10 @@
 import org.ugp.serialx.GenericScope;
 import org.ugp.serialx.LogProvider;
 import org.ugp.serialx.Scope;
+import org.ugp.serialx.Utils;
 import org.ugp.serialx.Utils.NULL;
 import org.ugp.serialx.converters.DataConverter;
+import org.ugp.serialx.converters.DataParser;
 
 /**
  * This converter is capable of converting {@link Map.Entry} and reading variables from {@link Scope} via "$"!
@@ -70,7 +72,7 @@ public Object parse(ParserRegistry myHomeRegistry, String arg, Object... args)
 
 				if (enrty.length > 1 && !objString.isEmpty())
 				{
-					obj = NULL.toOopNull(myHomeRegistry.parse(objString, args));
+					obj = myHomeRegistry.parse(objString, args);
 				}
 
 				for (int i = 0; i < enrty.length-1; i++)
@@ -105,12 +107,38 @@ else if (obj == VOID)
 			}
 			else if (arg.charAt(0) == '$' && !contains(arg, ' ', '+', '-', '*', '/', '%', '>', '<', '=', '&', '|', '^', '?', '='))
 			{
+//				Object obj; 
+//				if ((arg = fastReplace(arg, "$", "")).indexOf('.') > -1)
+//				{
+//					Object[] path = splitValues(fastReplace(fastReplace(arg, "::new", ""), "::class", ""), '.');
+//					GenericScope<Object, Object> sc = (GenericScope<Object, Object>) scope.getGenericScope(Arrays.copyOfRange(path, 0, path.length-1)); //TODO: Prevent neccesity of scope parent inheritance.
+//					obj = sc == null ? null : sc.variables().get(path[path.length-1]);
+//					/*if (sc == null || !sc.containsVariable(tree[tree.length-1]))
+//						LogProvider.instance.logErr("Variable \"" + tree[tree.length-1] + "\" was not declared in \"" + arg.substring(0, arg.length() - tree[tree.length-1].length() - 1) + "\"! Defaulting to null!");*/
+//				}
+//				else
+//				{
+//					String str = fastReplace(fastReplace(arg, "::new", ""), "::class", "");
+//					/*if (!scope.containsVariable(str))
+//						LogProvider.instance.logErr("Variable \"" + str + "\" was not declared! Defaulting to null!");*/
+//					obj = scope.variables().get(str);
+//				}
+				
 				Object obj; 
 				if ((arg = fastReplace(arg, "$", "")).indexOf('.') > -1)
 				{
-					Object[] tree = splitValues(fastReplace(fastReplace(arg, "::new", ""), "::class", ""), '.');
-					GenericScope<Object, Object> sc = (GenericScope<Object, Object>) scope.getGenericScope(Arrays.copyOfRange(tree, 0, tree.length-1)); //TODO: Prevent neccesity of scope parent inheritance.
-					obj = sc == null ? null : sc.variables().get(tree[tree.length-1]);
+					Object[] path = splitValues(fastReplace(fastReplace(arg, "::new", ""), "::class", ""), '.');
+					if ((obj = scope.get(path)) == null && !scope.variables().containsKey(path[0]))
+					{
+						for (GenericScope<Object, Object> parent = scope.getParent(); parent != null; parent = parent.getParent())
+							if (parent.variables().containsKey(path[0]))
+							{
+								obj = parent.get(path);
+								break;
+							}
+					}
+						
+//					GenericScope<Object, Object> sc = (GenericScope<Object, Object>) scope.getGenericScope(Arrays.copyOfRange(path, 0, path.length-1)); //TODO: Prevent neccesity of scope parent inheritance.
 					/*if (sc == null || !sc.containsVariable(tree[tree.length-1]))
 						LogProvider.instance.logErr("Variable \"" + tree[tree.length-1] + "\" was not declared in \"" + arg.substring(0, arg.length() - tree[tree.length-1].length() - 1) + "\"! Defaulting to null!");*/
 				}
@@ -119,9 +147,16 @@ else if (arg.charAt(0) == '$' && !contains(arg, ' ', '+', '-', '*', '/', '%', '>
 					String str = fastReplace(fastReplace(arg, "::new", ""), "::class", "");
 					/*if (!scope.containsVariable(str))
 						LogProvider.instance.logErr("Variable \"" + str + "\" was not declared! Defaulting to null!");*/
-					obj = scope.variables().get(str);
+					if ((obj = scope.variables().getOrDefault(str, VOID)) == VOID)
+					{
+						for (GenericScope<Object, Object> parent = scope.getParent(); parent != null; parent = parent.getParent())
+							if ((obj = parent.variables().getOrDefault(str, VOID)) != VOID)
+								break;
+					}
 				}
 
+				if (obj == null || obj == VOID) // Was not found...
+					return null;
 				return arg.endsWith("::class") ? obj.getClass() : arg.endsWith("::new") ? Clone(obj) : obj;
 			}
 		}