finishing and testing readAndParse, implementing ability for custom

formating at Serializer lvl + ability to disable formatting completely
(important), modif. some converters accordingly (Json specif logic
separation into JsonVarConverter...).
Optimizations and small API changes

Author: SimplyProgrammer

SerialX-core/pom.xml

@@ -10,7 +10,7 @@
 
 	<groupId>org.ugp.serialx</groupId>
 	<artifactId>serialx-core</artifactId>
-	<version>1.3.8</version>
+	<version>1.3.9-SNAPSHOT</version>
 
 	<name>SerialX core</name>
 	<description>Core of SerialX. Contains core features and utilities shared across the library.</description>

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

@@ -59,6 +59,8 @@ public abstract class Serializer extends Scope
 	protected ParserRegistry parsers;
 	protected ProtocolRegistry protocols;
 
+	protected byte format = 0;
+	
 	/**
 	 * @param values | Initial independent values to be added in to this scope!
 	 * 
@@ -257,16 +259,17 @@ public String toString(boolean serialize) throws IOException
 
 	/**
 	 * @param f | File to write in. This must be a text file.
+	 * @param args | Additional arguments to use, exact usage and behavior of them is based on specific implementation of this function (they should not be serialized)!
 	 * 
 	 * @return String with variables and objects serialized in specific format.
 	 * 
 	 * @throws IOException if file can't be opened or serialization fails!
 	 * 
 	 * @since 1.1.5		
 	 */
-	public void SerializeTo(File f) throws IOException
+	public void SerializeTo(File f, Object... args) throws IOException
 	{
-		SerializeTo(false, f);
+		SerializeTo(false, f, args);
 	}
 
 	/**
@@ -472,9 +475,23 @@ public <T extends Serializer> T emptyClone(T newEmptyInstance, GenericScope<?, ?
 	{
 		newEmptyInstance.setParsers(getParsers());
 		newEmptyInstance.setProtocols(getProtocols());
+		newEmptyInstance.setFormat(getFormat());
 		newEmptyInstance.parent = parent;
 		return newEmptyInstance;
-	} 
+	}
+	
+	@Override
+	public Scope clone()
+	{
+		Scope scope = super.clone();
+		if (scope instanceof Serializer)
+		{
+			((Serializer) scope).setParsers(getParsers());
+			((Serializer) scope).setProtocols(getProtocols());
+			((Serializer) scope).setFormat(getFormat());
+		}
+		return scope;
+	}
 
 	/**
 	 * @return {@link Registry} with parsers that this {@link Serializer} uses!
@@ -607,18 +624,27 @@ public <A extends Appendable> A SerializeAsSubscope(A source, Object... args) th
 	 * @since 1.3.5
 	 */
 	@SuppressWarnings("unchecked")
-	public <A extends Appendable> A SerializeAsSubscope(A source, char[] wrappingBrackets, Object... args) throws IOException
+	public <A extends Appendable> A SerializeAsSubscope(A source, final char[] wrappingBrackets, Object... args) throws IOException
 	{
-		int tabs = 0;
-		if (args.length > 1 && args[1] instanceof Integer)
+		source.append(wrappingBrackets[0]);
+		if (isEmpty())
+			return (A) source.append(wrappingBrackets[1]);
+
+		if (format == 0) // No format...
 		{
-			tabs = (int) args[1];
-			args[1] = tabs + 1;
+			if (args.length > 1 && args[1] instanceof Integer)
+				args[1] = ((int) args[1]) + 1;
+			return (A) SerializeTo(source, args).append(wrappingBrackets[1]);
 		}
-		source.append(wrappingBrackets[0]);
-		if (!isEmpty())
-			source = (A) SerializeTo(source.append('\n'), args).append('\n').append(multilpy('\t', tabs));
-		return (A) source.append(wrappingBrackets[1]);
+
+		int tabs;
+		if (args.length > 1 && args[1] instanceof Integer)
+			args[1] = (tabs = (int) args[1]) + 1;
+		else
+			tabs = 0;
+		
+		return (A) SerializeTo(source.append('\n'), args).append('\n').append(multilpy('\t', tabs))
+					.append(wrappingBrackets[1]);
 	}
 
 	/**
@@ -648,6 +674,28 @@ public <T> T getParsed(String variableWithStringValue, Object... args)
 	{
 		return (T) getParsers().parse(getString(variableWithStringValue), args);
 	}
+
+	/**
+	 * @return Non 0 value if proper indentation and newline characters should be used when serializing. Default is 0, no formating...
+	 * The exact behavior of other values will depend on the specific implementation of {@link Serializer#SerializeTo(Appendable, Object...)}
+	 * 
+	 * @since 1.3.9
+	 */
+	public byte getFormat() 
+	{
+		return format;
+	}
+
+	/**
+	 * @param format | A non 0 value if proper indentation and newline characters should be used when serializing.
+	 * The exact behavior of other values will depend on the specific implementation of {@link Serializer#SerializeTo(Appendable, Object...)}
+	 * 
+	 * @since 1.3.9
+	 */
+	public void setFormat(byte format) 
+	{
+		this.format = format;
+	}
 
 	/**
 	 * @param obj | Object to map the serializer variables into!
@@ -773,7 +821,7 @@ public static <T> T into(Object obj, Serializer fromSerializer, String... fieldN
 
 		return (T) Scope.into(obj, fromSerializer, fieldNamesToUse);
 	}
-	
+
 	/**
 	 * @param newInstance | New instance of specific {@link Serializer}
 	 * @param fromObj | Object to create serializer from!

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

@@ -17,6 +17,7 @@
 import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -35,6 +36,13 @@
 public final class Utils {
 	private Utils() {}
 
+	/**
+	 * {@link System#lineSeparator()}
+	 * 
+	 * @since 1.3.9
+	 */
+	public static final char[] ENDL = System.lineSeparator().toCharArray();
+	
 	/**
 	 * @param f | Source file.
 	 * 
@@ -235,7 +243,7 @@ public static <T> T Clone(T obj)
 	 * @since 1.3.2
 	 */
 	@SuppressWarnings("unchecked")
