Fixing splitValues, small fix JussSerializer#from, finishing refactor of

VarParser and Converter + scope inheritance removed!

Author: SimplyProgrammer

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

@@ -28,13 +28,8 @@
 import java.util.Map;
 import java.util.function.Function;
 
-import org.ugp.serialx.converters.BooleanConverter;
-import org.ugp.serialx.converters.CharacterConverter;
 import org.ugp.serialx.converters.DataParser;
 import org.ugp.serialx.converters.DataParser.ParserRegistry;
-import org.ugp.serialx.converters.NullConverter;
-import org.ugp.serialx.converters.NumberConverter;
-import org.ugp.serialx.converters.SerializableBase64Converter;
 import org.ugp.serialx.converters.StringConverter;
 import org.ugp.serialx.protocols.SerializationProtocol;
 import org.ugp.serialx.protocols.SerializationProtocol.ProtocolRegistry;
@@ -56,7 +51,7 @@ public abstract class Serializer extends Scope
 	 * 
 	 * @since 1.3.2
 	 */
-	public static final ParserRegistry COMMON_PARSERS = new ParserRegistry(new StringConverter(), /* TODO: new ProtocolConverter() */ new NumberConverter(), new BooleanConverter(), new CharacterConverter(), new NullConverter(), new SerializableBase64Converter());
+	public static final ParserRegistry COMMON_PARSERS = DataParser.REGISTRY.clone();
 
 	protected ParserRegistry parsers;
 	protected ProtocolRegistry protocols;
@@ -1064,29 +1059,28 @@ <th>Obtained serializer content (return)</th>
 			</tr>
 		</table>
 	 *	
-	 * @throws Exception if calling of some {@link PropertyDescriptor}s write method fails (should not happen often) or when something went wrong during deserialization!
+	 * @throws Exception if calling of some {@link PropertyDescriptor}s write method fails (should not happen often) or when something went very wrong during deserialization!
 	 * @throws IntrospectionException when there were no PropertyDescriptor found for obj class!
