refactoring AritmeticOperators, GenericScope is now Collection!

Author: SimplyProgrammer

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

@@ -22,7 +22,7 @@
 
 
 /**
- * This is some kind of hybrid between {@link List} and {@link Map} which allow you to have both variables and independent values managed by one Object. <br>
+ * This collection is some sort of hybrid between {@link List} and {@link Map} which allow you to have both variables and independent values managed by one Object. <br>
  * Note: Variables are managed and accessed classically via {@link Map} methods such as <code>put(KeyT key, Object)</code> and array of independent values is accessed by via {@link List} methods such as <code>add(Object)</code> and <code>get(int)</code><br>
  * Also this is java representation of JUSS GenericScope group such as:
  * <pre>
@@ -35,12 +35,12 @@
  * 
  * @author PETO
  * 
- * @since 1.2.0
+ * @since 1.3.5
  * 
  * @param <KeyT> generic type of variables key.
  * @param <ValT> generic type of variables value and independent value.
  */
-public class GenericScope<KeyT, ValT> implements Iterable<ValT>, Cloneable, Serializable
+public class GenericScope<KeyT, ValT> implements Collection<ValT>, Cloneable, Serializable
 {
 	private static final long serialVersionUID = 5717775602991055386L;
 
@@ -108,7 +108,7 @@ else if (obj instanceof Collection)
 		else if (obj instanceof Map)
 			return valuesCount() <= 0 && variables().equals(obj);
 		else if (obj != null && obj.getClass().isArray())
-			return variablesCount() <= 0 && Objects.deepEquals(toValArray(), Utils.fromAmbiguousArray(obj));
+			return variablesCount() <= 0 && Objects.deepEquals(toArray(), Utils.fromAmbiguousArray(obj));
 		return super.equals(obj);
 	}
 
@@ -365,12 +365,28 @@ public boolean containsVariable(KeyT variableKey)
 	}
 
 	/**
-	 * @param value | Objecthe value.
+	 * @param value | Object the independent value.
+	 * 
+	 * @return True if independent value was found in this scope.
+	 * 
+	 * @since 1.3.7
+	 */
+	@Override
+	public boolean contains(Object value) 
+	{
+		return values().contains(value);
+	}
+	
+	/**
+	 * @deprecated USE {@link GenericScope#contains(Object)} instead!
+	 * 
+	 * @param value | Object the value.
 	 * 
 	 * @return True if independent value was found in this scope.
 	 * 
 	 * @since 1.2.0
 	 */
