removing deprecateds

Author: SimplyProgrammer

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

@@ -378,21 +378,6 @@ 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);
-	}
-	
 	/**
 	 * @param valueIndex | Index of independent value. Also can be negative, in this case u will get elements from back!
 	 * {@link IndexOutOfBoundsException} will be thrown if index is too big!

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

@@ -25,6 +25,7 @@
 import java.net.URI;
 import java.net.URL;
 import java.net.URLConnection;
+import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -198,13 +199,16 @@ public <T> T into(T obj, String... fieldNamesToUse) throws IntrospectionExceptio
 	}
 
 	/**
+	 * @deprecated (1.3.9) DO NOT USE THIS, USE VARIATION OF {@link AbstractMap.SimpleEntry} OR {@link VariableConverter#NewVariable(String, Object)} FROM <code>serialx-juss module</code> INSTEAD!
+	 * 
 	 * @param name | Name of variable.
 	 * @param value | Value of variable.
 	 * 
 	 * @return Classic variable expression in general form like [name] = [value].
 	 * 
 	 * @since 1.1.5
 	 */
+	@Deprecated
 	public <T> String Var(String name, T value)
 	{
 		return Code(name + " = " + getParsers().toString(value, 0, 0, this, getProtocols(), false) + ";");

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

@@ -932,34 +932,4 @@ public static void post(Serializer serializer, HttpURLConnection conn) throws IO
         conn.setDoOutput(true);
         conn.getOutputStream().write(postDataBytes);
 	}
-	
-	/**
-	 * This is a "dummy" class that {@link Serializer} uses internally as an OOP programmatic interpretation of null. In otherwise this is wrapper object for null.
-	 * Note: You should not be able to come in contact with this during serialization and loading, if you did then you most likely encountered and bug and you should report it!
-	 * 
-	 * @author PETO
-	 *
-	 * @since 1.2.2
-	 * 
-	 * @deprecated (in 1.3.8) NO LONGER NEEDED, DO NOT USE THIS! You were never supposed to...
-	 */
-	public static final class NULL //TODO: REMOVE IN NEXT V!!!!
-	{
-		public static Object toOopNull(Object obj)
-		{
-			return obj == null ? new NULL() : obj;
-		}
-		
-		@Override
-		public boolean equals(Object obj) 
-		{
-			return obj == null || obj instanceof NULL;
-		}
-		
-		@Override
-		public String toString() 
-		{
-			return "NULL";
-		}
-	}
 }

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

@@ -1,11 +1,6 @@
 package org.ugp.serialx.converters;
 
 import static org.ugp.serialx.Utils.contains;
