Small refactor of ArrConv, improving performance and security of

OpGroups, DataRegi is now DataParser

Author: SimplyProgrammer

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

@@ -820,8 +820,8 @@ public static String showPosInString(CharSequence str, int pos)
 	 */
 	public static Object castArray(Object[] sourceArray, Class<?> toType)
 	{
-		int len = sourceArray.length;
-		Object arr = Array.newInstance(ToClasses(toType)[0], len);
+		int len;
+		Object arr = Array.newInstance(ToClasses(toType)[0], len = sourceArray.length);
 		for (int i = 0; i < len; i++) 
 			Array.set(arr, i, sourceArray[i]);
 		return arr;

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

@@ -75,7 +75,7 @@ public static Object parseObj(String str, Object... args)
 	 *
 	 * @since 1.3.5
 	 */
-	public static class ParserRegistry extends Registry<DataParser>
+	public static class ParserRegistry extends Registry<DataParser> implements DataParser
 	{
 		private static final long serialVersionUID = -2598324826689380752L;
 
@@ -167,11 +167,11 @@ public DataConverter getConverterFor(Object obj, Object... args)
 		 */
 		public CharSequence toString(Object obj, Object... args)
 		{
-			CharSequence str = null;
+			CharSequence str;
 			if (convertingCache != null)
 				for (DataParser parser : convertingCache)
 					if (parser != null && (str = ((DataConverter) parser).toString(this, obj, args)) != CONTINUE)
-						return str; 
+						return str;
 
 			for (int i = 0, size = size(); i < size; i++) 
 			{
@@ -188,6 +188,28 @@ public CharSequence toString(Object obj, Object... args)
 			return null;
 		}
 
+		/**
+		 * @param parentRegistry | Registry provided by caller, but remember that {@link Registry} is also a {@link DataParser} and therefore this registry will be used instead of this argument.
+		 * @param str | Source string to parse using suitable parser from registry.
+		 * @param args | Additional arguments that will be obtained in {@link DataParser#parse(String, Object...)}!
+		 * 
+		 * @return Object that was parsed from obtained string using suitable parser. This method will iterate registry and try to parse string using each registered parser until suitable return is obtained by parse method of parser, first suitable result will be returned!
+		 * If no suitable parser/result was found, {@link DataParser#CONTINUE} will be returned, as it means that this {@link Registry} was not suitable as parser!<br>
+		 * Note: If this registry contains it self as parser (which should not happen) it will attempt to skip it self in order to not cause possible infinite recursion!
+		 * 
+		 * @see DataParser#parseObj(String, Object...)
+		 * 
+		 * @since 1.3.7
+		 */
+		@Override
+		public Object parse(ParserRegistry parentRegistry, String str, Object... args) 
+		{
+			Object result;
+			if ((result = parse(str, true, this == parentRegistry ? getClass() : null, args)) == str)
+				return CONTINUE;
+			return result;
+		}
+		
 		/**
 		 * @param str | Source string to parse using suitable parser from registry.
 		 * @param args | Additional arguments that will be obtained in {@link DataParser#parse(String, Object...)}!
@@ -204,7 +226,7 @@ public Object parse(String str, Object... args)
 
 		/**
 		 * @param str | Source string to parse using suitable parser from registry.
-		 * @param returnAsStringIfNotFound | If true, inserted string will be returned instead of null and error message!
+		 * @param returnAsStringIfNotFound | If true, inserted string will be returned instead of null and error message in case of suitable parser not found!
 		 * @param ignore | {@link DataParser} class to ignore!
 		 * @param args | Additional arguments that will be obtained in {@link DataParser#parse(String, Object...)}!
 		 * 
@@ -215,7 +237,7 @@ public Object parse(String str, Object... args)
 		 */
 		public Object parse(String str, boolean returnAsStringIfNotFound, Class<? extends DataParser> ignore, Object... args)
 		{
-			Object obj = null; 
+			Object obj;
 			if (parsingCache != null)
 				for (DataParser parser : parsingCache)
 					if (parser != null && (ignore == null || ignore != parser.getClass()) && (obj = parser.parse(this, str, args)) != CONTINUE)
@@ -345,5 +367,6 @@ public DataParser[] getConverterCache()
 		{
 			return convertingCache;
 		}
+
 	}
 }

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

@@ -51,32 +51,35 @@ public Object parse(ParserRegistry myHomeRegistry, String str, Object... args)
 	{
 		if (indexOfNotInObj(str, ' ') > 0)
 		{
-			boolean findArrType = true;
-			if (args.length > 1 && args[1] instanceof Boolean)
-				findArrType = (boolean) args[1];
-			
 			String[] strObjs = tokenize(str);
-			int len = strObjs.length;
-			Object[] objs = new Object[len];
+			int len, i = 0;
+			Object[] objs = new Object[len = strObjs.length];
 
-			Class<?> arrClass = null;
-			for (int i = 0; i < len; i++) 
+			if (args.length < 2 || !(args[1] instanceof Boolean) || (boolean) args[1])
 			{
-				Object obj = objs[i] = myHomeRegistry.parse(strObjs[i], args);
-				if (obj != null)
-					if (arrClass == null)
-						arrClass = obj.getClass();
-					else if (arrClass != obj.getClass())
-						arrClass = Object.class;	
-			}
-			
-			if (findArrType && arrClass != null && !arrClass.equals(Object.class))
-				try
+				Class<?> arrClass = null;
+				for (; i < len; i++) 
 				{
-					return castArray(objs, arrClass);
+					Object obj = objs[i] = myHomeRegistry.parse(strObjs[i], args);
+					if (obj != null)
+						if (arrClass == null)
+							arrClass = obj.getClass();
+						else if (arrClass != obj.getClass())
+							arrClass = Object.class;	
 				}
-				catch (IllegalArgumentException e) 
-				{}
+				
+				if (arrClass != null && arrClass != Object.class)
+					try
+					{
+						return castArray(objs, arrClass);
+					}
+					catch (IllegalArgumentException e) 
+					{}
+				return objs;
+			}
+			
+			for (; i < len; i++) 
+				objs[i] = myHomeRegistry.parse(strObjs[i], args);
 			return objs;
 		}
 		return CONTINUE;

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

@@ -7,7 +7,6 @@
 import java.util.Map;
 
 import org.ugp.serialx.LogProvider;
-import org.ugp.serialx.Serializer;
 import org.ugp.serialx.converters.DataParser;
 
 /**
@@ -27,46 +26,59 @@
 public class OperationGroups implements DataParser 
 {
 	/**
+	 * @deprecated (since 1.3.7) DO NOT USE, USE {@link OperationGroups#groupMark} instead! <br>
+	 * 
 	 * Opening and closing of group mark!
 	 * 
 	 * @since 1.3.0
 	 */
-	public static final String GROUP_MARK_OP = new String(new char[] {127, 128, 129}), GROUP_MARK_CLS = new String(new char[] {129, 128, 127});
+	@Deprecated
+	public static final char[] GROUP_MARK_OP = new char[] {127, 128, 129}, GROUP_MARK_CLS = new char[] {129, 128, 127};
+	
+	/**
+	 * Character marking the opening of {@link OperationGroups} mark in processed string, closing should be marked as this character -1.<br>
+	 * This character is generated in sami-random fashion but it will never be an ASCII character.
+	 * 
+	 * @since 1.3.7
+	 */
+	protected final char groupMark = (char) (System.nanoTime() | 128);
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Object parse(ParserRegistry myHomeRegistry, String str, Object... args) 
+	public Object parse(ParserRegistry myHomeRegistry, String str, Object... args)
 	{
 		if (str.length() > 1)
 		{
-			int opIndex = indexOfOpening(str, 0, '('), clsIndex = -1;
+			int opIndex = indexOfOpening(str, 0, '('), clsIndex;
 			if (opIndex > -1 && (clsIndex = indexOfClosing(str, opIndex, new char[] {'('}, ')')) > -1)
 			{
-				Map<String, String> runtimeGroupStack = new HashMap<>();
+				Map<Integer, String> runtimeGroups;
 				if (args.length > 2 && args[2] instanceof Map)
-					runtimeGroupStack = (Map<String, String>) args[2];
+					runtimeGroups = (Map<Integer, String>) args[2];
 				else
 				{
 					if (args.length < 3)
 						args = Arrays.copyOf(args, 3);
-					args[2] = runtimeGroupStack;
+					args[2] = runtimeGroups = new HashMap<>();
 				}
-				String mark = GROUP_MARK_OP + runtimeGroupStack.size() + GROUP_MARK_CLS;
-				runtimeGroupStack.put(mark, str.substring(opIndex+1, clsIndex).trim());
 
-				StringBuilder sb = new StringBuilder(str).replace(opIndex, clsIndex+1, mark);
-				return myHomeRegistry.parse(sb.toString(), args);
+				int groupId;
+				runtimeGroups.put(groupId = runtimeGroups.size(), str.substring(opIndex+1, clsIndex).trim());
+				
+				StringBuilder newStr = new StringBuilder(str).replace(opIndex, clsIndex+1, new StringBuilder().append(groupMark).append(groupId).append((char) (groupMark-1)).toString());
+				return myHomeRegistry.parse(newStr.toString(), args);
 			}
 
-			if (isGroupMark(str))
+			int groupId;
+			if ((groupId = isGroupMark(str, groupMark)) != -1)
 			{
 				if (args.length > 2 && args[2] instanceof Map)
 				{
-					Map<String, String> runtimeGroupStack = (Map<String, String>) args[2];
+					Map<Integer, String> runtimeGroups = (Map<Integer, String>) args[2];
 
 					Object[] newArgs = args.clone();
-					newArgs[2] = new HashMap<String, String>();
-					return myHomeRegistry.parse(runtimeGroupStack.get(str), newArgs);
+					newArgs[2] = new HashMap<Integer, String>();
+					return myHomeRegistry.parse(runtimeGroups.get(groupId), newArgs);
 				}
 				LogProvider.instance.logErr("Runtime group stack is trying to be accessed using " + str + " however it was not provided yet!", null);
 				return null;
@@ -78,38 +90,38 @@ public Object parse(ParserRegistry myHomeRegistry, String str, Object... args)
 
 	/**
 	 * @param s | Char sequence to check!
+	 * @param groupMark | Opening character identifying this group mark, closing should be this character -1
 	 * 
-	 * @return Return true if inserted CharSequence match the runtime group mark wrapper!
+	 * @return Id of the group mark if inserted CharSequence matches the runtime group mark wrapper format! -1 otherwise.<br>
 	 * This is used for internal purposes of {@link OperationGroups}.
 	 * 
 	 * @since 1.3.0
 	 */
-	public static boolean isGroupMark(CharSequence s) 
+	public static int isGroupMark(CharSequence s, char groupMark) 
 	{
-		String op = GROUP_MARK_OP, cls = GROUP_MARK_CLS;
-		int lo = op.length(), lc = cls.length(), len = s.length();
-		if (len < lo + lc + 1)
-			return false;
-		for (int i = 0; i < lo; i++)
-			if (s.charAt(i) != op.charAt(i))
-				return false;
+		int i = s.length()-1;
+		if (i < 2 || s.charAt(0) != groupMark-- || s.charAt(i--) != groupMark)
+			return -1;
 
-		for (int i = lo, ch; i < len - lc; i++)
+		int groupId;
+		if ((groupId = s.charAt(i--) - '0') < 0 || groupId > 9)
+			return -1;
+		for (int ch, baseCof = 10; i >= 1; i--, baseCof *= 10)
+		{
 			if ((ch = s.charAt(i)) < '0' || ch > '9')
-				return false;
+				return -1;
+			groupId += (ch - '0') * baseCof;
+		}
 
-		for (int i = 0; i < lc; i++)
-			if (s.charAt(len-i-1) != cls.charAt(lc-i-1))
-				return false;
-		return true;
+		return groupId;
 	}
 
 	/**
 	 * @param str | CharSequence to search!
 	 * @param from | Beginning index of search!
 	 * @param openings | Openings to find!
 	 * 
-	 * @return Return index of first opening char found if is not in object or -1 if there is no opening found similar to {@link Serializer#indexOfNotInObj(CharSequence, char...)}!
+	 * @return Return index of first opening char found if is not in object or -1 if there is no opening found similar to {@link org.ugp.serialx.Utils#indexOfNotInObj(CharSequence, char...)}!
 	 * 
 	 * @since 1.3.0
 	 */
@@ -145,7 +157,7 @@ else if (brackets == 0 && isOneOf(ch, openings))
 	 * @param openings | Openings to count with!
 	 * @param closing | Closings to find!
 	 * 
-	 * @return Return index of first closing char found if is not in object or -1 if no closing is found similar to {@link Serializer#indexOfNotInObj(CharSequence, char...)}! 
+	 * @return Return index of first closing char found if is not in object or -1 if no closing is found similar to {@link org.ugp.serialx.Utils#indexOfNotInObj(CharSequence, char...)}! 
 	 * 
 	 * @since 1.3.0
 	 */