+	 * @throws RuntimeException in case of something went wrong during deserialization process and {@link LogProvider#isReThrowException()} is set to true!
 	 * 
 	 * @since 1.3.5
 	 */
 	public static Serializer from(Serializer newInstance, Object fromObj, String... fieldNamesToUse) throws Exception, IntrospectionException
 	{
 		if (fromObj instanceof CharSequence)
 		{
-			if (indexOfNotInObj((CharSequence) fromObj, "http") == 0)
-				try
-				{
-					return newInstance.LoadFrom(new URL(fromObj.toString()).openStream());
-				}
-				catch (IOException e)
-				{}
-			
 			try
 			{
-				return newInstance.LoadFrom(new File(fromObj.toString()));
+				String fromStr;
+				if (indexOfNotInObj(fromStr = fromObj.toString(), "http") == 0)
+					return newInstance.LoadFrom(new URL(fromStr).openStream());
+				return newInstance.LoadFrom(new File(fromStr));
 			}
 			catch (Exception e)
-			{}
+			{
+				if (e instanceof RuntimeException)
+					throw e;
+			}
 
 			return newInstance.LoadFrom((CharSequence) fromObj);
 		}

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

@@ -468,42 +468,65 @@ public static StringBuilder multilpy(CharSequence str, int times)
 	 * @param s | String to split and check some syntax.
 	 * @param splitter | Chars where string will be split!
 	 * 
-	 * @return String splitted after splitters. If there is more than one splitter in row, it will be taken as one whole!
+	 * @return String splitted after splitters. More than one splitter in row will be take as 1. Each resulting token will be {@link String#trim() trim}<code>med</code>!
 	 * 
 	 * @since 1.0.0
 	 */
 	public static String[] splitValues(String s, char... splitter)
 	{
-		return splitValues(s, 0, true, splitter);
+		return splitValues(s, 0, 2, splitter);
 	}
 
 	/**
 	 * @param s | String to split and check some syntax.
 	 * @param limit | If 0 or less = no limit, 1 = no splitting, more than 1 = count of results!
-	 * @param oneOrMore | If true, string will be splitted after one or more splitters in row, if false splitting will occur only after single splitter (this is similar to "+" in regex)!
+	 * @param splittingStrategy | <b>If 0</b>, splitting will occur after each splitter! 
+	 * 	<b>If 1</b>, string will be splitted after only one splitter, more than one splitters in row will be ignored! 
+	 * 	<b>If 2</b>, splitting will occur after any number of splitters, n number of splitters in row will be treated as 1!
 	 * @param splitter | Chars where string will be split!
 	 * 
-	 * @return String splitted after splitters according to arguments. If there is more than one splitter in row, it will be taken as one whole!
+	 * @return String splitted after splitters according to arguments. Each resulting token will be {@link String#trim() trim}<code>med</code>!
 	 * 
 	 * @since 1.3.0
 	 */
-	public static String[] splitValues(String s, int limit, boolean splitAfterSingleCharOnly, char... splitter)
+	public static String[] splitValues(String s, int limit, int splittingStrategy, char... splitter)
 	{
-		return splitValues(s, limit, splitAfterSingleCharOnly, new char[0], splitter);
+		return splitValues(s, 0, limit, splittingStrategy, new char[0], splitter);
 	}
 
 	/**
 	 * @param s | String to split and check some syntax.
 	 * @param limit | If 0 or less = no limit, 1 = no splitting, more than 1 = count of results!
-	 * @param oneOrMore | If true, string will be splitted after one or more splitters in row, if false splitting will occur only after single splitter (this is similar to "+" in regex)!
+	 * @param splittingStrategy | <b>If 0</b>, splitting will occur after each splitter! 
+	 * 	<b>If 1</b>, string will be splitted after only one splitter, more than one splitters in row will be ignored! 
+	 * 	<b>If 2</b>, splitting will occur after any number of splitters, n number of splitters in row will be treated as 1!
 	 * @param splitBreaks | When some of these characters is encountered, splitting is terminated for the rest of the string! 
 	 * @param splitter | Chars where string will be split!
 	 * 
-	 * @return String splitted after splitters according to arguments. If there is more than one splitter in row, it will be taken as one whole!
+	 * @return String splitted after splitters according to arguments. Each resulting token will be {@link String#trim() trim}<code>med</code>!
 	 * 
 	 * @since 1.3.5
 	 */
-	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...
+	public static String[] splitValues(String s, int limit, int splittingStrategy, char[] splitBreaks, char... splitter)
+	{
+		return splitValues(s, 0, limit, splittingStrategy, splitBreaks, splitter);
+	}
+
+	/**
+	 * @param s | String to split and check some syntax.
+	 * @param i | Index of character to start at. Note that everything before this index will be ignored by other options...
+	 * @param limit | If 0 or less = no limit, 1 = no splitting, more than 1 = count of results!
+	 * @param splittingStrategy | <b>If 0</b>, splitting will occur after each splitter! 
+	 * 	<b>If 1</b>, string will be splitted after only one splitter, more than one splitters in row will be ignored! 
+	 * 	<b>If 2</b>, splitting will occur after any number of splitters, n number of splitters in row will be treated as 1!
+	 * @param splitBreaks | When some of these characters is encountered, splitting is terminated for the rest of the string! 
+	 * @param splitter | Chars where string will be split!
+	 * 
+	 * @return String splitted after splitters according to arguments. Each resulting token will be {@link String#trim() trim}<code>med</code>!
+	 * 
+	 * @since 1.3.7
+	 */
+	public static String[] splitValues(String s, int i, int limit, int splittingStrategy, char[] splitBreaks, char... splitter)
 	{
 		if (splitter.length <= 0 || limit == 1)
 			return new String[] {s};
@@ -512,9 +535,9 @@ public static String[] splitValues(String s, int limit, boolean oneOrMore, char[
 //			return splitValues(" "+s, limit, oneOrMore, splitBreaks, splitter);
 
 		List<String> result = new ArrayList<>();
-
-		int brackets = 0, quote = 0, lastIndex = 0;
-		for (int i = 0, count = 1, len = s.length(), oldCh = splitter[0]; i < len && (limit <= 0 || count < limit); i++)
+		
+		int brackets = 0, quote = 0, lastIndex = 0, len = s.length();
+		for (int count = 1, oldCh = 0; i < len && (limit <= 0 || count < limit); i++)
 		{
 			char ch = s.charAt(i);
 			if (ch == '"')
@@ -528,10 +551,17 @@ public static String[] splitValues(String s, int limit, boolean oneOrMore, char[
 					break;
 				}
 
-				if (brackets == 0 && oldCh != ch && isOneOf(ch, splitter) && (oneOrMore || (i >= len-1 || !isOneOf(s.charAt(i+1), splitter))))
+				if (brackets == 0 && isOneOf(ch, splitter) &&
+					(splittingStrategy != 1 || ch != oldCh && (i >= len-1 || !isOneOf(s.charAt(i+1), splitter))))
 				{	
-					result.add(s.substring(lastIndex == 0 ? 0 : lastIndex + 1, lastIndex = i).trim());
-					count++;
+					String tok = s.substring(lastIndex, i).trim();
+					if (splittingStrategy < 2 || result.isEmpty() || !tok.isEmpty())
+					{
+						result.add(tok);
+						lastIndex = i + 1;
+						
+						count++;
+					}
 				}
 				else if ((ch | ' ') == '{')
 					brackets++;
@@ -545,14 +575,14 @@ else if ((ch | ' ') == '}')
 			}
 			oldCh = ch;
 		}
-
+		
 		if (brackets > 0)
 			throw new IllegalArgumentException("Unclosed brackets in: " + s);
 		else if (quote % 2 != 0)
 			throw new IllegalArgumentException("Unclosed or missing quotes in: " + s);
 		else
 		{
-			result.add(s.substring(lastIndex == 0 ? 0 : lastIndex + 1, s.length()).trim());
+			result.add(s.substring(lastIndex, len).trim());
 		}
 
 		return result.toArray(new String[0]);

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

@@ -10,9 +10,9 @@
 import org.ugp.serialx.Serializer;
 
 /**
- * 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!<br>
- * It also manages access member operator also known as separator <code>"."</code>.
+ * This parser is capable of reading variables from {@link GenericScope} by using <code>$</code>!<br>
+ * {@link VariableParser#parse(String, Object...)} requires one additional Scope argument in args... at index 0!<br>
+ * It also manages access member operator also known as separator <code>"."</code>.<br>
  * Its case sensitive!<br>
  * Exact outputs of this converter are based on inserted scope!
  * 
@@ -71,9 +71,10 @@ else if (newModif = str.endsWith("::new"))
 				str = str.substring(0, str.length()-5);
 
 			Object obj = null;
-			if (str.indexOf('.') > -1)
+			int op0Index;
+			if ((op0Index = str.indexOf('.')) > -1)
 			{
-				String[] path = splitValues(str, '.');
+				String[] path = splitValues(str, op0Index, 0, 0, new char[0], '.');
 				int iLast = path.length-1;
 
 				backlook: do 

SerialX-juss/src/main/java/org/ugp/serialx/juss/JussSerializer.java

@@ -497,10 +497,6 @@ else if (ch == '}' || ch == ']')
 
 		if (parent == null)
 			getImports().removeImportsOf(this);
-//		else
-//			for (Map.Entry<?, ?> ent : parent.varEntrySet())
-//				if (variables().get(ent.getKey()) == ent.getValue())
-//					variables().remove(ent.getKey());//TODO: Prevent neccesity of scope parent inheritance.
 		return (S) this;
 	}
 

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

@@ -111,10 +111,9 @@ public Object parse(ParserRegistry myHomeRegistry, String str, Object... compile
 					scope = getPreferredSerializer();
 				}
 
-				//TODO: Prevent neccesity of scope parent inheritance.
 				compilerArgs = compilerArgs.clone();
 				compilerArgs[0] = false; //No extra formating...
-				return str.isEmpty() ? scope : ((Serializer) scope/*.inheritParent()*/).LoadFrom(new StringReader(str), compilerArgs);
+				return str.isEmpty() ? scope : scope.LoadFrom(new StringReader(str), compilerArgs);
 			}
 		}
 		return CONTINUE;

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

@@ -14,8 +14,8 @@
 import org.ugp.serialx.converters.VariableParser;
 
 /**
- * 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!<br>
+ * This converter is capable of converting {@link Map.Entry} and reading variables from {@link GenericScope} by using <code>$</code>!<br>
+ * {@link VariableConverter#parse(String, Object...)} requires 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!
@@ -59,13 +59,17 @@ public Object parse(ParserRegistry myHomeRegistry, String arg, Object... args)
 		if (args.length > 0 && arg.length() > 0 && args[0] instanceof GenericScope)
 		{
 			GenericScope<?, Object> scope = (GenericScope<?, Object>) args[0];
-			if (isVarAssignment(arg))
+			int op0Index;
+			if ((op0Index = isVarAssignment(arg)) > -1)
 			{
 				boolean getValueModif = arg.charAt(0) == '$', genericVar = args.length > 4 && args[4] == GenericScope.class;
 				if (getValueModif)
+				{
 					arg = arg.substring(1);
+					op0Index--;
+				}
 
-				String vars[] = splitValues(arg, 0, false, new char[] {'?'}, '=', ':'), valStr;
+				String vars[] = splitValues(arg, op0Index, 0, 1, new char[] {'?'}, '=', ':'), valStr;
 
 				Object val = null;
 				int iVal = vars.length-1;
@@ -74,14 +78,14 @@ public Object parse(ParserRegistry myHomeRegistry, String arg, Object... args)
 					val = myHomeRegistry.parse(valStr, args);
 				}
 
-				eachVar: for (int i = 0; i < iVal; i++) // Support for assigning multiple vars to the same value...
+				eachVar: for (int i = 0; i < iVal; i++) // Support for assigning multiple vars to the same value... Yea this is not the prettiest code but it does the job and mainly it does it fast so shut up!
 				{
 					String var = vars[i];
-					if (!genericVar && contains(var, ' '))
+					if (!genericVar && contains(var, ' '))				
 						LogProvider.instance.logErr("Variable name \"" + var + "\" is invalid, blank characters are not allowed!", null);
-					else if (var.indexOf('.') > -1)
+					else if ((op0Index = var.indexOf('.')) > -1)
 					{
-						String[] path = splitValues(var, '.');
+						String[] path = splitValues(var, op0Index, 0, 0, new char[0],  '.');
 						int iLast = path.length-1, j = 0;
 
 						backlook: do
@@ -188,11 +192,11 @@ public void setJsonStyle(boolean jsonStyle)
 	/**
 	 * @param s | CharSequence to search!
 	 * 
-	 * @return true if inserted expression is variable assignment expression such as <code>variable = 4</code> otherwise false!
+	 * @return Index of first assignment operator ('=' or ':') if inserted expression is variable assignment expression such as <code>variable = 4</code>, otherwise -1!
 	 * 
 	 * @since 1.3.0
 	 */
-	public static boolean isVarAssignment(CharSequence s)
+	public static int isVarAssignment(CharSequence s)
 	{
 		for (int i = 0, brackets = 0, quote = 0, len = s.length(), oldCh = -1, chNext; i < len; i++)
 		{
@@ -203,9 +207,9 @@ public static boolean isVarAssignment(CharSequence s)
 			if (quote % 2 == 0)
 			{
 				if (ch == '?')
-					return false;
+					return -1;
 				else if (brackets == 0 && (ch == '=' || ch == ':') && !(oldCh == '=' || oldCh == ':' || oldCh == '!' || oldCh == '>'|| oldCh == '<') && (i >= len-1 || !((chNext = s.charAt(i+1)) == '=' || chNext == ':' || chNext ==  '!' || chNext == '>'|| chNext == '<')))
-					return true;	
+					return i;	
 				else if ((ch | ' ') == '{')
 					brackets++;
 				else if ((ch | ' ') == '}')
@@ -214,7 +218,7 @@ else if ((ch | ' ') == '}')
 			}
 			oldCh = ch;
 		}
-		return false;
+		return -1;
 	}
 
 //	public static <K, V> V getValueOf(GenericScope<K, V> scope, K... pathToScope)