refactoring variable converter, adding access member op

Author: SimplyProgrammer

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

@@ -267,7 +267,7 @@ public <V extends ValT> V get(KeyT variableKey)
 	 * @param variableKey | Variables name.
 	 * @param defaultValue | Default value to return.
 	 * 
-	 * @return Value of variable with name or defaultValue if there is no such a one or given key contains null!
+	 * @return Value of variable with name or defaultValue if there is no such a one (or given key contains null)!
 	 * 
 	 * @since 1.2.5
 	 */
@@ -337,7 +337,7 @@ public <V extends ValT> V get(KeyT... pathToValue)
 	 * @param cls | Default value to return.
 	 * @param defaultValue | Class that you want the obtained object to be converted into! Exact conversion algorithm can differ based on its implementations.
 	 * 
-	 * @return Value of variable with name given converted to object of cls or defaultValue if there is no such a one or given key contains null!
+	 * @return Value of variable with name given converted to object of cls or defaultValue if there is no such a one (or given key contains null)!
 	 * 
 	 * @throws Exception | If converting to object of cls failed from some reason! This can differ from implementation to implementation! By default it uses {@link GenericScope#toObject(cls)}
 	 * 

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

@@ -514,7 +514,7 @@ else if (obj instanceof CharSequence)
 	 */
 	public String getString(int valueIndex)
 	{
-		return String.valueOf(get(valueIndex));
+		return String.valueOf((Object) get(valueIndex));
 	}
 
 	/**

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

@@ -218,7 +218,7 @@ public static Object InvokeFunc(Object obj, Class<?> objCls, String name, Class<
 	 */
 	public static <T> T Clone(T obj)
 	{
-		return Clone(obj, DataParser.REGISTRY, new Object[] {}, new Scope());
+		return Clone(obj, DataParser.REGISTRY, new Object[0], new Scope());
 	}
 
 	/**
@@ -458,8 +458,8 @@ public static StringBuilder multilpy(char ch, int times)
 	 */
 	public static StringBuilder multilpy(CharSequence str, int times)
 	{
-		StringBuilder sb = new StringBuilder(str);
-		while (times-- > 1)
+		StringBuilder sb = new StringBuilder();
+		while (times-- > 0)
 			sb.append(str);
 		return sb;
 	}
@@ -503,7 +503,7 @@ public static String[] splitValues(String s, int limit, boolean splitAfterSingle
 	 * 
 	 * @since 1.3.5
 	 */
-	public static String[] splitValues(String s, int limit, boolean oneOrMore, char[] splitBreaks, char... splitter)
+	public static String[] splitValues(String s, int limit, boolean oneOrMore, char[] splitBreaks, char... splitter) //TODO: This bs is terribly broken! Idk what I was doing back then but its not doing what I would assume at all...
 	{
 		if (splitter.length <= 0 || limit == 1)
 			return new String[] {s};
@@ -727,9 +727,12 @@ public static boolean isOneOf(int ch, char... chars)
 	public static boolean contains(CharSequence str, char... oneOf)
 	{
 		if (oneOf.length == 1)
+		{
 			for (int i = 0, len = str.length(); i < len; i++) 
 				if (str.charAt(i) == oneOf[0])
 					return true;
+			return false;
+		}
 
 		for (int i = 0, len = str.length(); i < len; i++) 
 			if (isOneOf(str.charAt(i), oneOf))

SerialX-core/src/main/java/org/ugp/serialx/converters/ProtocolConverter.java

@@ -2,7 +2,6 @@
 
 import static org.ugp.serialx.Utils.Instantiate;
 import static org.ugp.serialx.Utils.indexOfNotInObj;
-import static org.ugp.serialx.Utils.isOneOf;
 import static org.ugp.serialx.Utils.splitValues;
 
 import java.io.Serializable;
@@ -115,7 +114,7 @@ protected Object parse(ParserRegistry myHomeRegistry, Class<?> objClass, String
 
 		String[] args = splitValues(str, ' ');
 		int nameIndex;
-		if (!isOneOf(args[0].charAt(0), '{', '[') && (nameIndex = args[0].indexOf("::")) > -1) //Is static member invocation
+		if ((args[0].charAt(0) | ' ') != '{' && (nameIndex = args[0].indexOf("::")) > -1) //Is static member invocation
 		{
 			String memberName = args[0].substring(nameIndex + 2);
 			if (!isAllowStaticMemberInvocation())

SerialX-core/src/main/java/org/ugp/serialx/converters/VariableParser.java

@@ -11,7 +11,8 @@
 
 /**
  * This parser is capable of reading variables from {@link GenericScope} by using "$"!
- * {@link VariableConverter#parse(String, Object...)} required one additional Scope argument in args... at index 0!
+ * {@link VariableConverter#parse(String, Object...)} required one additional Scope argument in args... at index 0!<br>
+ * It also manages access member operator also known as separator <code>"."</code>.
  * Its case sensitive!<br>
  * Exact outputs of this converter are based on inserted scope!
  * 
@@ -31,54 +32,63 @@ public Object parse(ParserRegistry myHomeRegistry, String str, Object... args)
 		}
 		return CONTINUE;
 	}
+	
+	/**
+	 * @param source | Source object to get value of the member from (may or may not be null). Source should not be modified!
+	 * @param member | Name/key of the member to get.
+	 * 
+	 * @return The value of member from given source. You can think about this as ekvivalent to <code>source.member</code> in Java. If member with provided name/key is not present in the source or its value is not possible to get, {@link VOID} has to be returned! If source can't be accessed/dereferenced, <code>null</code> has to be returned!<br>
+	 * Note: This method is meant to be overridden in order to add support for accessing multiple sources because by default it supports only {@link GenericScope}
+	 * 
+	 * @since 1.3.7
+	 */
+	@SuppressWarnings("unchecked")
+	public Object getMemberOperator(Object source, Object member)
+	{
+		if (source instanceof GenericScope)
+			return ((GenericScope<?, Object>) source).variables().getOrDefault(member, VOID);
+		return null;
+	}
 
 	/**
 	 * @param myHomeRegistry | Registry where this parser is registered provided by {@link DataParser#parseObj(Registry, String, boolean, Class[], Object...)} otherwise it demands on implementation (it should not be null)!
-	 * @param str | Source string (preferably with some variables to read)!
+	 * @param str | Source string, should not be null or empty (preferably with some variables to read)!
 	 * @param scope | Source scope to read from, can't be null!
 	 * @param args | Some additional args. This can be anything and it demands on implementation of DataParser.
 	 * 
 	 * @return Value of variable read from scope is str was suitable. Special return types are {@link DataParser#VOID} and {@link DataParser#CONTINUE}. Continue will ignore this parser and jump to another one in registry.
 	 * 
 	 * @since 1.3.7
 	 */
-	@SuppressWarnings("unchecked")
-	protected Object parse(ParserRegistry myHomeRegistry, String str, GenericScope<?, Object> scope, Object... args) 
+	protected Object parse(ParserRegistry myHomeRegistry, String str, GenericScope<?, Object> scope, Object... args)
 	{
-		if (str.charAt(0) == '$' && !contains(str, ' ', '+', '-', '*', '/', '%', '>', '<', '=', '&', '|', '^', '?', '='))
+		if (str.charAt(0) == '$' && !contains(str = str.substring(1), ' ', '+', '-', '*', '/', '%', '>', '<', '=', '&', '|', '^', '?', '='))
 		{
-
 			boolean clsModif = str.endsWith("::class"), newModif = false; // Handle modifiers...
 			if (clsModif)
 				str = str.substring(0, str.length()-7);
 			else if (newModif = str.endsWith("::new"))
 				str = str.substring(0, str.length()-5);
 
 			Object obj = null;
-			if ((str = str.substring(1)).indexOf('.') > -1)
+			if (str.indexOf('.') > -1)
 			{
-				Object[] path = splitValues(str, '.');
+				String[] path = splitValues(str, '.');
 				int iLast = path.length-1;
 
 				backlook: do 
 				{
-					Object sc = scope.variables().getOrDefault(path[0], VOID);
-					if (sc instanceof GenericScope) // The first one has to be scope!
+					Object sc;
+					if ((sc = getMemberOperator(scope, path[0])) != VOID) // Attempt to get only when exists...
 					{
-						for (int i = 1; i < iLast; i++) // Subscope/forward lookup...
-							if (!((sc = ((GenericScope<Object, ?>) sc).get(path[i])) instanceof GenericScope))
+						for (int i = 1; i < iLast; i++) // Subscope/forward lookup (inner path only)...
+							if ((sc = getMemberOperator(sc, path[i])) == null || sc == VOID)
 							{
 								// LogProvider.instance.logErr("Value of path \"" + arg + "\" cannot be dereferenced because \"" + path[i] + "\" is not a scope but " + sc + "!", null);
 								break backlook;
 							}
 
-						obj = ((GenericScope<?, Object>) sc).variables().get(path[iLast]);
-						break;
-					}
-					
-					if (sc != VOID) // = variable was defined in parent but it is not a scope, it means we want to break cos we can't deref that = treat the path as invalid (undefined)...
-					{
-						// LogProvider.instance.logErr("Value of path \"" + arg + "\" cannot be dereferenced because \"" + path[0] + "\" is not a scope but " + sc + "!", null);
+						obj = getMemberOperator(sc, path[iLast]);
 						break;
 					}
 				}
@@ -96,8 +106,9 @@ else if (newModif = str.endsWith("::new"))
 
 			if (obj == null || obj == VOID) // When was not found...
 				return null;
-			return clsModif ? obj.getClass() : newModif ? Clone(obj, scope instanceof Serializer ? ((Serializer) scope).getParsers() : DataParser.REGISTRY, new Object[] {}, new Scope()) : obj;
+			return clsModif ? obj.getClass() : newModif ? Clone(obj, scope instanceof Serializer ? ((Serializer) scope).getParsers() : DataParser.REGISTRY, new Object[0], new Scope()) : obj;
 		}
+
 		return CONTINUE;
 	}
 }

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

@@ -1,12 +1,10 @@
 package org.ugp.serialx.juss.converters;
 
 import static org.ugp.serialx.Utils.contains;
-import static org.ugp.serialx.Utils.fastReplace;
 import static org.ugp.serialx.Utils.multilpy;
 import static org.ugp.serialx.Utils.splitValues;
 
 import java.util.AbstractMap;
-import java.util.Arrays;
 import java.util.Map;
 import java.util.Map.Entry;
 
@@ -17,13 +15,16 @@
 
 /**
  * This converter is capable of converting {@link Map.Entry} and reading variables from {@link GenericScope} by using "$"!
- * {@link VariableConverter#parse(String, Object...)} required one additional Scope argument in args... at index 0!
+ * {@link VariableConverter#parse(String, Object...)} required one additional Scope argument in args... at index 0!<br>
+ * It manages assign operator <code>=</code> as well as access member operator also known as separator <code>"."</code>.<br>
  * Its case sensitive!<br>
  * Exact outputs of this converter are based on inserted scope!
  * 
  * @author PETO
  *	
  * @since 1.3.0
+ * 
+ * @see VariableParser
  */
 public class VariableConverter extends VariableParser implements DataConverter
 {
@@ -57,64 +58,68 @@ public Object parse(ParserRegistry myHomeRegistry, String arg, Object... args)
 	{
 		if (args.length > 0 && arg.length() > 0 && args[0] instanceof GenericScope)
 		{
-			GenericScope<Object, Object> scope = (GenericScope<Object, Object>) args[0];
-			boolean genericVar = args.length > 4 && args[4] == GenericScope.class;
+			GenericScope<?, Object> scope = (GenericScope<?, Object>) args[0];
 			if (isVarAssignment(arg))
 			{
-				String[] enrty = splitValues(arg, 0, false, new char[] {'?'}, '=', ':');
-
-				Object obj = null;
-				String objString = enrty[enrty.length-1];
+				boolean getValueModif = arg.charAt(0) == '$', genericVar = args.length > 4 && args[4] == GenericScope.class;
+				if (getValueModif)
+					arg = arg.substring(1);
+				
+				String vars[] = splitValues(arg, 0, false, new char[] {'?'}, '=', ':'), valStr;
 
-				if (enrty.length > 1 && !objString.isEmpty())
+				Object val = null;
+				int iVal = vars.length-1;
+				if (vars.length > 1 && !(valStr = vars[iVal]).isEmpty())
 				{
-					obj = myHomeRegistry.parse(objString, args);
+					val = myHomeRegistry.parse(valStr, args);
 				}
 
-				for (int i = 0; i < enrty.length-1; i++)
+				eachVar: for (int i = 0; i < iVal; i++) // Support for assigning multiple vars to the same value...
 				{
-					if (!genericVar && contains(enrty[i] = enrty[i].trim(), ' '))
-						LogProvider.instance.logErr("Variable name \"" + enrty[i] + "\" is invalid, blank characters are not allowed!", null);
-					else
+					String var = vars[i];
+					if (!genericVar && contains(var, ' '))
+						LogProvider.instance.logErr("Variable name \"" + var + "\" is invalid, blank characters are not allowed!", null);
+					else if (var.indexOf('.') > -1)
 					{
-						if ((enrty[i] = fastReplace(enrty[i], "$", "")).indexOf('.') > -1)
+						String[] path = splitValues(var, '.');
+						int iLast = path.length-1, j = 0;
+						
+						backlook: do
 						{
-							String[] tree = splitValues(enrty[i], '.');
-							GenericScope<Object, Object> sc = (GenericScope<Object, Object>) scope.getGenericScope((Object[]) Arrays.copyOfRange(tree, 0, tree.length-1));
-							if (sc != null)
+							Object sc;
+							if ((sc = getMemberOperator(scope, path[0])) != VOID) // Attempt to get only when exists...
 							{
-								if (obj == VOID)
-									sc.variables().remove(enrty[i]);
-								else
-									sc.put(genericVar ? myHomeRegistry.parse(tree[tree.length-1], true, null, args) : tree[tree.length-1], obj);
+								for (j = 1; j < iLast; j++) // Subscope/forward lookup (inner path only)...
+									if ((sc = getMemberOperator(sc, path[j])) == null || sc == VOID)
+										break backlook;
+								
+								setMemberOperator(myHomeRegistry, sc, path[iLast], val, genericVar, args);
+								continue eachVar;
 							}
-							else
-								LogProvider.instance.logErr("Variable \"" + tree[tree.length-2] + "\" was not declared as scope in its scope so variable \"" + tree[tree.length-1] +"\" cant be set to \"" + obj + "\"!", null);
 						}
-						else if (obj == VOID)
-							scope.variables().remove(enrty[i]);
-						else
-							scope.put(genericVar ? myHomeRegistry.parse(enrty[i], true, null, args) : enrty[i], obj);
+						while ((scope = scope.getParent()) != null);
+
+						LogProvider.instance.logErr("Path \"" + var + "\" cannot be set to \"" + val + "\" because \"" + path[j] + "\" is not a accessible or does not exist!", null);
 					}
+					else
+						setMemberOperator(myHomeRegistry, scope, var, val, genericVar, args);
 				}
 
-				if (arg.charAt(0) == '$')
-					return obj;
-				return VOID;
+				return getValueModif ? val : VOID;
 			}
 
 			return parse(myHomeRegistry, arg, scope, args); //Reading vars from scope...
 		}
+
 		return CONTINUE;
 	}
 
-	@SuppressWarnings("unchecked")
 	@Override
 	public CharSequence toString(ParserRegistry myHomeRegistry, Object obj, Object... args) 
 	{
 		if (obj instanceof Entry)
 		{
-			Entry<Object, Object> var = (Entry<Object, Object>) obj;	
+			Entry<?, ?> var = (Entry<?, ?>) obj;
 			int tabs = 0;
 			if (args.length > 1 && args[1] instanceof Integer)
 				tabs = (int) args[1];
@@ -136,6 +141,30 @@ public CharSequence getDescription(ParserRegistry myHomeRegistry, Object objToDe
 		return new StringBuilder(myHomeRegistry.getConverterFor(ent.getValue(), argsUsedConvert).getDescription(myHomeRegistry, ent.getValue(), argsUsedConvert)).append(" Stored by \"").append(ent.getKey()).append("\" variable!");
 	}
 
+	/**
+	 * @param myHomeRegistry | {@link ParserRegistry} provided by caller, may or may not be used... 
+	 * @param source | Source object to set the value member. 
+	 * @param member | Name/key of the member to set.
+	 * @param val | Value to set the member to.
+	 * @param genericVar | If true, member is expected be generic (not only string) and further parsing is required, may or may not be used... 
+	 * @param args | Some additional args to be used in case of parsing that are provided by called, may or may not be used... 
+	 *
+	 * @return By default it returns the previous value of the member. If member with provided name/key is not present in the source or its value is not possible to set, {@link VOID} should be returned! 
+	 * 
+	 * @since 1.3.7
+	 */
+	@SuppressWarnings("unchecked")
+	public Object setMemberOperator(ParserRegistry myHomeRegistry, Object source, String member, Object val, boolean genericVar, Object... args)
+	{
+		if (source instanceof GenericScope)
+		{
+			if (val == VOID)
+				return ((GenericScope<Object,?>) source).remove(member);
+			return ((GenericScope<Object, Object>) source).put(genericVar ? myHomeRegistry.parse(member, true, null, args) : member, val);
+		}
+		return VOID;
+	}
+	
 	/**
 	 * @return True if variables will be serialized using json style ("key" : value)!
 	 *