+	@Deprecated
 	public boolean containsIndependentValue(ValT value) 
 	{
 		return values().contains(value);
@@ -417,6 +433,7 @@ public <V extends ValT> V get(int valueIndex, Class<V> cls) throws Exception
 	 * 
 	 * @since 1.2.0
 	 */
+	@Override
 	public boolean add(ValT value)
 	{
 		boolean result = values().add(value);
@@ -432,11 +449,12 @@ public boolean add(ValT value)
 	 * 
 	 * @since 1.2.0
 	 */
-	public boolean addAll(Collection<ValT> values)
+	@Override
+	public boolean addAll(Collection<? extends ValT> values)
 	{
 		if (values.isEmpty())
 			return false;
-		return values().addAll(values);
+		return values().addAll((Collection<? extends ValT>) values);
 	}
 
 	/**
@@ -451,6 +469,45 @@ public boolean addAll(@SuppressWarnings("unchecked") ValT... values)
 		return addAll(Arrays.asList(values));
 	}
 
+	/**
+	 * @param values | Independent values to check.
+	 * 
+	 * @return True all provided values are contained in this scope as independent values!
+	 * 
+	 * @since 1.3.7
+	 */
+	@Override
+	public boolean containsAll(Collection<?> values) 
+	{
+		return values().containsAll(values);
+	}
+
+	/**
+	 * @param values | Independent values to check.
+	 * 
+	 * @return {@link Collection#removeAll(Collection)} for the independent values,,,
+	 * 
+	 * @since 1.3.7
+	 */
+	@Override
+	public boolean removeAll(Collection<?> values)
+	{
+		return values().removeAll(values);
+	}
+
+	/**
+	 * @param values | Independent values to check.
+	 * 
+	 * @return {@link Collection#retainAll(Collection)} for the independent values,,,
+	 * 
+	 * @since 1.3.7
+	 */
+	@Override
+	public boolean retainAll(Collection<?> values)
+	{
+		return values().retainAll(values);
+	}
+	
 	/**
 	 * @param scopeValueIndex | Index of sub-scopes value.
 	 * 
@@ -521,7 +578,7 @@ public <T> T toObject(Class<T> objClass, ProtocolRegistry protocolsToUse) throws
 		SerializationProtocol<T> pro = protocolsToUse == null ? null : protocolsToUse.GetProtocolFor(objClass, SerializationProtocol.MODE_DESERIALIZE);
 		if (pro != null)
 		{
-			T obj = pro.unserialize(objClass, this.variablesCount() > 0 ? new Object[] {this} : this.toValArray());
+			T obj = pro.unserialize(objClass, this.variablesCount() > 0 ? new Object[] {this} : this.toArray());
 			if (obj != null)
 				return obj;
 		}
@@ -680,14 +737,27 @@ public ValT remove(int valueIndex)
 		return values().remove(valueIndex < 0 ? valuesCount() + valueIndex : valueIndex);
 	}
 
+	/**
+	 * @param independentValue | Independent value to remove!
+	 * 
+	 * @return Value of variable that was removed!
+	 * 
+	 * @since 1.3.7
+	 */
+	@Override
+	public boolean remove(Object independentValue)
+	{
+		return values().remove(independentValue);
+	}
+	
 	/**
 	 * @param variableKey | Name of variable to remove!
 	 * 
 	 * @return Value of variable that was removed!
 	 * 
-	 * @since 1.3.2
+	 * @since 1.3.7
 	 */
-	public ValT remove(KeyT variableKey)
+	public ValT removeVariable(KeyT variableKey)
 	{
 		return variables().remove(variableKey);
 	}
@@ -699,6 +769,7 @@ public ValT remove(KeyT variableKey)
 	 * 
 	 * @since 1.3.5
 	 */
+	@Override
 	public void clear()
 	{
 		variables().clear();
@@ -712,7 +783,7 @@ public void clear()
 	 */
 	@SuppressWarnings("unchecked")
 	public GenericScope<KeyT, ValT> inheritParent()
-	{ 
+	{
 		GenericScope<?, ?> parent = getParent();
 		if (parent != null)
 			variables().putAll((Map<? extends KeyT, ? extends ValT>) parent.variables());
@@ -765,8 +836,11 @@ public int variablesCount()
 
 	/**
 	 * @return Total number of variables and independent values of this scope! (<code>vvaluesCount() + variablesCount()</code>)
+	 * 
+	 * @since 1.3.7 (before 1.3.7 known as totalSize)
 	 */
-	public int totalSize()
+	@Override
+	public int size()
 	{
 		return valuesCount() + variablesCount();
 	}
@@ -776,9 +850,10 @@ public int totalSize()
 	 * 
 	 * @since 1.2.0
 	 */
+	@Override
 	public boolean isEmpty()
 	{
-		return totalSize() <= 0;
+		return size() <= 0;
 	}
 
 	/**
@@ -838,22 +913,24 @@ public List<? extends ValT> toValList()
 	 * @return Primitive array with independent values of this {@link GenericScope}. These values have nothing to do with values of variables, they are independent!
 	 * Modifying this list will not affect this {@link GenericScope} object!
 	 * 
-	 * @since 1.2.0
+	 * @since 1.3.7 (before 1.3.7 known as toValArray)
 	 */
-	public Object[] toValArray()
+	@Override
+	public Object[] toArray() 
 	{
 		return values().toArray();
 	}
-	
+
 	/**
 	 * @param vals | Array to store independent values into!
 	 * 
 	 * @return Primitive array with independent values of this {@link GenericScope}. These values have nothing to do with values of variables, they are independent!
 	 * Modifying this list will not affect this {@link GenericScope} object!
 	 * 
-	 * @since 1.3.5
+	 * @since 1.3.7 (before 1.3.7 known as toValArray)
 	 */
-	public <V extends ValT> V[] toValArray(V[] vals)
+	@Override
+	public <T> T[] toArray(T[] vals) 
 	{
 		return values().toArray(vals);
 	}
@@ -874,7 +951,7 @@ public List<Object> toUnifiedList()
 	}
 
 	/**
-	 * @return Values of this scope. These are not the values of keys these are values that have no key. You can access them via {@link GenericScope#get(int)}!
+	 * @return Independent values of this scope. These are not the values of keys these are values that have no key. You can access them via {@link GenericScope#get(int)}!
 	 * Note: Editing this List will affect this scope!
 	 * 
 	 * @since 1.2.0

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

@@ -22,7 +22,7 @@
 
 
 /**
- * This is some kind of hybrid between {@link List} and {@link Map} which allow you to have both variables and independent values managed by one Object. <br>
+ * This collection is some sort of hybrid between {@link List} and {@link Map} which allow you to have both variables and independent values managed by one Object. <br>
  * Note: Variables are managed and accessed classically via {@link Map} methods such as <code>put(String key, Object)</code> and array of independent values is accessed by via {@link List} methods such as <code>add(Object)</code> and <code>get(int)</code><br>
  * Also this is java representation of JUSS Scope group such as:
  * <pre>
@@ -1082,7 +1082,7 @@ public static <T> T intoNew(Class<T> objCls, GenericScope<? super String, ?> fro
 		if (objCls.isArray())
 		{
 			if (objCls.getComponentType() == Object.class)
-				return (T) fromScope.toValArray();
+				return (T) fromScope.toArray();
 
 			return (T) into(Array.newInstance(objCls.getComponentType(), fromScope.valuesCount()), fromScope, fieldNamesToUse);
 		}

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

@@ -35,7 +35,7 @@
 import org.ugp.serialx.protocols.SerializationProtocol.ProtocolRegistry;
 
 /**
- * {@link org.ugp.serialx.Serializer} is powerful utility class that allows you to serialize any object in Java using custom data format compiled by recursive descent parser consisting of {@link DataParser}s.
+ * {@link org.ugp.serialx.Serializer} is powerful abstract class that allows you to serialize any object in Java using custom data format compiled by recursive descent parser consisting of {@link DataParser}s.
  * This class itself is responsible for formating and managing input-output (IO) of content obtained from parsers and protocols as well as their management of their usage!
  * It is instance of {@link Scope} so we can say that this is scope that can serialize itself using system of already mentioned {@link DataParser} and {@link SerializationProtocol}!
  * 

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

@@ -213,21 +213,19 @@ public Object parse(String str, Object... args)
 		 * 
 		 * @since 1.3.5
 		 */
-		public Object parse(String str, boolean returnAsStringIfNotFound, Class<?>[] ignore, Object... args)
+		public Object parse(String str, boolean returnAsStringIfNotFound, Class<? extends DataParser> ignore, Object... args)
 		{
 			Object obj = null; 
 			if (parsingCache != null)
 				for (DataParser parser : parsingCache)
-					if (parser != null && (obj = parser.parse(this, str, args)) != CONTINUE)
+					if (parser != null && (ignore == null || ignore != parser.getClass()) && (obj = parser.parse(this, str, args)) != CONTINUE)
 						return obj; 
 
-			registryLoop: for (int i = 0, size = size(); i < size; i++)
+			for (int i = 0, size = size(); i < size; i++)
 			{
 				DataParser parser = get(i);
-				if (ignore != null)
-					for (Class<?> cls : ignore) 
-						if (cls == parser.getClass())
-							continue registryLoop;
+				if (ignore != null && ignore == parser.getClass())
+					continue;
 
 				if ((obj = parser.parse(this, str, args)) != CONTINUE)
 				{

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

@@ -33,7 +33,7 @@ public Object[] serialize(GenericScope<?, ?> object) throws Exception
 		{
 			if (objectClass == args[0].getClass())
 				return (GenericScope<?, ?>) args[0];
-			return objectClass.getConstructor(Map.class, Object[].class).newInstance(((GenericScope<?, ?>) args[0]).toVarMap(), ((GenericScope<?, ?>) args[0]).toValArray());
+			return objectClass.getConstructor(Map.class, Object[].class).newInstance(((GenericScope<?, ?>) args[0]).toVarMap(), ((GenericScope<?, ?>) args[0]).toArray());
 		}
 		return objectClass.getConstructor(Map.class, Object[].class).newInstance(new HashMap<>(), args);
 	}

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

@@ -293,7 +293,8 @@ public ProtocolRegistry clone()
 		@Override
 		public void add(int index, SerializationProtocol<?> element) 
 		{
-			if (GetProtocolFor(element.applicableFor()) != null && element.applicableFor() != Object.class)
+			SerializationProtocol<?> existing;
+			if ((existing = GetProtocolFor(element.applicableFor(), element.getMode())) != null && element.applicableFor() == existing.applicableFor())
 				LogProvider.instance.logErr("Protocol applicable for \"" + element.applicableFor().getName() + "\" is already registred!", null);
 			addDuplicatively(index, element);
 		}

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

@@ -98,7 +98,7 @@ public CharSequence toString(Object obj, Object... args) {
 	}
 
 	@Override
-	public Object parse(String str, boolean returnAsStringIfNotFound, Class<?>[] ignore, Object... args) 
+	public Object parse(String str, boolean returnAsStringIfNotFound, Class<? extends DataParser> ignore, Object... args) 
 	{
 		int iterationIndex = 0;
 		if (args.length > 99 && args[99] instanceof Integer)
@@ -112,7 +112,7 @@ public Object parse(String str, boolean returnAsStringIfNotFound, Class<?>[] ign
 			for (int i = 0; i < parsingCache.length; i++)
 			{
 				DataParser parser = parsingCache[i];
-				if (parser != null)
+				if (parser != null && (ignore == null || ignore != parser.getClass()))
 				{
 					try 
 					{
@@ -133,13 +133,11 @@ public Object parse(String str, boolean returnAsStringIfNotFound, Class<?>[] ign
 				}
 			}
 
-		registryLoop: for (int i = 0, size = size(); i < size; i++)
+		for (int i = 0, size = size(); i < size; i++)
 		{
 			DataParser parser = get(i);
-			if (ignore != null)
-				for (Class<?> cls : ignore) 
-					if (cls == parser.getClass())
-						continue registryLoop;
+			if (ignore != null && ignore == parser.getClass())
+				continue;
 
 			try 
 			{

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

@@ -171,7 +171,7 @@ public Object setMemberOperator(ParserRegistry myHomeRegistry, Object source, St
 		if (source instanceof GenericScope)
 		{
 			if (val == VOID)
-				return ((GenericScope<Object,?>) source).remove(member);
+				return ((GenericScope<Object,?>) source).removeVariable(member);
 			return ((GenericScope<Object, Object>) source).put(genericVar ? myHomeRegistry.parse(member, true, null, args) : member, val);
 		}
 		return VOID;