removing oop NULL like the colossal mistake it was...

Author: SimplyProgrammer

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

@@ -16,7 +16,6 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 
-import org.ugp.serialx.Utils.NULL;
 import org.ugp.serialx.converters.DataParser;
 import org.ugp.serialx.protocols.SerializationProtocol;
 import org.ugp.serialx.protocols.SerializationProtocol.ProtocolRegistry;
@@ -277,7 +276,7 @@ public <V extends ValT> V get(KeyT variableKey, V defaultValue)
 		V obj = (V) variables().get(variableKey);
 		if (obj == null)
 			return defaultValue;
-		return obj instanceof NULL ? null : obj;
+		return obj;
 	}
 
 	/**
@@ -388,8 +387,7 @@ public boolean containsIndependentValue(ValT value)
 	@SuppressWarnings("unchecked")
 	public <V extends ValT> V get(int valueIndex)
 	{
-		V obj = (V) values().get(valueIndex < 0 ? valuesCount() + valueIndex : valueIndex);
-		return obj instanceof NULL ? null : obj;
+		return (V) values().get(valueIndex < 0 ? valuesCount() + valueIndex : valueIndex);
 	}
 
 	/**
@@ -600,7 +598,6 @@ public <V> GenericScope<KeyT, V> transform(Function<ValT, V> trans, boolean incl
 			try
 			{
 				Object obj = ent.getValue();
-				obj = obj instanceof NULL ? null : obj;
 				if (obj instanceof GenericScope && includeSubScopes)
 				{ 
 					GenericScope<?, V> sc = ((GenericScope<?, ValT>) obj).transform(trans, includeSubScopes);
@@ -655,8 +652,7 @@ public <V> List<V> map(Function<ValT, V> trans, boolean includeSubScopes)
 		List<V> fltVals = new ArrayList<>();
 		for (Object obj : this)
 			try
-			{	
-				obj = obj instanceof NULL ? null : obj;
+			{
 				if (obj instanceof GenericScope && includeSubScopes)
 				{ 
 					GenericScope<?, V> sc = ((GenericScope<?, ValT>) obj).transform(trans, includeSubScopes);

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

@@ -653,7 +653,7 @@ else if (multLineCom <= -1 && ch == '"')
 						if (semicolon > index)
 						{
 							lineReader.close();
-							return (T) NULL.toOopNull(DataParser.parseObj(DataParser.REGISTRY, sb.toString(), this));
+							return (T) DataParser.parseObj(DataParser.REGISTRY, sb.toString(), this);
 						}
 						
 						if (multLineCom > -1 || com > -1) //Is comment
@@ -722,7 +722,7 @@ else if (ch == '}' || ch == ']')
 		else if (quote % 2 != 0)
 			throw new IllegalArgumentException("Unclosed or missing quotes!");
 		else if (!(line = sb.toString()).isEmpty())
-			return (T) NULL.toOopNull(DataParser.parseObj(DataParser.REGISTRY, line, this));
+			return (T) DataParser.parseObj(DataParser.REGISTRY, line, this);
 		LogProvider.instance.logErr("Value with index " + index + " is out of bounds!");
 		return null;
 	}
@@ -808,7 +808,7 @@ else if (multLineCom <= -1 && ch == '"')
 						int start = sb.indexOf("=", findIndex-fromIndexOrig);
 						if (start <= -1)
 							start = sb.indexOf(":", findIndex-fromIndexOrig);
-						return (T) NULL.toOopNull(DataParser.parseObj(DataParser.REGISTRY, sb.substring(start+1), this));
+						return (T) DataParser.parseObj(DataParser.REGISTRY, sb.substring(start+1), this);
 					}
 					
 					if (multLineCom > -1 || com > -1) //Is comment

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

@@ -261,7 +261,7 @@ else if (obj.getClass() == String.class)
 		{
 			ParserRegistry parsers = parsersToUse instanceof ParserRegistry ? (ParserRegistry) parsersToUse : new ParserRegistry(parsersToUse);
 
-			Object cln = NULL.toOopNull(parsers.parse(parsers.toString(obj, converterArgs).toString(), parserArgs));
+			Object cln = parsers.parse(parsers.toString(obj, converterArgs).toString(), parserArgs);
 			if (cln != null && cln != VOID)
 				return (T) cln;
 

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

@@ -1,7 +1,5 @@
 package org.ugp.serialx.converters;
 
-import org.ugp.serialx.Utils.NULL;
-
 /**
  * This converter is capable of converting "nothing" otherwise known as null and {@link DataParser#VOID}.
  * Its case insensitive!
@@ -48,7 +46,7 @@ public Object parse(ParserRegistry registry, String str, Object... args)
 	@Override
 	public CharSequence toString(ParserRegistry myHomeRegistry, Object obj, Object... args) 
 	{
-		if (obj == null || obj instanceof NULL)
+		if (obj == null)
 			return "null";
 		return CONTINUE;
 	}

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

@@ -29,7 +29,6 @@
 import org.ugp.serialx.Registry;
 import org.ugp.serialx.Scope;
 import org.ugp.serialx.Serializer;
-import org.ugp.serialx.Utils.NULL;
 import org.ugp.serialx.converters.BooleanConverter;
 import org.ugp.serialx.converters.CharacterConverter;
 import org.ugp.serialx.converters.DataConverter;
@@ -676,7 +675,7 @@ else if (brackets > 0)
 	 */
 	protected Object parseObject(ParserRegistry registry, String str, Object... parserArgs)
 	{
-		return NULL.toOopNull(registry.parse(str, parserArgs));
+		return registry.parse(str, parserArgs);
 	}
 
 	/**

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

@@ -3,7 +3,6 @@
 import static org.ugp.serialx.Utils.indexOfNotInObj;
 
 import org.ugp.serialx.LogProvider;
-import org.ugp.serialx.Utils.NULL;
 import org.ugp.serialx.converters.DataParser;
 
 /**
@@ -45,7 +44,7 @@ public Object parse(ParserRegistry myHomeRegistry, String str, Object... args)
 			if ((index = str.indexOf("??")) > -1)
 			{
 				Object obj = myHomeRegistry.parse(str.substring(0, index).trim(), args);
-				if (obj != null && !(obj instanceof NULL))
+				if (obj != null)
 					return obj;
 
 				String next = str.substring(index+2);