testing, fixing, jdocking, finilizing

Author: SimplyProgrammer

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

@@ -534,7 +534,7 @@ public Object apply(Object t)
 				if (t instanceof Serializer)
 				{
 					GenericScope<String, ?> srl = ((Scope) t).transform(this);
-					return new GenericScope<>(srl.variables(), srl.values(), srl.getParent());
+					return new Scope(srl.variables(), srl.values(), srl.getParent());
 				}
 				return t;
 			}

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

@@ -223,64 +223,62 @@ public static <T> T Clone(T obj)
 
 	/**
 	 * @param obj | Object to clone.
-	 * @param 
+	 * @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...)}!
 	 * 
 	 * @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>
 	 * Note: If there are protocols to serialize inserted object and all its sub-objects and variables then this clone will be absolute deep copy, meaning that making any changes to this cloned object or to its variables will not affect original one in any way! 
-	 * But keep in mind that this clone is absolute hoverer, based on protocols used, it does not need to be an 100% copy!
+	 * But keep in mind that this clone is absolute hoverer, based on protocols used, it does not need to be an 100% copy! Also note that certain objects such as primitive wrappers ({@link Integer}, {@link Float} etc...) will not be necessarily cloned since cloning them is not reasonable...
 	 * 
 	 * @since 1.3.2
 	 */
 	@SuppressWarnings("unchecked")
 	public static <T> T Clone(T obj, Registry<DataParser> parsersToUse, Object[] converterArgs, Object... parserArgs)
 	{
 		if (obj == null) 
-			return obj;
-		else if (obj.getClass() == Byte.class)
-			return (T) new Byte((byte) obj);
-		else if (obj.getClass() == Short.class)
-			return (T) new Short((short) obj);
-		else if (obj.getClass() == Integer.class)
-			return (T) new Integer((int) obj);
-		else if (obj.getClass() == Long.class)
-			return (T) new Long((long) obj);
-		else if (obj.getClass() == Float.class)
-			return (T) new Float((float) obj);
-		else if (obj.getClass() == Double.class)
-			return (T) new Double((double) obj);
-		else if (obj.getClass() == Character.class)
-			return (T) new Character((char) obj);
-		else if (obj.getClass() == Boolean.class)
-			return (T) new Boolean((boolean) obj);
-		else if (obj.getClass() == String.class)
+			return null;
+		if (obj.getClass() == Byte.class)
+			return (T) (Byte) ((byte) obj); // valueOf call...
+		if (obj.getClass() == Short.class)
+			return (T) (Short) ((short) obj);
+		if (obj.getClass() == Integer.class)
+			return (T) (Integer) ((int) obj);
+		if (obj.getClass() == Long.class)
+			return (T) (Long) ((long) obj);
+		if (obj.getClass() == Float.class)
+			return (T) (Float) ((float) obj);
+		if (obj.getClass() == Double.class)
+			return (T) (Double) ((double) obj);
+		if (obj.getClass() == Character.class)
+			return (T) (Character) ((char) obj);
+		if (obj.getClass() == Boolean.class)
+			return (T) (Boolean) ((boolean) obj);
+		if (obj.getClass() == String.class)
 			return (T) new String((String) obj);
-		else
+		
+		ParserRegistry parsers = parsersToUse instanceof ParserRegistry ? (ParserRegistry) parsersToUse : new ParserRegistry(parsersToUse);
+		
+		Object cln = parsers.parse(parsers.toString(obj, converterArgs).toString(), parserArgs);
+		if (cln != null && cln != VOID)
+			return (T) cln;
+		
+		if (obj instanceof Cloneable)
 		{
-			ParserRegistry parsers = parsersToUse instanceof ParserRegistry ? (ParserRegistry) parsersToUse : new ParserRegistry(parsersToUse);
-			
-			Object cln = parsers.parse(parsers.toString(obj, converterArgs).toString(), parserArgs);
-			if (cln != null && cln != VOID)
-				return (T) cln;
-			
-			if (obj instanceof Cloneable)
+			try 
 			{
-				try 
-				{
-					Method method = Object.class.getDeclaredMethod("clone");
-					method.setAccessible(true);
-					return (T) method.invoke(obj);
-				} 
-				catch (Exception e) 
-				{
-					throw new RuntimeException(e);
-				}
+				Method method = Object.class.getDeclaredMethod("clone");
+				method.setAccessible(true);
+				return (T) method.invoke(obj);
+			} 
+			catch (Exception e) 
+			{
+				throw new RuntimeException(e);
 			}
-			LogProvider.instance.logErr("Unable to clone " + obj.getClass() + ": " + obj, null);
-			return obj;
 		}
+		LogProvider.instance.logErr("Unable to clone " + obj.getClass() + ": " + obj, null);
+		return obj;
 	}
 
 	/**

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

@@ -259,12 +259,15 @@ else if (ch != 127 && ch != '+')
 	}
 
 	/**
+	 * @deprecated THIS IS NO LONGER NECESSARY BECAUSE BECAUSE {@link NumberConverter#numberOf(CharSequence, char, int, int, int)} CAN DO THE SAME THING MUCH FASTET!
+	 * 
 	 * @param num | Number string to format!
 	 * 
 	 * @return Original string with formated sign and deleted '_'!
 	 * 
 	 * @since 1.3.0
 	 */