-	public static <T> T Clone(T obj, Registry<DataParser> parsersToUse, Object[] converterArgs, Object... parserArgs)
+	public static <T> T Clone(T obj, Collection<DataParser> parsersToUse, Object[] converterArgs, Object... parserArgs)
 	{
 		if (obj == null) 
 			return null;
@@ -749,18 +757,16 @@ public static String fastReplace(String str, String target, CharSequence replace
 	 * @param ch | Char to compare!
 	 * @param chars | Chars to match!
 	 * 
-	 * @return True if inserted char is any of inserted chars!
+	 * @return True if inserted char (ch) is any of inserted chars!
 	 * 
 	 * @since 1.3.0 
 	 */
 	public static boolean isOneOf(int ch, char... chars)
 	{
-		if (chars.length > 0)
-		{
-			for (int i = 0, len = chars.length; i < len; i++)
-				if (chars[i] == ch)
-					return true;
-		}
+		final int charsLen = chars.length;
+		for (int i = 0; i < charsLen; i++)
+			if (chars[i] == ch)
+				return true;
 		return false;
 	}
 
@@ -821,7 +827,7 @@ public static String showPosInString(CharSequence str, int pos)
 
 		try
 		{
-			if (contains(str, '\n', '\r'))
+			if (contains(str, ENDL))
 				return str.subSequence(0, pos) + "»" + str.subSequence(pos, str.length());
 			return multilpy(' ', pos).append('^').insert(0, '\n').insert(0, str).toString();
 		}
@@ -881,14 +887,14 @@ public static Object[] fromAmbiguousArray(Object array)
 	{
 		if (array instanceof Object[])
 			return (Object[]) array;
-		
-		int len = Array.getLength(array);
+
+		int len = Array.getLength(array); // Arr of primitives cos Java...
 		Object[] arr = new Object[len];
 		for (int i = 0; i < len; i++) 
 			arr[i] = Array.get(array, i);
 		return arr;
 	}
-	
+
 	/* Others... */
 
 	/**

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

@@ -56,7 +56,7 @@ public BooleanConverter()
 	 * 
 	 * @since 1.3.5
 	 */
-	public BooleanConverter(boolean shorten) 
+	public BooleanConverter(boolean shorten)
 	{
 		setShorten(shorten);
 	}

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

@@ -1,6 +1,6 @@
 package org.ugp.serialx.converters;
 
-import static org.ugp.serialx.Utils.Instantiate;
+import static org.ugp.serialx.Utils.*;
 import static org.ugp.serialx.Utils.indexOfNotInObj;
 import static org.ugp.serialx.Utils.splitValues;
 
@@ -193,24 +193,25 @@ public CharSequence toString(ParserRegistry myHomeRegistry, Object obj, Serializ
 
 		if (preferedProtocol != null || (preferedProtocol = (SerializationProtocol<Object>) getProtocolFor(obj, SerializationProtocol.MODE_SERIALIZE | getProtocolType(), args)) != null)
 		{
-			Class<?> oldObjectClass = null;
+			if (args.length < 6)
+				args = Arrays.copyOf(args, 6);
+			Class<?> oldObjectClass = (Class<?>) args[4];
+			args[4] = obj.getClass();
+			
+			int tabs = args[1] instanceof Integer ? (int) args[1] : 0;
+			int	index = args[2] instanceof Integer ? (int) args[2] : 0;
+
 			try
 			{
-				int tabs = args.length > 1 && args[1] instanceof Integer ? (int) args[1] : 0;
-				int	index = args.length > 2 && args[2] instanceof Integer ? (int) args[2] : 0;
-				
-				if (args.length < 5)
-					args = Arrays.copyOf(args, 5);
-				oldObjectClass = (Class<?>) args[4];
-				args[4] = obj.getClass();;
-
 				Object[] objArgs = preferedProtocol.serialize(obj);
-				StringBuilder sb = new StringBuilder(ImportsProvider.getAliasFor(args.length > 0 ? args[0] : null, obj.getClass()) + (objArgs.length <= 0 ? "" : " "));
-				
+				final int len = objArgs.length;
+
+				StringBuilder sb = new StringBuilder(ImportsProvider.getAliasFor(args[0], obj.getClass()));
 				args = args.clone();
-				for (int i = 0, sizeEndl = 10000; i < objArgs.length; i++) 
+				if (args[5] instanceof Byte && (byte) args[5] != 0) // Format
 				{
-					if (i > 0)
+					for (int i = 0, sizeEndl = 10000; i < len; i++) 
+					{
 						if (sb.length() > sizeEndl)
 						{
 							sb.append('\n'); 
@@ -220,14 +221,26 @@ public CharSequence toString(ParserRegistry myHomeRegistry, Object obj, Serializ
 						}
 						else 
 							sb.append(' ');
-
-					if (args.length > 2)
-						args[2] = index + 1;
-					sb.append(myHomeRegistry.toString(objArgs[i], args));
+						
+						if (args.length > 2)
+							args[2] = index + 1; // DO NOT TOUCH
+						sb.append(myHomeRegistry.toString(objArgs[i], args));
+					}
+				}
+				else
+				{
+					for (int i = 0; i < len; i++)
+					{
+						sb.append(' ');
+						
+						if (args.length > 2)
+							args[2] = index + 1; // DO NOT TOUCH
+						sb.append(myHomeRegistry.toString(objArgs[i], args));
+					}
 				}
 
 				args[4] = oldObjectClass;
-				return index > 0 && objArgs.length > 0 ? sb.insert(0, '{').append('}') : sb;
+				return index > 0 && len != 0 ? sb.insert(0, '{').append('}') : sb;
 			}
 			catch (Exception e)
 			{
@@ -242,7 +255,7 @@ public CharSequence toString(ParserRegistry myHomeRegistry, Object obj, Serializ
 	@Override
 	public CharSequence getDescription(ParserRegistry myHomeRegistry, Object obj, Object... argsUsedConvert) 
 	{
-		if (obj instanceof CharSequence && indexOfNotInObj((CharSequence) obj, '\n', '\r') != -1)
+		if (obj instanceof CharSequence && indexOfNotInObj((CharSequence) obj, ENDL) != -1)
 			return "Multiline char sequence!";
 		return new StringBuilder("Object of ").append(obj.getClass().getName()).append(": \"").append(obj.toString()).append("\" serialized using ").append(getProtocolFor(obj, SerializationProtocol.MODE_SERIALIZE_DESERIALIZE | getProtocolType(), argsUsedConvert)).append("!");
 	}

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

@@ -38,7 +38,7 @@ public interface ImportsProvider
 	 * 
 	 * @since 1.3.5
 	 */
-	public Imports getImports();
+	Imports getImports();
 
 	/**
 	 * @param obj | Object to get imports from (its supposed to be instance of {@link ImportsProvider} or collection of {@link Import})!

SerialX-devtools/pom.xml

@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.ugp.serialx</groupId>
 			<artifactId>serialx-core</artifactId>
-			<version>${revision}</version>
+			<version>1.3.8</version>
 		</dependency>
 	</dependencies>
 </project>

SerialX-json/pom.xml

@@ -10,7 +10,7 @@
 
 	<groupId>org.ugp.serialx</groupId>
 	<artifactId>serialx-json</artifactId>
-	<version>1.3.8</version>
+	<version>1.3.9-SNAPSHOT</version>
 
 	<name>SerialX json</name>
 	<description>SerialX Json support</description>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.ugp.serialx</groupId>
 			<artifactId>serialx-juss</artifactId>
-			<version>${revision}</version>
+			<version>1.3.9-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 </project>