Don't rely on javax.lang.model for validity checks

rife2 · Dec 27, 2024 · d8393df · d8393df
1 parent c59c269
commit d8393df
Showing 1 changed file with 76 additions and 8 deletions.
diff --git a/src/main/java/rife/validation/ValidityChecks.java b/src/main/java/rife/validation/ValidityChecks.java
@@ -6,7 +6,6 @@
 import rife.tools.ArrayUtils;
 import rife.tools.StringUtils;
 
-import javax.lang.model.SourceVersion;
 import java.lang.reflect.Array;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -517,16 +516,16 @@ public static boolean checkJavaPackage(Object value) {
             return false;
         }
 
-        var identifier = true;
+        var java_package = true;
         var it = new StringCharacterIterator(name);
         var segment = new StringBuilder();
         var first = true;
         for (var c = it.first(); c != CharacterIterator.DONE; c = it.next()) {
             if ((first && !Character.isJavaIdentifierStart(c)) ||
                 (!first && !Character.isJavaIdentifierPart(c))) {
                 if (c == '.') {
-                    if (SourceVersion.isKeyword(segment)) {
-                        identifier = false;
+                    if (isJavaKeyword(segment)) {
+                        java_package = false;
                         break;
                     }
 
@@ -535,7 +534,7 @@ public static boolean checkJavaPackage(Object value) {
                     continue;
                 }
                 else {
-                    identifier = false;
+                    java_package = false;
                     break;
                 }
             }
@@ -544,18 +543,87 @@ public static boolean checkJavaPackage(Object value) {
             first = false;
         }
 
-        return identifier && !SourceVersion.isKeyword(segment);
+        return java_package && !isJavaKeyword(segment);
+    }
+
+    public static boolean isJavaKeyword(Object value) {
+        if (null == value) {
+            return false;
+        }
+
+        var id = value.toString();
+
+        switch(id) {
+            // A trip through history
+            case "strictfp":
+            case "assert":
+            case "enum":
+            case "_":
+            case "non-sealed":
+
+            // Keywords common across versions
+
+                // Modifiers
+            case "public":    case "protected": case "private":
+            case "abstract":  case "static":    case "final":
+            case "transient": case "volatile":  case "synchronized":
+            case "native":
+
+                // Declarations
+            case "class":     case "interface": case "extends":
+            case "package":   case "throws":    case "implements":
+
+                // Primitive types and void
+            case "boolean":   case "byte":      case "char":
+            case "short":     case "int":       case "long":
+            case "float":     case "double":
+            case "void":
+
+                // Control flow
+            case "if":      case "else":
+            case "try":     case "catch":    case "finally":
+            case "do":      case "while":
+            case "for":     case "continue":
+            case "switch":  case "case":     case "default":
+            case "break":   case "throw":    case "return":
+
+                // Other keywords
+            case  "this":   case "new":      case "super":
+            case "import":  case "instanceof":
+
+                // Forbidden!
+            case "goto":        case "const":
+
+                // literals
+            case "null":         case "true":       case "false":
+                return true;
+
+            default:
+                return false;
+        }
     }
 
     public static boolean checkJavaIdentifier(Object value) {
         if (null == value) {
             return false;
         }
 
-        if (!(value instanceof CharSequence name)) {
+        if (!(value instanceof String name) || name.isBlank()) {
             return false;
         }
 
-        return SourceVersion.isIdentifier(name);
+        var identifier = true;
+        var first = true;
+        var it = new StringCharacterIterator(name);
+        for (var c = it.first(); c != CharacterIterator.DONE; c = it.next()) {
+            if ((first && !Character.isJavaIdentifierStart(c)) ||
+                (!first && !Character.isJavaIdentifierPart(c))) {
+                identifier = false;
+                break;
+            }
+            first = false;
+        }
+
+        return identifier;
     }
 }