Changing verification of params

Author: AlexBolot

src/main/java/CodingUtils/AssertUtils.java

@@ -1,6 +1,5 @@
 package CodingUtils;
 
-import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collection;
@@ -11,7 +10,7 @@
  .
  . The AssertUtils	 Class was Coded by : Alexandre BOLOT
  .
- . Last Modified : 20/01/18 00:24
+ . Last Modified : 20/02/18 23:18
  .
  . Contact : [email protected]
  ...............................................................................................................................*/
@@ -25,19 +24,13 @@ public class AssertUtils
      <hr>
      <h2>Tests if the parameters are null</h2>
      <h3>If one of them is —> throws IllegalArgumentException, with index of first null object as message.</h3>
-     <br>
-     Note : asserts [array] isn't null.<br>
-     <br>
      <hr>
 
      @param array Array of T objects to test for null value
      */
-    @Contract ("null -> fail")
     @SafeVarargs
-    public static <T> void assertNotNull (T... array)
+    public static <T> void assertNotNull (@NotNull T... array)
     {
-        if (array == null) throw new IllegalArgumentException("List of Objects is null");
-
         for (int i = 0; i < array.length; i++)
         {
             if (array[i] == null) throw new IllegalArgumentException("Element at index " + i + " is null");
@@ -52,10 +45,9 @@ public static <T> void assertNotNull (T... array)
 
      @param t The ‹T› object to test for null value
      */
-    @Contract ("null-> fail")
-    public static <T> void assertNotNull (T t)
+    public static <T> void assertNotNull (@NotNull T t)
     {
-        if (t == null) throw new IllegalArgumentException("Param is null");
+        //Nothing to do, @NotNull does the job :D
     }
     //endregion
 
@@ -65,47 +57,38 @@ public static <T> void assertNotNull (T t)
      <hr>
      <h2>Tests if [string] is empty</h2>
      <h3>If it is —> throws IllegalArgumentException.</h3>
-     Note : already asserts [string] isn't null.<br>
-     <br>
      <hr>
 
      @param string The String to test for empty value
      */
     public static void assertNotEmpty (@NotNull String string)
     {
-        if (string == null) throw new IllegalArgumentException("String is null");
         if (string.isEmpty()) throw new IllegalArgumentException("String is empty");
     }
 
     /**
      <hr>
      <h2>Tests if [list] is empty</h2>
      <h3>If it is —> throws IllegalArgumentException.</h3>
-     Note : already asserts [list] isn't null.<br>
-     <br>
      <hr>
 
      @param collection The List to test for empty value
      */
     public static void assertNotEmpty (@NotNull Collection collection)
     {
-        if (collection == null) throw new IllegalArgumentException("Collection is null");
         if (collection.isEmpty()) throw new IllegalArgumentException("List is empty");
     }
 
     /**
      <hr>
      <h2>Tests if [map] is empty</h2>
      <h3>If it is —> throws IllegalArgumentException.</h3>
-     Note : already asserts [map] isn't null.<br>
-     <br>
      <hr>
 
      @param map The Map to test for empty value
      */
     public static void assertNotEmpty (@NotNull Map map)
     {
-        if (map == null) throw new IllegalArgumentException("Map is null");
         if (map.isEmpty()) throw new IllegalArgumentException("Map is empty");
     }
     //endregion
@@ -115,7 +98,7 @@ public static void assertNotEmpty (@NotNull Map map)
     /**
      <hr>
      <h2>Tests if [val] is > 0</h2>
-     <h3>If it is —> throws IllegalArgumentException.</h3>
+     <h3>If it's not —> throws IllegalArgumentException.</h3>
      <hr>
 
      @param val The value to test for strict positivity

src/main/java/CodingUtils/FormatUtils.java

@@ -10,7 +10,7 @@
  .
  . The FormatUtils	 Class was Coded by : Alexandre BOLOT
  .
- . Last Modified : 20/01/18 00:30
+ . Last Modified : 20/02/18 23:18
  .
  . Contact : [email protected]
  ...............................................................................................................................*/
@@ -23,19 +23,13 @@ public class FormatUtils
     /**
      <hr>
      <h2>Formats [string] with FirstUpperCase format</h2>
-     Note : asserts [string] param isn't null.<br>
-     <br>
      <hr>
 
      @param string String to format
      @return A formatted version of [string]
      */
     public static String toFirstUpperCase (@NotNull String string)
     {
-        //region --> Check params
-        if (string == null) throw new IllegalArgumentException("String param is null");
-        //endregion
-
         if (string.isEmpty()) return string;
         if (string.length() == 1) return string.toUpperCase();
 
@@ -48,18 +42,12 @@ public static String toFirstUpperCase (@NotNull String string)
     /**
      <hr>
      <h2>Prints all elements of the [objects] list</h2>
-     Note : asserts [objects] param isn't null.<br>
-     <br>
      <hr>
 
      @param objects List of T objects to be printed
      */
     public static <T> void printListFancy (@NotNull List<T> objects, @NotNull String start, @NotNull String separator, @NotNull String end)
     {
-        //region --> Check params
-        if (objects == null) throw new IllegalArgumentException("List param is null");
-        //endregion
-
         if (objects.isEmpty())
         {
             System.out.print(start + end);
@@ -82,35 +70,13 @@ public static <T> void printListFancy (@NotNull List<T> objects, @NotNull String
     /**
      <hr>
      <h2>Prints all elements of the [objects] array</h2>
-     Note : asserts [objects] param isn't null.<br>
-     <br>
      <hr>
 
      @param objects Array of T objects to be printed
      */
     public static <T> void printArrayFancy (@NotNull T[] objects, @NotNull String start, @NotNull String separator, @NotNull String end)
     {
-        //region --> Check params
-        if (objects == null) throw new IllegalArgumentException("Array param is null");
-        //endregion
-
-        if (objects.length == 0)
-        {
-            System.out.print(start + end);
-            return;
-        }
-
-        StringBuilder str = new StringBuilder();
-
-        str.append(start == null ? "" : start);
-
-        Arrays.asList(objects).forEach(o -> str.append(o).append(separator == null ? "" : separator));
-
-        if (separator != null) str.deleteCharAt(str.length() - separator.length());
-
-        str.append(end == null ? "" : end);
-
-        System.out.print(str.toString());
+        printListFancy(Arrays.asList(objects), start, separator, end);
     }
     //endregion
 }