Minor performance improvement

Author: benzonico

java-squid/src/main/java/org/sonar/java/ast/visitors/SyntaxHighlighterVisitor.java

@@ -170,8 +170,10 @@ private static List<Integer> startLines(File file, Charset charset) {
       throw Throwables.propagate(e);
     }
     startLines.add(0);
-    for (int i = 0; i < content.length(); i++) {
-      if (content.charAt(i) == '\n' || (content.charAt(i) == '\r' && i + 1 < content.length() && content.charAt(i + 1) != '\n')) {
+    int contentLength = content.length();
+    for (int i = 0; i < contentLength; i++) {
+      char currentChar = content.charAt(i);
+      if (currentChar == '\n' || (currentChar == '\r' && i + 1 < contentLength && content.charAt(i + 1) != '\n')) {
         startLines.add(i + 1);
       }
     }

java-squid/src/main/java/org/sonar/java/resolve/JavaSymbol.java

@@ -291,6 +291,7 @@ Scope completedMembers() {
    */
   public static class TypeJavaSymbol extends JavaSymbol implements TypeSymbol {
 
+    private String fullyQualifiedName;
     Scope members;
     Scope typeParameters;
     List<JavaType.TypeVariableJavaType> typeVariableTypes;
@@ -348,19 +349,22 @@ public Scope typeParameters() {
     }
 
     public String getFullyQualifiedName() {
-      String newQualification = "";
-      if (owner.isPackageSymbol()) {
-        if (!owner.name.isEmpty()) {
-          newQualification = owner.name + ".";
+      if(fullyQualifiedName == null) {
+        String newQualification = "";
+        if (owner.isPackageSymbol()) {
+          if (!owner.name.isEmpty()) {
+            newQualification = owner.name + ".";
+          }
+        } else if (owner.isTypeSymbol()) {
+          newQualification = owner.type.fullyQualifiedName() + "$";
+        } else if (owner.isMethodSymbol()) {
+          newQualification = owner.owner.type().fullyQualifiedName() + "$";
+        } else {
+          throw new IllegalStateException("" + owner);
         }
-      } else if (owner.isTypeSymbol()) {
-        newQualification = owner.type.fullyQualifiedName() + "$";
-      } else if (owner.isMethodSymbol()) {
-        newQualification = owner.owner.type().fullyQualifiedName() + "$";
-      } else {
-        throw new IllegalStateException("" + owner);
+        fullyQualifiedName = newQualification + getInternalName();
       }
-      return newQualification + getInternalName();
+      return fullyQualifiedName;
     }
 
     /**

java-squid/src/main/java/org/sonar/java/se/checks/NullDereferenceCheck.java

@@ -64,14 +64,13 @@ public ProgramState checkPreStatement(CheckerContext context, Tree syntaxNode) {
       // stack is empty, nothing to do.
       return context.getState();
     }
-    if (syntaxNode.is(Tree.Kind.MEMBER_SELECT)) {
-      return checkMemberSelect(context, (MemberSelectExpressionTree) syntaxNode, currentVal);
-    }
+    Tree toCheck = syntaxNode;
     if (syntaxNode.is(Tree.Kind.METHOD_INVOCATION)) {
       MethodInvocationTree methodInvocation = (MethodInvocationTree) syntaxNode;
-      if (methodInvocation.methodSelect().is(Tree.Kind.MEMBER_SELECT)) {
-        return checkMemberSelect(context, (MemberSelectExpressionTree) methodInvocation.methodSelect(), currentVal);
-      }
+      toCheck = methodInvocation.methodSelect();
+    }
+    if (toCheck.is(Tree.Kind.MEMBER_SELECT)) {
+      return checkMemberSelect(context, (MemberSelectExpressionTree) toCheck, currentVal);
     }
     return context.getState();
   }
@@ -86,10 +85,6 @@ private ProgramState checkMemberSelect(CheckerContext context, MemberSelectExpre
       context.reportIssue(syntaxNode, this, "NullPointerException might be thrown as '" + SyntaxTreeNameFinder.getName(syntaxNode) + "' is nullable here");
       return null;
     }
-    if (context.getState().getConstraint(currentVal) == null) {
-      // we dereferenced the symbolic value so we can assume it is not null
-      return currentVal.setSingleConstraint(context.getState(), ObjectConstraint.NOT_NULL);
-    }
     return context.getState();
   }
 
@@ -109,10 +104,7 @@ public ProgramState checkPostStatement(CheckerContext context, Tree syntaxNode)
 
   private static List<ProgramState> setNullConstraint(CheckerContext context, Tree syntaxNode) {
     SymbolicValue val = context.getState().peekValue();
-    if (syntaxNode.is(Tree.Kind.NULL_LITERAL)) {
-      // invariant to check that value was correctly evaluated.
-      assert val != null && val.equals(SymbolicValue.NULL_LITERAL);
-    } else if (syntaxNode.is(Tree.Kind.METHOD_INVOCATION) && isAnnotatedCheckForNull((MethodInvocationTree) syntaxNode)) {
+    if (syntaxNode.is(Tree.Kind.METHOD_INVOCATION) && isAnnotatedCheckForNull((MethodInvocationTree) syntaxNode)) {
       List<ProgramState> states = new ArrayList<>();
       states.addAll(val.setConstraint(context.getState(), ObjectConstraint.NULL));
       states.addAll(val.setConstraint(context.getState(), ObjectConstraint.NOT_NULL));