Merge pull request #1 from citizenjosh/pixeebot/drip-2024-02-20-pixee-java/switch-literal-first

Switch order of literals to prevent NullPointerException

Author: citizenjosh

javaparser-core-generators/src/main/java/com/github/javaparser/generator/VisitorGenerator.java

@@ -79,7 +79,7 @@ protected void after() throws Exception {
 
     private void generateVisitMethodForNode(BaseNodeMetaModel node, ClassOrInterfaceDeclaration visitorClass, CompilationUnit compilationUnit) {
         final Optional<MethodDeclaration> existingVisitMethod = visitorClass.getMethods().stream()
-                .filter(m -> m.getNameAsString().equals("visit"))
+                .filter(m -> "visit".equals(m.getNameAsString()))
                 .filter(m -> m.getParameter(0).getType().toString().equals(node.getTypeName()))
                 .findFirst();
 

javaparser-core-generators/src/main/java/com/github/javaparser/generator/core/other/TokenKindGenerator.java

@@ -53,7 +53,7 @@ public void generate() {
 
         final CompilationUnit javaTokenCu = sourceRoot.parse("com.github.javaparser", "JavaToken.java");
         final ClassOrInterfaceDeclaration javaToken = javaTokenCu.getClassByName("JavaToken").orElseThrow(() -> new AssertionError("Can't find class in java file."));
-        final EnumDeclaration kindEnum = javaToken.findFirst(EnumDeclaration.class, e -> e.getNameAsString().equals("Kind")).orElseThrow(() -> new AssertionError("Can't find class in java file."));
+        final EnumDeclaration kindEnum = javaToken.findFirst(EnumDeclaration.class, e -> "Kind".equals(e.getNameAsString())).orElseThrow(() -> new AssertionError("Can't find class in java file."));
 
         kindEnum.getEntries().clear();
         annotateGenerated(kindEnum);

javaparser-core-generators/src/main/java/com/github/javaparser/generator/core/visitor/CloneVisitorGenerator.java

@@ -64,7 +64,7 @@ protected void generateVisitMethodBody(BaseNodeMetaModel node, MethodDeclaration
         SeparatedItemStringBuilder builder = new SeparatedItemStringBuilder(f("%s r = new %s(", node.getTypeNameGenerified(), node.getTypeNameGenerified()), ",", ");");
         builder.append("n.getTokenRange().orElse(null)");
         for (PropertyMetaModel field : node.getConstructorParameters()) {
-            if (field.getName().equals("comment")) {
+            if ("comment".equals(field.getName())) {
                 continue;
             }
             if (field.getNodeReference().isPresent()) {

javaparser-core/src/main/java/com/github/javaparser/ast/validator/RecordAsTypeIdentifierNotAllowed.java

@@ -39,15 +39,15 @@ public RecordAsTypeIdentifierNotAllowed() {
 
     @Override
     public void visit(Name n, ProblemReporter arg) {
-        if (n.getIdentifier().equals("record") && !validUsage(n)) {
+        if ("record".equals(n.getIdentifier()) && !validUsage(n)) {
             arg.report(n, error);
         }
         super.visit(n, arg);
     }
 
     @Override
     public void visit(SimpleName n, ProblemReporter arg) {
-        if (n.getIdentifier().equals("record") && !validUsage(n)) {
+        if ("record".equals(n.getIdentifier()) && !validUsage(n)) {
             arg.report(n, error);
         }
         super.visit(n, arg);

javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/UnderscoreKeywordValidator.java

@@ -41,7 +41,7 @@ public void visit(SimpleName n, ProblemReporter arg) {
     }
 
     private static void validateIdentifier(Node n, String id, ProblemReporter arg) {
-        if (id.equals("_")) {
+        if ("_".equals(id)) {
             arg.report(n, "'_' is a reserved keyword.");
         }
     }

javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java10PostProcessor.java

@@ -51,7 +51,7 @@ public void postProcess(ParseResult<? extends Node> result, ParserConfiguration
             result.getResult().ifPresent(node -> {
                 node.findAll(ClassOrInterfaceType.class)
                     .forEach(n -> {
-                        if (n.getNameAsString().equals("var")
+                        if ("var".equals(n.getNameAsString())
                                 && !matchForbiddenContext(n)) {
                             n.replace(new VarType(n.getTokenRange().orElse(null)));
                         }

javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Difference.java

@@ -786,7 +786,7 @@ private int getIndexToNextTokenElement(TokenTextElement element, DifferenceEleme
             if (part.equals(token.asString())) {
                 // get 'dot' token
                 token = token.getNextToken().get();
-                if (!token.asString().equals("."))
+                if (!".".equals(token.asString()))
                     break;
                 // get the next part
                 token = token.getNextToken().get();

javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedReferenceTypeDeclaration.java

@@ -360,14 +360,14 @@ default Optional<ResolvedTypeParameterDeclaration> findTypeParameter(String name
      */
     default boolean isJavaLangObject() {
         return this.isClass() && !isAnonymousClass() && // Consider anonymous classes
-        hasName() && getQualifiedName().equals(JAVA_LANG_OBJECT);
+        hasName() && JAVA_LANG_OBJECT.equals(getQualifiedName());
     }
 
     /**
      * @return true, if this represents {@code java.lang.Enum}
      * @see ResolvedReferenceType#isJavaLangEnum()
      */
     default boolean isJavaLangEnum() {
-        return this.isEnum() && getQualifiedName().equals(JAVA_LANG_ENUM);
+        return this.isEnum() && JAVA_LANG_ENUM.equals(getQualifiedName());
     }
 }

javaparser-core/src/main/java/com/github/javaparser/utils/CollectionStrategy.java

@@ -50,7 +50,7 @@ default Optional<Path> getRoot(Path file) {
                 if (parseResult.getResult().isPresent()) {
                     final Optional<CompilationUnit.Storage> storage = parseResult.getResult().flatMap(CompilationUnit::getStorage);
                     if (storage.isPresent()) {
-                        if (storage.get().getFileName().equals("module-info.java")) {
+                        if ("module-info.java".equals(storage.get().getFileName())) {
                             // module-info.java is useless for finding the source root, since it can be placed in any directory.
                             return Optional.empty();
                         }

javaparser-core/src/main/java/com/github/javaparser/utils/ParserCollectionStrategy.java

@@ -66,7 +66,7 @@ public ProjectRoot collect(Path path) {
 
                 @Override
                 public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
-                    if (file.getFileName().toString().equals("module-info.java")) {
+                    if ("module-info.java".equals(file.getFileName().toString())) {
                         // module-info.java is useless for finding the source root, since it can be placed within any directory.
                         return CONTINUE;
                     }