removed assertutils

Author: raydac

src/main/java/com/igormaznitsa/prologparser/terms/PrologInt.java

@@ -27,7 +27,6 @@
 import java.util.Map;
 import java.util.stream.IntStream;
 
-import static com.igormaznitsa.prologparser.utils.AssertUtils.assertStringNotNullAndNotEmpty;
 import static java.util.Objects.requireNonNull;
 
 /**
@@ -74,9 +73,8 @@ public PrologInt(final BigInteger value, final int line, final int pos) {
   }
 
   private static BigInteger valueOf(final String text) {
-    assertStringNotNullAndNotEmpty(text);
     BigInteger result = null;
-    if (text.charAt(0) == '-') {
+    if (assertNonEmptyString(text).charAt(0) == '-') {
       if (text.length() < 4) {
         result = cachedValues.get(text);
       }

src/main/java/com/igormaznitsa/prologparser/terms/PrologTerm.java

@@ -26,6 +26,7 @@
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Stream;
 
 import static com.igormaznitsa.prologparser.terms.Quotation.NONE;
@@ -87,6 +88,13 @@ public static Quotation findQuotation(final String atomText) {
     return result;
   }
 
+  protected static String assertNonEmptyString(final String str) {
+    if (Objects.requireNonNull(str).isEmpty()) {
+      throw new IllegalArgumentException("Expected non-empty string");
+    }
+    return str;
+  }
+
   /**
    * Flat content of the term for comma, make sense for structures.
    *

src/main/java/com/igormaznitsa/prologparser/terms/PrologVar.java

@@ -21,8 +21,6 @@
 
 package com.igormaznitsa.prologparser.terms;
 
-import com.igormaznitsa.prologparser.utils.AssertUtils;
-
 /**
  * Representation of prolog variable.
  */
@@ -46,7 +44,7 @@ public PrologVar(final int line, final int pos) {
   public PrologVar(final String text) {
     super(text, Quotation.NONE);
 
-    final char startWith = AssertUtils.assertStringNotNullAndNotEmpty(text).charAt(0);
+    final char startWith = assertNonEmptyString(text).charAt(0);
 
     if (!Character.isUpperCase(startWith) && startWith != '_') {
       throw new IllegalArgumentException("Var must start with upper case char or '_' [" + text + ']');

src/main/java/com/igormaznitsa/prologparser/tokenizer/Op.java

@@ -27,7 +27,6 @@
 import com.igormaznitsa.prologparser.terms.PrologTerm;
 import com.igormaznitsa.prologparser.terms.Quotation;
 import com.igormaznitsa.prologparser.terms.TermType;
-import com.igormaznitsa.prologparser.utils.AssertUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -221,9 +220,7 @@ private static String[] assertOpValidOpName(final String[] names) {
   }
 
   private static String assertOpValidOpName(final String name) {
-    AssertUtils.assertStringNotNullAndNotEmpty(name);
-
-    final char firstChar = name.charAt(0);
+    final char firstChar = assertNonEmptyString(name).charAt(0);
 
     if (Character.isWhitespace(firstChar) || Character.isISOControl(firstChar)) {
       throw new IllegalArgumentException("Space char as first one");