-import static org.ugp.serialx.Utils.fastReplace;
-
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
-import java.util.Locale;
 
 /**
  * This converter is capable of converting {@link Number} including all common implementations like {@link Double}, {@link Float}, {@link Integer} and others. They are determine by suffixes like in java!
@@ -93,19 +88,6 @@ <td>new Double(0.1e2)</td>
  */
 public class NumberConverter implements DataConverter 
 {
-	/**
-	 * {@link DecimalFormat} to format decimal numbers (double, float) during serialization!<br>
-	 * Default {@link DecimalFormat} will round decimal numbers to 3 decimal places (format pattern #.###)!
-	 * 
-	 * Set this on null and decimal numbers will not be formated! Do this when you need accuracy!
-	 * 
-	 * @serial 1.1.0 (moved to {@link NumberConverter} since 1.3.0)
-	 * 
-	 * @deprecated DO NOT USE! Override {@link NumberConverter#format(Object)} and write your format logic there instead!
-	 */
-	@Deprecated
-	public static DecimalFormat decimalFormatter = new DecimalFormat("#.###", DecimalFormatSymbols.getInstance(Locale.US));
-	
 	@Override
 	public Object parse(ParserRegistry myHomeRegistry, String arg, Object... args) 
 	{
@@ -257,27 +239,4 @@ else if (ch != 127 && ch != '+')
 			return (byte) result;
 		return (int) result;
 	}
-	
-	/**
-	 * @deprecated THIS IS OBSOLET, SLOW AND NO LONGER NECESSARY 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)
-			for (boolean minus = num.startsWith("+-") || num.startsWith("-+"); minus || num.startsWith("++") || num.startsWith("--"); minus = num.startsWith("+-") || num.startsWith("-+"))
-			{
-				num = num.substring(2);
-				if (minus)
-					num = "-"+num;
-			}
-		
-		return fastReplace(num, "_", "");
-	}
 }

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

@@ -138,6 +138,7 @@ public JsonSerializer(Registry<DataParser> parsers, ProtocolRegistry protocols,
 		super(parsers, protocols, variablesMap, values, parent);
 	}
 
+	@Deprecated
 	@Override
 	public <T> String Var(String name, T value, boolean isValue) 
 	{

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

@@ -19,6 +19,7 @@
 import java.net.URL;
 import java.net.URLConnection;
 import java.text.SimpleDateFormat;
+import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -205,20 +206,25 @@ public Scope clone(boolean absoluteClone)
 	}
 
 	/**
+	 * @deprecated (1.3.9) DO NOT USE THIS, USE {@link VariableConverter#NewVariable(String, Object)} OR VARIATION OF {@link AbstractMap.SimpleEntry} INSTEAD!
+	 * 
 	 * @param name | Name of variable.
 	 * @param value | Value of variable.
 	 * 
 	 * @return Variable in JUSS form to serialize as [name] = [value].
 	 * 
 	 * @since 1.1.5
 	 */
+	@Deprecated
 	@Override
 	public <T> String Var(String name, T value)
 	{
 		return Var(name, value, false);
 	}
 
 	/**
+	 * @deprecated (1.3.9) DO NOT USE THIS, USE {@link VariableConverter#NewVariable(String, Object)} OR VARIATION OF {@link AbstractMap.SimpleEntry} INSTEAD!
+	 * 
 	 * @param name | Name of variable.
 	 * @param value | Value of variable.
 	 * @param isValue | True if variables value supposed to by visible also during value loading.
@@ -227,6 +233,7 @@ public <T> String Var(String name, T value)
 	 * 
 	 * @since 1.1.5
 	 */
+	@Deprecated
 	public <T> String Var(String name, T value, boolean isValue)
 	{
 		return Code((isValue ? "$" : "") + name + " = " + getParsers().toString(value, this, 0, 0, getProtocols(), getFormat()) + (isGenerateComments() ? "; //Object of " + value.getClass().getName() + ": \"" + value + "\" inserted manually! Stored by \"" + name + "\" variable!" : ""));

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

@@ -25,16 +25,6 @@
  */
 public class OperationGroups implements DataParser
 {
-	/**
-	 * @deprecated (since 1.3.8) DO NOT USE, USE {@link OperationGroups#groupMark} instead! <br>
-	 * 
-	 * Opening and closing of group mark!
-	 * 
-	 * @since 1.3.0
-	 */
-	@Deprecated
-	public static final char[] GROUP_MARK_OP = new char[] {127, 128, 129}, GROUP_MARK_CLS = new char[] {129, 128, 127};
-	
 	/**
 	 * Character marking the opening of {@link OperationGroups} mark in processed string, closing should be marked as this character -1.<br>
 	 * This character is generated in sami-random fashion but it will never be an ASCII character.

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

@@ -22,12 +22,6 @@
  */
 public class ArithmeticOperators implements DataParser
 {
-	/**
-	 * @deprecated DO NOT USE! USE {@link ArithmeticOperators#operator(Object, String, Object)} AND {@link ArithmeticOperators#getOperatorPriority(String)} INSTEAD!
-	 */
-	@Deprecated
-	protected String[] priority1Oprs = {"*", "*-", "/", "/-", "%"}, priority2Oprs = {"**", "**-"};
-	
 	/**
 	 * Operator characters recognized by {@link ArithmeticOperators}, operators can be any combination of provided characters. Exact behavior is handled by {@link ArithmeticOperators#operator(Object, String, Object)}.<br> Intended for override, should not be null or empty!
 	 * 
@@ -514,31 +508,4 @@ public static Object toNum(Object obj)
 			return (int) (char) obj;
 		return obj; 
 	}
-	
-	/**
-	 * @deprecated THIS WAS QUIET A MESSY WORKAROUND, DO NOT USE!<br>
-	 * 
-	 * Used internally by {@link ArithmeticOperators} to wrap result of evaluation!
-	 * Mainly used by String results!
-	 * 
-	 * @author PETO
-	 *
-	 * @since 1.3.0
-	 */
-	@Deprecated
-	protected static class ResultWrapper
-	{
-		public final Object obj;
-		
-		public ResultWrapper(Object obj) 
-		{
-			this.obj = obj;
-		}
-		
-		@Override
-		public String toString() 
-		{
-			return obj.toString();
-		}
-	}
 }