+	@Deprecated
 	public static String normFormatNum(String num)
 	{
 		if (num.length() > 2)

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

@@ -43,7 +43,7 @@ public class StringConverter implements DataConverter
 	 * 
 	 * @since 1.2.0 (moved to {@link StringConverter} since 1.3.0)
 	 */
-	public static boolean serializeStringNormally = true; //TODO
+	protected boolean serializeStringNormally = true;
 
 	protected Map<String, String> parsingCache;
 
@@ -127,6 +127,26 @@ public Map<String, String> getParsingCache()
 		return parsingCache;
 	}
 
+	/**
+	 * @return Will return value of {@link StringConverter#serializeStringNormally}!
+	 * 
+	 * @since 1.3.7 (it was static before = not good)
+	 */
+	public boolean isSerializeStringNormally() 
+	{
+		return serializeStringNormally;
+	}
+
+	/**
+	 * @param serializeStringNormally | Set value of {@link StringConverter#serializeStringNormally}!
+	 * 
+	 * @since 1.3.7 (it was static before = not good)
+	 */
+	public void setSerializeStringNormally(boolean serializeStringNormally) 
+	{
+		this.serializeStringNormally = serializeStringNormally;
+	}
+
 	/**
 	 * @param obj | Object to stringify directly.
 	 * 

SerialX-core/src/main/java/org/ugp/serialx/protocols/ListProtocol.java

@@ -11,7 +11,7 @@
  *
  * @since 1.0.0 and applicable for {@link Collection} since 1.2.2
  */
