Add more assertions when a string should be used as an identifier - #502

javaparser · Jan 15, 2017 · b55c4de · b55c4de
1 parent 22a97ae
commit b55c4de
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 7 deletions.
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumDeclaration.java
@@ -141,6 +141,7 @@ public EnumDeclaration setImplementedTypes(NodeList<ClassOrInterfaceType> implem
     }
 
     public EnumConstantDeclaration addEnumConstant(String name) {
+        assertNonEmpty(name);
         EnumConstantDeclaration enumConstant = new EnumConstantDeclaration(name);
         getEntries().add(enumConstant);
         enumConstant.setParentNode(this);

diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/VariableDeclarator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/VariableDeclarator.java
@@ -35,6 +35,7 @@
 
 import java.util.Optional;
 
+import static com.github.javaparser.utils.Utils.assertNonEmpty;
 import static com.github.javaparser.utils.Utils.assertNotNull;
 
 /**
@@ -133,7 +134,7 @@ public VariableDeclarator setInitializer(Expression initializer) {
      * @return this, the VariableDeclarator
      */
     public VariableDeclarator setInitializer(String init) {
-        return setInitializer(new NameExpr(assertNotNull(init)));
+        return setInitializer(new NameExpr(assertNonEmpty(init)));
     }
 
     @Override

diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodReferenceExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodReferenceExpr.java
@@ -32,6 +32,8 @@
 
 import java.util.Optional;
 
+import static com.github.javaparser.utils.Utils.assertNonEmpty;
+
 /**
  * Method reference expressions introduced in Java 8 specifically designed to simplify lambda Expressions.
  * Note that the field "identifier", indicating the word to the right of the ::, is not always a method name,
@@ -116,6 +118,7 @@ public String getIdentifier() {
 
     @Override
     public MethodReferenceExpr setIdentifier(String identifier) {
+        assertNonEmpty(identifier);
         notifyPropertyChange(ObservableProperty.IDENTIFIER, this.identifier, identifier);
         this.identifier = identifier;
         return this;

diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Name.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Name.java
@@ -31,7 +31,6 @@
 import java.util.Optional;
 
 import static com.github.javaparser.utils.Utils.assertNonEmpty;
-import static com.github.javaparser.utils.Utils.assertNotNull;
 
 /**
  * A name that may consist of multiple identifiers.
@@ -86,7 +85,7 @@ public final String getIdentifier() {
     public Name setIdentifier(final String identifier) {
         assertNonEmpty(identifier);
         notifyPropertyChange(ObservableProperty.IDENTIFIER, this.identifier, identifier);
-        this.identifier = assertNotNull(identifier);
+        this.identifier = identifier;
         return this;
     }
 

diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithName.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithName.java
@@ -24,6 +24,8 @@
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.expr.Name;
 
+import static com.github.javaparser.utils.Utils.assertNonEmpty;
+
 /**
  * A node with a (qualified) name.
  * <p>
@@ -38,6 +40,7 @@ public interface NodeWithName<N extends Node> {
 
     @SuppressWarnings("unchecked")
     default N setName(String name) {
+        assertNonEmpty(name);
         return setName(Name.parse(name));
     }
 

diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithOptionalLabel.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithOptionalLabel.java
@@ -5,6 +5,8 @@
 
 import java.util.Optional;
 
+import static com.github.javaparser.utils.Utils.assertNonEmpty;
+
 /**
  * A node that can have a label.
  */
@@ -14,6 +16,7 @@ public interface NodeWithOptionalLabel<T extends Node> {
     T setLabel(SimpleName label);
 
     default T setLabel(String label) {
+        assertNonEmpty(label);
         return setLabel(new SimpleName(label));
     }
 

diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithSimpleName.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithSimpleName.java
@@ -24,6 +24,8 @@
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.expr.SimpleName;
 
+import static com.github.javaparser.utils.Utils.assertNonEmpty;
+
 /**
  * A node with a name.
  * <p>
@@ -36,6 +38,7 @@ public interface NodeWithSimpleName<N extends Node> {
 
     @SuppressWarnings("unchecked")
     default N setName(String name) {
+        assertNonEmpty(name);
         return setName(new SimpleName(name));
     }
 

diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithType.java
@@ -26,6 +26,8 @@
 import com.github.javaparser.ast.type.ClassOrInterfaceType;
 import com.github.javaparser.ast.type.Type;
 
+import static com.github.javaparser.utils.Utils.assertNonEmpty;
+
 /**
  * A node with a type.
  * <p>
@@ -64,6 +66,7 @@ default N setType(Class<?> typeClass) {
 
     @SuppressWarnings("unchecked")
     default N setType(final String type) {
+        assertNonEmpty(type);
         ClassOrInterfaceType classOrInterfaceType = new ClassOrInterfaceType(type);
         return setType((T) classOrInterfaceType);
     }

diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/Utils.java b/javaparser-core/src/main/java/com/github/javaparser/utils/Utils.java
@@ -50,11 +50,11 @@ public static <T> T assertNotNull(T o) {
         return o;
     }
 
-    public static String assertNonEmpty(String id) {
-        if (id == null || id.isEmpty()) {
-            throw new AssertionError("An identifier was unexpectedly empty.");
+    public static String assertNonEmpty(String string) {
+        if (string == null || string.isEmpty()) {
+            throw new AssertionError("A string was unexpectedly empty.");
         }
-        return id;
+        return string;
     }
 
     /**