Micro optims and no ; after //

Author: SimplyProgrammer

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

@@ -43,7 +43,7 @@ default CharSequence toString(ParserRegistry myHomeRegistry, Object obj, Object.
 	 * @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)!
 	 * 
-	 * @return The source appendable after stringified object (obj) was appropriately appended into it.
+	 * @return The source appendable after stringified object (obj) was appropriately appended into it. Alternatively you can return null to signify error or that everything necessary was already appended and no further chars should be appended immediately after this obj's stringification.
 	 * Return {@link DataParser#CONTINUE} to tell that this converter is not suitable for converting this object! You most likely want to do this when obtained obj is not suitable instance!
 	 * 
 	 * @throws IOException When appending into source throws it... 

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

@@ -82,7 +82,7 @@ public static class ParserRegistry extends Registry<DataParser> implements DataP
 		private static final long serialVersionUID = -2598324826689380752L;
 
 		protected DataParser[] parsingCache;
-		protected DataParser[] convertingCache;
+		protected DataConverter[] convertingCache;
 
 		/**
 		 * Constructs an {@link ParserRegistry} with the specified initial capacity.
@@ -185,7 +185,7 @@ public CharSequence toString(Object obj, Object... args)
 		 * @param obj | Object to convert into string!
 		 * @param args | Additional arguments that will be obtained in {@link DataParser#toString(String, Object...)}!
 		 * 
-		 * @return The source appendable after stringified object (obj) was appropriately appended into it.
+		 * @return The source appendable after stringified object (obj) was appropriately appended into it. Alternatively you can return null to signify error or that everything necessary was already appended and no further chars should be appended immediately after this obj's stringification.
 		 * Return {@link DataParser#CONTINUE} to tell that this converter is not suitable for converting this object! You most likely want to do this when obtained obj is not suitable instance!
 		 * 
 		 * @throws IOException When appending into source throws it... 
@@ -196,8 +196,8 @@ public Appendable toString(Appendable source, Object obj, Object... args) throws
 		{
 			Appendable str;
 			if (convertingCache != null)
-				for (DataParser parser : convertingCache)
-					if (parser != null && (str = ((DataConverter) parser).toString(source, this, obj, args)) != CONTINUE)
+				for (DataConverter parser : convertingCache)
+					if (parser != null && (str = parser.toString(source, this, obj, args)) != CONTINUE)
 						return str;
 
 			for (int i = 0, size = size(); i < size; i++) 
@@ -206,7 +206,7 @@ public Appendable toString(Appendable source, Object obj, Object... args) throws
 				if (parser instanceof DataConverter && (str = ((DataConverter) parser).toString(source, this, obj, args)) != CONTINUE)
 				{
 					if (convertingCache != null && i < convertingCache.length)
-						convertingCache[i] = parser; 
+						convertingCache[i] = (DataConverter) parser;
 					return str;
 				}
 			}
@@ -326,9 +326,9 @@ public int[] preCache(Class<? extends DataParser> classOfParserToPrecache)
 				ret[0] = i;
 			}
 
-			if (i < convertingCache.length)
+			if (i < convertingCache.length && parser instanceof DataConverter)
 			{
-				convertingCache[i] = parser;
+				convertingCache[i] = (DataConverter) parser;
 				ret[1] = i;
 			}
 
@@ -346,7 +346,7 @@ public int[] preCache(Class<? extends DataParser> classOfParserToPrecache)
 		public void resetCache()
 		{
 			int size = size();
-			resetCache(new DataParser[size], new DataParser[size]);
+			resetCache(new DataParser[size], new DataConverter[size]);
 		}
 
 		/**
@@ -357,7 +357,7 @@ public void resetCache()
 		 * 
 		 * @since 1.3.5
 		 */
-		public void resetCache(DataParser[] parsingCache, DataParser[] convertingCache)
+		public void resetCache(DataParser[] parsingCache, DataConverter[] convertingCache)
 		{
 			if (parsingCache != null)
 				this.parsingCache = parsingCache;
@@ -390,7 +390,7 @@ public DataParser[] getParsingCache()
 		 * 
 		 * @since 1.3.5
 		 */
-		public DataParser[] getConverterCache()
+		public DataConverter[] getConverterCache()
 		{
 			return convertingCache;
 		}

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

@@ -179,7 +179,7 @@ public Appendable toString(Appendable source, ParserRegistry myHomeRegistry, Obj
 	 * @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)!
 	 * 
-	 * @return The source appendable after stringified object (obj) was appropriately appended into it.
+	 * @return The source appendable after stringified object (obj) was appropriately appended into it. Alternatively you can return null to signify error or that everything necessary was already appended and no further chars should be appended immediately after this obj's stringification.
 	 * Return {@link DataParser#CONTINUE} to tell that this converter is not suitable for converting this object! You most likely want to do this when obtained obj is not suitable instance!
 	 * 
 	 * @since 1.3.5

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

@@ -78,6 +78,12 @@ public Appendable toString(Appendable source, ParserRegistry myHomeRegistry, Obj
 				str = str.substring(2, str.length()-1);
 				if (str.contains("::") && indexOfNotInObj(str, ' ') > -1)
 					return source.append('{').append(str).append('}');
+				
+				if (indexOfNotInObj(str, "//") != -1)
+				{
+					source.append(str);
+					return null; // No append ; when ends with //
+				}
 				return source.append(str);
 			}
 

SerialX-devtools/src/main/java/org/ugp/serialx/devtools/DebugParserRegistry.java

@@ -63,15 +63,15 @@ public Appendable toString(Appendable source, Object obj, Object... args) throws
 		if (convertingCache != null)
 			for (int i = 0; i < convertingCache.length; i++)
 			{
-				DataParser parser = convertingCache[i];
-				if (parser != null)
+				DataConverter converter = convertingCache[i];
+				if (converter != null)
 				{
 					double t0 = System.nanoTime();
-					str = (CharSequence) ((DataConverter) parser).toString(new StringBuilder(), this, obj, args);
+					str = (CharSequence) converter.toString(new StringBuilder(), this, obj, args);
 					double t = System.nanoTime();
 					if (str != SerializationDebugger.CONTINUE)
 					{
-						iterationStackTrace.put(iterationIndex, "[" + i + "] " + parser + " " + (t-t0)/1000000 + "ms (from cache)\n>>\t" + SerializationDebugger.toStringAndCls(obj) + "\t -->\t\"" + str + "\"");
+						iterationStackTrace.put(iterationIndex, "[" + i + "] " + converter + " " + (t-t0)/1000000 + "ms (from cache)\n>>\t" + SerializationDebugger.toStringAndCls(obj) + "\t -->\t\"" + str + "\"");
 						return source.append(str); 
 					}
 				}
@@ -88,7 +88,7 @@ public Appendable toString(Appendable source, Object obj, Object... args) throws
 				if(str != SerializationDebugger.CONTINUE)
 				{
 					if (convertingCache != null && i < convertingCache.length)
-						convertingCache[i] = parser; 
+						convertingCache[i] = (DataConverter) parser; 
 					iterationStackTrace.put(iterationIndex, "[" + i + "] " + parser + " " + (t-t0)/1000000 + "ms\n>>\t" + SerializationDebugger.toStringAndCls(obj) + "\t -->\t\"" + str + "\"");
 					return source.append(str); 
 				}

SerialX-json/src/main/java/org/ugp/serialx/json/JsonSerializer.java

@@ -204,8 +204,7 @@ protected Appendable appandVar(Appendable source, ParserRegistry parsersToUse, E
 	{
 		if (format != 0)
 			source.append(multilpy('\t', tabs));
-		parsersToUse.toString(source, varToSerialize, args);
-		if (isLast)
+		if (parsersToUse.toString(source, varToSerialize, args) == null || isLast)
 			return source;
 		return source.append(',');
 	}
@@ -215,8 +214,7 @@ protected Appendable appandVal(Appendable source, ParserRegistry parsersToUse, O
 	{
 		if (format != 0)
 			source.append(multilpy('\t', tabs));
-		parsersToUse.toString(source, objToSerialize, args);
-		if (isLast /*|| serializedVal != null && indexOfNotInObj(serializedVal, "//") != -1*/)
+		if (parsersToUse.toString(source, objToSerialize, args) == null || isLast)
 			return source;
 		return source.append(',');
 	}

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

@@ -401,8 +401,7 @@ protected Appendable appandVar(Appendable source, ParserRegistry parsersToUse, E
 	{
 		if (format != 0)
 			source.append(multilpy('\t', tabs));
-		parsersToUse.toString(source, varToSerialize, args);
-		if (isLast)
+		if (parsersToUse.toString(source, varToSerialize, args) == null || isLast)
 			return source;
 		return source.append(';');
 	}
@@ -416,8 +415,7 @@ protected Appendable appandVal(Appendable source, ParserRegistry parsersToUse, O
 	{
 		if (format != 0)
 			source.append(multilpy('\t', tabs));
-		parsersToUse.toString(source, objToSerialize, args);
-		if (isLast /*|| serializedVal != null && indexOfNotInObj(serializedVal, "//") != -1*/)
+		if (parsersToUse.toString(source, objToSerialize, args) == null || isLast)
 			return source;
 		return source.append(';');
 	}

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

@@ -3,19 +3,14 @@
 import static org.ugp.serialx.Utils.indexOfNotInObj;
 
 import java.io.IOException;
-import java.io.Serializable;
 import java.io.StringReader;
 import java.util.Arrays;
-import java.util.Base64;
 
 import org.ugp.serialx.GenericScope;
 import org.ugp.serialx.LogProvider;
 import org.ugp.serialx.Scope;
 import org.ugp.serialx.Serializer;
-import org.ugp.serialx.converters.DataParser;
 import org.ugp.serialx.converters.ProtocolConverter;
-import org.ugp.serialx.converters.SerializableBase64Converter;
-import org.ugp.serialx.converters.DataParser.ParserRegistry;
 import org.ugp.serialx.converters.imports.ImportsProvider;
 import org.ugp.serialx.juss.JussSerializer;
 import org.ugp.serialx.protocols.SerializationProtocol;
@@ -64,18 +59,6 @@ <td>new Scope( ... )</td>
  */
 public class ObjectConverter extends ProtocolConverter 
 {
-	/**
-	 * Set this on true to force program to use {@link Base64} serialization on {@link Serializable} objects.
-	 * Doing this might result into some form of encryption but its less flexible and tends to be slower than SerialX {@link SerializationProtocol} system!
-	 * In some cases, java Serialization can be more effective than protocols sometimes not! You should try which gives you the best result, then you can also deactivate certain protocols that are less effective than Java serialization.
-	 * For example for long strings, classic Java serialization is better than protocol, it will take less memory storage space, but performance is almost always far slower!<br>
-	 * Note: Whole concept of SerialX API is about avoiding classic Java serialization from many reasons so you most likely want this on true! Also protocol will be almost certainly faster classic serialization!<br>
-	 * Note: This will only work when this converter is registered in {@link ParserRegistry} together with {@link SerializableBase64Converter}!
-	 * 
-	 * @since 1.0.0 (moved to {@link SerializableBase64Converter} since 1.3.0 and since 1.3.5 into {@link ObjectConverter})
-	 */
-	protected boolean useBase64IfCan = false;
-	
 	@SuppressWarnings("unchecked")
 	@Override
 	public Object parse(ParserRegistry myHomeRegistry, String str, Object... compilerArgs) 
@@ -142,18 +125,6 @@ public Appendable toString(Appendable source, ParserRegistry myHomeRegistry, Obj
 		return toString(source, myHomeRegistry, obj, null, args);
 	}
 
-	/**
-	 * @param source | Source to append the properly stringified object (obj) into. Should be treated as only and only {@link Appendable}, no casting!
-	 * @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)!
-	 * 
-	 * @return The source appendable after stringified object (obj) was appropriately appended into it.
-	 * Return {@link DataParser#CONTINUE} to tell that this converter is not suitable for converting this object! You most likely want to do this when obtained obj is not suitable instance!
-	 * 
-	 * @since 1.3.5
-	 */
 	@SuppressWarnings("unchecked")
 	public Appendable toString(Appendable source, ParserRegistry myHomeRegistry, Object obj, SerializationProtocol<Object> preferedProtocol, Object... args) 
 	{