-public class ListProtocol extends SerializationProtocol<Collection<?>> 
+public class ListProtocol extends SerializationProtocol<Collection<?>>
 {
 	@Override
 	public Object[] serialize(Collection<?> obj) 
@@ -24,7 +24,7 @@ public Collection<?> unserialize(Class<? extends Collection<?>> objectClass, Obj
 	{
 		if (objectClass.isInterface())
 			return new ArrayList<>(Arrays.asList(args));
-			
+
 		try
 		{
 			return objectClass.getConstructor(Collection.class).newInstance(Arrays.asList(args));

SerialX-json/src/main/java/org/ugp/serialx/json/converters/JsonCharacterConverter.java

@@ -2,27 +2,52 @@
 
 import org.ugp.serialx.converters.CharacterConverter;
 
-public class JsonCharacterConverter extends CharacterConverter {
-	
+/**
+ * {@link CharacterConverter} modified to match JSON more closely. It will serialize char as {@link String} since JSON does not know char...
+ * 
+ * @author PETO
+ * 
+ * @since 1.3.7
+ */
+public class JsonCharacterConverter extends CharacterConverter 
+{
 	protected boolean formatAsString;
 
-	public JsonCharacterConverter(boolean formatAsString) {
-		setFormatAsString(formatAsString); 
+	/**
+	 * @param formatAsString | If true, character will be serialized in a letter form. Otherwise it will be serialized as ASCII value (int).
+	 * 
+	 * @since 1.3.7
+	 */
+	public JsonCharacterConverter(boolean formatAsString) 
+	{
+		setFormatAsString(formatAsString);
 	}
 
 	@Override
 	public CharSequence toString(ParserRegistry myHomeRegistry, Object obj, Object... args) 
 	{
 		if (obj instanceof Character)
-			return isFormatAsString() ? obj.toString() : String.valueOf((int) (char) obj);
+			return isFormatAsString() ? "\""+obj+"\"" : String.valueOf((int) (char) obj);
 		return CONTINUE;
 	}
 
-	public boolean isFormatAsString() {
+	/**
+	 * @return True if character is going to be serialized in a letter form. If false, it will be serialized as ASCII value (int).
+	 * 
+	 * @since 1.3.7
+	 */
+	public boolean isFormatAsString()
+	{
 		return formatAsString;
 	}
 
-	public void setFormatAsString(boolean formatAsString) {
+	/**
+	 * @param formatAsString | If true, character will be serialized in a letter form. Otherwise it will be serialized as ASCII value (int).
+	 * 
+	 * @since 1.3.7
+	 */
+	public void setFormatAsString(boolean formatAsString) 
+	{
 		this.formatAsString = formatAsString;
 	}
 }

SerialX-json/src/main/java/org/ugp/serialx/json/converters/JsonNumberConverter.java

@@ -2,8 +2,15 @@
 
 import org.ugp.serialx.converters.NumberConverter;
 
-public class JsonNumberConverter extends NumberConverter {
-	
+/**
+ * {@link NumberConverter} modified to match JSON more closely. It will not use Juss number suffixes since JSON does not support them...
+ * 
+ * @author PETO
+ * 
+ * @since 1.3.7
+ */
+public class JsonNumberConverter extends NumberConverter 
+{
 	@Override
 	public CharSequence toString(ParserRegistry myHomeRegistry, Object obj, Object... args) 
 	{

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

@@ -52,7 +52,7 @@ public Object parse(ParserRegistry myHomeRegistry, String str, Object... args)
 					args[2] = runtimeGroupStack;
 				}
 				String mark = GROUP_MARK_OP + runtimeGroupStack.size() + GROUP_MARK_CLS;
-				runtimeGroupStack.put(mark, str.substring(opIndex+1, clsIndex));
+				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);

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

@@ -81,32 +81,40 @@ public Object parse(ParserRegistry myHomeRegistry, String arg, Object... args)
 				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, ' '))				
-						LogProvider.instance.logErr("Variable name \"" + var + "\" is invalid, blank characters are not allowed!", null);
-					else if ((op0Index = var.indexOf('.')) > -1)
+					if (!genericVar)
 					{
-						String[] path = splitValues(var, op0Index, 0, 0, new char[0],  '.');
-						int iLast = path.length-1, j = 0;
-						
-						backlook: do
+						if (contains(var, ' '))
 						{
-							Object sc;
-							if ((sc = getMemberOperator(scope, path[0])) != VOID) // Attempt to get only when exists...
+							LogProvider.instance.logErr("Variable name \"" + var + "\" is invalid, blank characters are not allowed!", null);
+							continue;
+						}
+
+						if ((op0Index = var.indexOf('.')) > -1)
+						{
+							String[] path = splitValues(var, op0Index, 0, 0, new char[0],  '.');
+							int iLast = path.length-1, j = 0;
+							
+							backlook: do
 							{
-								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;
+								Object sc;
+								if ((sc = getMemberOperator(scope, path[0])) != VOID) // Attempt to get only when exists...
+								{
+									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, false, args);
+									continue eachVar;
+								}
 							}
+							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);
+							continue;
 						}
-						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);
+					
+					setMemberOperator(myHomeRegistry, scope, var, val, genericVar, args);
 				}
 
 				return getValueModif ? val : VOID;

SerialX-operators/src/main/java/org/ugp/serialx/converters/operators/ArithmeticOperators.java

@@ -335,7 +335,7 @@ else if (pow <= Float.MAX_VALUE && pow >= Float.MIN_VALUE && (cof instanceof Flo
 			else if (cof instanceof Integer || cof2 instanceof Integer)
 				return (int) pow;
 		}
-		return null;	
+		return null;
 	}
 
 	/**