Doing static static member invocation the right way... fixing ObjConv is

protocols expr bug, optimizing and improving, docs

Author: SimplyProgrammer

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

@@ -181,17 +181,17 @@ public static Object InvokeFunc(Object obj, Class<?> objCls, String name, Class<
 		try 
 		{
 			Method method = objCls.getMethod(name, argClasses);
-			Object resualt = method.invoke(obj, args);
-			return method.getReturnType().equals(void.class) ? VOID : resualt;
+			Object result = method.invoke(obj, args);
+			return method.getReturnType().equals(void.class) ? VOID : result;
 		}
 		catch (NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException find) 
 		{
 			for (Method method : objCls.getMethods()) 
 				if (method.getName().equals(name))
 					try
 					{
-						Object resualt = method.invoke(obj, args);
-						return method.getReturnType().equals(void.class) ? VOID : resualt;
+						Object result = method.invoke(obj, args);
+						return method.getReturnType().equals(void.class) ? VOID : result;
 					}
 					catch (IllegalArgumentException e) 
 					{}
@@ -224,8 +224,8 @@ public static <T> T Clone(T obj)
 	/**
 	 * @param obj | Object to clone.
 	 * @param parsersToUse | Parsers that will be used for cloning...
-	 * @param converterArgs | Argument for {@link DataConverter#objToString(Registry, Object, Object...)}!
-	 * @param parserArgs | Arguments for {@link DataParser#parseObj(Registry, String, boolean, Class[], Object...)}!
+	 * @param converterArgs | Argument for {@link DataConverter#objToString(Object, Object...)}!
+	 * @param parserArgs | Arguments for {@link ParserRegistry#parse(String, boolean, Class, Object...)}!
 	 * 
 	 * @return Cloned object using {@link DataParser}, {@link DataConverter} and {@link SerializationProtocol} or the same object as inserted one if cloning is not possible, for instance when protocol was not found and object is not instance of {@link Cloneable}.
 	 * This clone function will always prioritized the Protocol variation, regular cloning is used only when there is no protocol registered or exception occurs. <br>
@@ -534,18 +534,21 @@ public static String[] splitValues(String s, int i, int limit, int splittingStra
 
 		List<String> result = new ArrayList<>();
 
-		int brackets = 0, quote = 0, lastIndex = 0, len = s.length();
+		int brackets = 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 == '"')
-				quote++;
-			
-			if (quote % 2 == 0)
+			{
+				do if (++i >= len)
+					throw new IllegalArgumentException("Unclosed or missing quotes in: " + s);
+				while (s.charAt(i) != '"');
+			}
+			else
 			{
 				if (isOneOf(ch, splitBreaks))
 				{
-					brackets = quote = 0;
+					brackets = 0;
 					break;
 				}
 
@@ -576,13 +579,8 @@ else if ((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, len).trim());
-		}
-		
+
+		result.add(s.substring(lastIndex, len).trim());
 		return result.toArray(new String[0]);
 	}
 
@@ -609,98 +607,101 @@ public static int indexOfNotInObj(CharSequence s, char... oneOf)
 	 * 
 	 * @return Index of first character found that is not in object meaning it is not in string nor between '{' or '[' and ']' or '}', otherwise -1!
 	 * 
-	 * @since 1.3.5
+	 * @since 1.3.5 (expanded in 1.3.8)
 	 */
 	public static int indexOfNotInObj(CharSequence s, int from, int to, int defaultReturn, boolean firstIndex, char... oneOf)
 	{
-		for (int brackets = 0, quote = 0; from < to; from++)
+		for (int brackets = 0; from < to; from++)
 		{
 			char ch = s.charAt(from);
 			if (ch == '"')
-				quote++;
-	
-			if (quote % 2 == 0)
+				while (++from < to && s.charAt(from) != '"');
+			else if (brackets == 0 && /*oneOf.length == 0 ? ch == oneOf[0] :*/ isOneOf(ch, oneOf))
 			{
-				if (brackets == 0 && /*oneOf.length == 0 ? ch == oneOf[0] :*/ isOneOf(ch, oneOf))
-				{
-					if (firstIndex)
-						return from;
-					defaultReturn = from;
-				}
-				else if ((ch | ' ') == '{')
-					brackets++;
-				else if ((ch | ' ') == '}')
-				{
-					if (brackets > 0)
-						brackets--;
-					else
-						throw new IllegalArgumentException("Missing closing bracket in: " + s);
-				}
+				if (firstIndex)
+					return from;
+				defaultReturn = from;
+			}
+			else if ((ch | ' ') == '{')
+				brackets++;
+			else if ((ch | ' ') == '}')
+			{
+				if (brackets > 0)
+					brackets--;
+				else
+					throw new IllegalArgumentException("Missing closing bracket in: " + s);
 			}
 		}
 		return defaultReturn;
 	}
 
 	/**
 	 * @param s | CharSequence to search!
-	 * @param sequenceToFind | CharSequence to find!
+	 * @param sequencesToFind | Character sequences to find, index of any of these will be returned accordingly, none of these should contain and object structure!
 	 * 
 	 * @return Index of first found CharSequence that is not in object meaning it is not in string nor between '{' or '[' and ']' or '}'!
 	 * 
 	 * @since 1.3.0
 	 */
-	public static int indexOfNotInObj(CharSequence s, CharSequence sequenceToFind)
+	public static int indexOfNotInObj(CharSequence s, CharSequence... sequencesToFind)
 	{
-		return indexOfNotInObj(s, sequenceToFind, true);
+		return indexOfNotInObj(s, 0, s.length(), -1, true, sequencesToFind);
 	}
 
 	/**
 	 * @param s | CharSequence to search!
-	 * @param sequenceToFind | CharSequence to find!
+	 * @param from | The beginning index, where to start the search (should be 0 in most cases).
+	 * @param to | Ending index of search (exclusive, should be s.length()).
+	 * @param defaultReturn | Index to return by default (usually -1).
 	 * @param firstIndex | If true, first index will be returned, if false last index will be returned.
+	 * @param sequencesToFind | Character sequences to find, index of any of these will be returned accordingly, none of these should contain and object structure!
 	 * 
 	 * @return Index of first found CharSequence that is not in object meaning it is not in string nor between '{' or '[' and ']' or '}'!
 	 * 
-	 * @since 1.3.5
+	 * @since 1.3.5 (expanded in 1.3.8)
 	 */
-	public static int indexOfNotInObj(CharSequence s, CharSequence sequenceToFind, boolean firstIndex)
+	public static int indexOfNotInObj(CharSequence s, int from, int to, int defaultReturn, boolean firstIndex, CharSequence... sequencesToFind)
 	{
-		int len = s.length(), lenToFind = sequenceToFind.length();
-		if (len < lenToFind)
-			return -1;
-		int found = -1;
-		for (int i = 0, brackets = 0, quote = 0, match = 0; i < len; i++)
+		if (sequencesToFind.length < 1)
+			return defaultReturn;
+
+		for (int brackets = 0; from < to; from++)
 		{
-			char ch = s.charAt(i);
+			char ch = s.charAt(from);
 			if (ch == '"')
-				quote++;
-			
-			if (quote % 2 == 0)
+				while (++from < to && s.charAt(from) != '"');
+			else if ((ch | ' ') == '{')
+				brackets++;
+			else if ((ch | ' ') == '}')
 			{
-				if (brackets == 0 && ch == sequenceToFind.charAt(match++))
+				if (brackets > 0)
+					brackets--;
+				else
+					throw new IllegalArgumentException("Missing closing bracket in: " + s);
+			}
+			else if (brackets == 0)
+			{
+				findMatch: for (int cur = 0, seqsLen = sequencesToFind.length; cur < seqsLen; cur++) 
 				{
-					if (match == lenToFind)
+					CharSequence currentMatch;
+					if (ch == (currentMatch = sequencesToFind[cur]).charAt(0))
 					{
-						found = i - match + 1;
-						if (firstIndex)
-							return found;
-						match = 0;
+						int match = 1, lenToFind = currentMatch.length();
+						for (int i = from+1; i < to && match < lenToFind; i++, match++)
+							if (s.charAt(i) != currentMatch.charAt(match))
+								continue findMatch;
+						
+						if (match == lenToFind)
+						{
+							defaultReturn = from;
+							if (firstIndex)
+								return defaultReturn;
+						}
 					}
 				}
-				else if ((ch | ' ') == '{')
-					brackets++;
-				else if ((ch | ' ') == '}')
-				{
-					if (brackets > 0)
-						brackets--;
-					else
-						throw new IllegalArgumentException("Missing closing bracket in: " + s);
-				}
-				else
-					match = 0;
 			}
 		}
-		return found;
+		return defaultReturn;
 	}
 
 	/**
@@ -798,14 +799,26 @@ public static boolean equalsLowerCase(CharSequence str, CharSequence lowerCaseOt
 	 * @param str | String to display!
 	 * @param pos | Position to display!
 	 * 
-	 * @return String with displayed position by using »!
+	 * @return String with displayed position by using » or ^ under it!
 	 * Use for debugging or error printing!
 	 * 
 	 * @since 1.3.2
 	 */
 	public static String showPosInString(CharSequence str, int pos)
 	{
-		return str.subSequence(0, pos) + "»" + str.subSequence(pos, str.length());	
+		if (pos < 0)
+			return str.toString();
+
+		try
+		{
+			if (contains(str, '\n', '\r'))
+				return str.subSequence(0, pos) + "»" + str.subSequence(pos, str.length());
+			return multilpy(' ', pos).append('^').insert(0, '\n').insert(0, str).toString();
+		}
+		catch (IndexOutOfBoundsException e)
+		{
+			return str.toString();
+		}
 	}
 
 	/* Arrays */

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

@@ -1,7 +1,5 @@
 package org.ugp.serialx.converters;
 
-import org.ugp.serialx.Registry;
-
 /**
  * This is DataParser with extended functionality! {@link DataConverter} can also parse data like DataParser but is also capable of converting them back to string!
  * This to string convertation is performed by {@link DataConverter#toString(Object)} and result of this convertation supposed to be parsable by {@link DataConverter#parse(String, Object...)} meaning one converter supposed to be parsing and converting via the same string format!
@@ -15,7 +13,7 @@
 public interface DataConverter extends DataParser
 {
 	/**
-	 * @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 myHomeRegistry | Registry where this parser is registered provided by {@link ParserRegistry#parse(String, boolean, Class, Object...)} otherwise it demands on implementation (it should not be null)!
 	 * @param obj | Object to convert into string!
 	 * @param args | Some additional args. This can be anything and it demands on implementation of DataConverter. Default SerialX API implementation will provide some flags about formating (2 ints)!
 	 * 

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

@@ -44,7 +44,7 @@ public interface DataParser
 	public static final ParserRegistry REGISTRY = new ParserRegistry(new VariableParser(), new StringConverter(), new ProtocolConverter(), new NumberConverter(), new BooleanConverter(), new CharacterConverter(), new NullConverter(), new SerializableBase64Converter());
 
 	/**
-	 * @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 myHomeRegistry | Registry where this parser is registered provided by {@link DataParser#parse(String, boolean, Class, Object...)} otherwise it demands on implementation (it should not be null)!
 	 * @param str | Source string, preferably trimed!
 	 * @param args | Some additional args. This can be anything and it demands on implementation of DataParser. Default SerialX API implementation will provide one optional argument with {@link Scope} that value was loaded from!
 	 * 

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

@@ -9,10 +9,11 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Base64;
+import java.util.HashSet;
+import java.util.Set;
 
 import org.ugp.serialx.GenericScope;
 import org.ugp.serialx.LogProvider;
-import org.ugp.serialx.Registry;
 import org.ugp.serialx.Scope;
 import org.ugp.serialx.Serializer;
 import org.ugp.serialx.Utils;
@@ -70,17 +71,17 @@ public class ProtocolConverter implements DataConverter
 	 */
 	protected boolean useBase64IfCan = false;
 
-	protected boolean allowStaticMemberInvocation = false;
+	protected Set<Class<?>> invokableClasses = new HashSet<>(Arrays.asList(Math.class, Scope.class, Double.class, Float.class, String.class));
 
 	@Override
 	public Object parse(ParserRegistry myHomeRegistry, String str, Object... compilerArgs)
 	{	
-		int len;	
+		int len;
 		if ((len = str.length()) > 0)
 		{
 			if ((str.charAt(0) | ' ') == '{' && (str.charAt(--len) | ' ') == '}') // Unwrap if wrapped in {}
 				str = str.substring(1, len).trim();
-			
+
 			Class<?> objClass;
 			if ((objClass = getProtocolExprClass(str, compilerArgs)) != null) // Get class of protocol expr or continue if there is none
 				return parse(myHomeRegistry, objClass, str, compilerArgs);
@@ -117,9 +118,9 @@ protected Object parse(ParserRegistry myHomeRegistry, Class<?> objClass, String
 		if ((args[0].charAt(0) | ' ') != '{' && (nameIndex = args[0].indexOf("::")) > -1) //Is static member invocation
 		{
 			String memberName = args[0].substring(nameIndex + 2);
-			if (!isAllowStaticMemberInvocation())
+			if (!getInvokableClasses().contains(objClass))
 			{
-				LogProvider.instance.logErr("Invocation of static member \"" + memberName + "\" from class \"" + objClass.getName() + "\" was denied because this feature is disabled by default for security reasons!", null);
+				LogProvider.instance.logErr("Invocation of static member \"" + memberName + "\" from class \"" + objClass.getName() + "\" was denied because it was not enabled for this class for security reasons!", null);
 				return null;
 			}
 
@@ -169,7 +170,7 @@ public CharSequence toString(ParserRegistry myHomeRegistry, Object arg, Object..
 	}
 
 	/**
-	 * @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 myHomeRegistry | Registry where this parser is registered provided by {@link ParserRegistry#parse(String, boolean, Class, Object...)} otherwise it demands on implementation (it should not be null)!
 	 * @param obj | Object to convert into string!
 	 * @param preferedProtocol | Protocol to use preferably.
 	 * @param args | Some additional args. This can be anything and it demands on implementation of DataConverter. Default SerialX API implementation will provide some flags about formating (2 ints)!
@@ -277,23 +278,14 @@ public void setUseBase64IfCan(boolean useBase64IfCan)
 	}
 
 	/**
-	 * @return True if invocation of static members (:: operator) is allowed (false by default)!
-	 * 
-	 * @since 1.3.8
-	 */
-	public boolean isAllowStaticMemberInvocation()
-	{
-		return allowStaticMemberInvocation;
-	}
-
-	/**
-	 * @param allowStaticMemberInvocation | Enable/disable the invocation of static members (:: operator) (false by default)!
+	 * @return Classes that are eligible for public static member invocation (:: operator)!<br>
+	 * Note: {@link Math} {@link Scope} {@link Double}, {@link Float} and {@link String} are invokable by default! If you want to disable static member invocation completely, call {@link Set#clear()} on this method!
 	 * 
-	 * @since 1.3.8
+	 * @since 1.3.8 
 	 */
-	public void setAllowStaticMemberInvocation(boolean allowStaticMemberInvocation) 
+	public Set<Class<?>> getInvokableClasses() 
 	{
-		this.allowStaticMemberInvocation = allowStaticMemberInvocation;
+		return invokableClasses;
 	}
 
 	/**

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

@@ -5,7 +5,6 @@
 import static org.ugp.serialx.Utils.splitValues;
 
 import org.ugp.serialx.GenericScope;
-import org.ugp.serialx.Registry;
 import org.ugp.serialx.Scope;
 import org.ugp.serialx.Serializer;
 
@@ -51,7 +50,7 @@ public Object getMemberOperator(Object source, Object member)
 	}
 
 	/**
-	 * @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 myHomeRegistry | Registry where this parser is registered provided by {@link ParserRegistry#parse(String, boolean, Class, Object...)} otherwise it demands on implementation (it should not be null)!
 	 * @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.
@@ -112,4 +111,4 @@ else if (newModif = str.endsWith("::new"))
 
 		return CONTINUE;
 	}
-}
+}