Miscellaneous code simplifications

------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=165460941
google · Aug 16, 2017 · b33fc4f · b33fc4f
1 parent 6b963c8
commit b33fc4f
Show file tree

Hide file tree

Showing 35 changed files with 109 additions and 118 deletions.
diff --git a/src/com/google/javascript/jscomp/BasicErrorManager.java b/src/com/google/javascript/jscomp/BasicErrorManager.java
@@ -36,7 +36,7 @@
  */
 public abstract class BasicErrorManager implements ErrorManager {
   private final PriorityQueue<ErrorWithLevel> messages =
-      new PriorityQueue<ErrorWithLevel>(1, new LeveledJSErrorComparator());
+      new PriorityQueue<>(1, new LeveledJSErrorComparator());
   private final Set<ErrorWithLevel> alreadyAdded = new HashSet<>();
   private int errorCount = 0;
   private int warningCount = 0;
@@ -45,8 +45,7 @@ public abstract class BasicErrorManager implements ErrorManager {
   @Override
   public void report(CheckLevel level, JSError error) {
     ErrorWithLevel e = new ErrorWithLevel(error, level);
-    if (!alreadyAdded.contains(e)) {
-      alreadyAdded.add(e);
+    if (alreadyAdded.add(e)) {
       messages.add(e);
       if (level == CheckLevel.ERROR) {
         errorCount++;

diff --git a/src/com/google/javascript/jscomp/SourceFile.java b/src/com/google/javascript/jscomp/SourceFile.java
@@ -616,10 +616,8 @@ public synchronized String getCode() throws IOException {
       String cachedCode = super.getCode();
 
       if (cachedCode == null) {
-        try {
-          try (Reader r = getCodeReader()) {
-            cachedCode = CharStreams.toString(r);
-          }
+        try (Reader r = getCodeReader()) {
+          cachedCode = CharStreams.toString(r);
         } catch (java.nio.charset.MalformedInputException e) {
           throw new IOException("Failed to read: " + path + ", is this input UTF-8 encoded?", e);
         }

diff --git a/src/com/google/javascript/jscomp/ant/CompileTask.java b/src/com/google/javascript/jscomp/ant/CompileTask.java
@@ -386,15 +386,14 @@ public void execute() {
 
         if (this.outputWrapperFile != null) {
           try {
-            this.outputWrapper = Files.toString(this.outputWrapperFile, UTF_8);
+            this.outputWrapper = Files.asCharSource(this.outputWrapperFile, UTF_8).read();
           } catch (Exception e) {
             throw new BuildException("Invalid output_wrapper_file specified.");
           }
         }
 
         if (this.outputWrapper != null) {
-          int pos = -1;
-          pos = this.outputWrapper.indexOf(CommandLineRunner.OUTPUT_MARKER);
+          int pos = this.outputWrapper.indexOf(CommandLineRunner.OUTPUT_MARKER);
           if (pos > -1) {
             String prefix = this.outputWrapper.substring(0, pos);
             source.insert(0, prefix);
@@ -422,10 +421,8 @@ public void execute() {
   }
 
   private void flushSourceMap(SourceMap sourceMap) {
-    try {
-      FileWriter out = new FileWriter(sourceMapOutputFile);
+    try (FileWriter out = new FileWriter(sourceMapOutputFile)) {
       sourceMap.appendTo(out, outputFile.getName());
-      out.close();
     } catch (IOException e) {
       throw new BuildException("Cannot write sourcemap to file.", e);
     }
@@ -683,12 +680,9 @@ private void writeResult(String source) {
           this.outputFile.getParentFile(), Project.MSG_DEBUG);
     }
 
-    try {
-      OutputStreamWriter out = new OutputStreamWriter(
-          new FileOutputStream(this.outputFile), outputEncoding);
+    try (OutputStreamWriter out =
+        new OutputStreamWriter(new FileOutputStream(this.outputFile), outputEncoding)) {
       out.append(source);
-      out.flush();
-      out.close();
     } catch (IOException e) {
       throw new BuildException(e);
     }

diff --git a/src/com/google/javascript/jscomp/newtypes/FunctionType.java b/src/com/google/javascript/jscomp/newtypes/FunctionType.java
@@ -1458,7 +1458,7 @@ public StringBuilder appendTo(StringBuilder builder, ToStringContext ctx) {
     }
     if (!this.typeParameters.isEmpty()) {
       builder.append("<");
-      builder.append(Joiner.on(",").join(getPrettyTypeParams(this.typeParameters.asList(), ctx)));
+      Joiner.on(",").appendTo(builder, getPrettyTypeParams(this.typeParameters.asList(), ctx));
       builder.append(">");
     }
     builder.append("function(");

diff --git a/src/com/google/javascript/jscomp/newtypes/JSTypeCreatorFromJSDoc.java b/src/com/google/javascript/jscomp/newtypes/JSTypeCreatorFromJSDoc.java
@@ -610,13 +610,13 @@ private void fillInFunTypeBuilder(
       Node jsdocNode, RawNominalType ownerType, DeclaredTypeRegistry registry,
       ImmutableList<String> typeParameters, FunctionTypeBuilder builder) {
     Node child = jsdocNode.getFirstChild();
-    if (child.getToken() == Token.THIS) {
+    if (child.isThis()) {
       if (ownerType == null) {
         builder.addReceiverType(
             getThisOrNewType(child.getFirstChild(), registry, typeParameters));
       }
       child = child.getNext();
-    } else if (child.getToken() == Token.NEW) {
+    } else if (child.isNew()) {
       Node newTypeNode = child.getFirstChild();
       JSType t = getThisOrNewType(newTypeNode, registry, typeParameters);
       if (!t.isSubtypeOf(this.commonTypes.getTopObject())
@@ -627,7 +627,7 @@ private void fillInFunTypeBuilder(
       builder.addNominalType(t);
       child = child.getNext();
     }
-    if (child.getToken() == Token.PARAM_LIST) {
+    if (child.isParamList()) {
       for (Node arg = child.getFirstChild(); arg != null; arg = arg.getNext()) {
         try {
           switch (arg.getToken()) {
@@ -998,7 +998,7 @@ private NominalType getMaybeHigherOrderParentClass(Node docNode, String function
       Node funNode, JSType extendedType, DeclaredTypeRegistry registry) {
     if (extendedType.isUnknown()
         && docNode.getToken() == Token.BANG
-        && docNode.getFirstChild().getToken() == Token.STRING) {
+        && docNode.getFirstChild().isString()) {
       String varname = docNode.getFirstChild().getString();
       Declaration decl = registry.getDeclaration(QualifiedName.fromQualifiedString(varname), false);
       if (decl != null) {

diff --git a/src/com/google/javascript/jscomp/newtypes/TypeParameters.java b/src/com/google/javascript/jscomp/newtypes/TypeParameters.java
@@ -50,9 +50,7 @@ static TypeParameters make(List<String> ordinaryTypeParams, Map<String, Node> tt
     for (String typeParam : ordinaryTypeParams) {
       builder.put(typeParam, IR.empty());
     }
-    for (Map.Entry<String, Node> entry : ttlParams.entrySet()) {
-      builder.put(entry);
-    }
+    builder.putAll(ttlParams);
     return new TypeParameters(builder.build());
   }
 

diff --git a/src/com/google/javascript/jscomp/resources/GwtProperties.java b/src/com/google/javascript/jscomp/resources/GwtProperties.java
@@ -56,7 +56,7 @@ private static String trimLeft(String str) {
   private static int findDelimiter(String line) {
     if (line.contains(":") || line.contains("=")) {
       if (line.indexOf(':') == -1) {
-        return line.indexOf("=");
+        return line.indexOf('=');
       }
       if (line.indexOf('=') == -1) {
         return line.indexOf(':');

diff --git a/test/com/google/javascript/jscomp/BasicErrorManagerTest.java b/test/com/google/javascript/jscomp/BasicErrorManagerTest.java
@@ -31,7 +31,7 @@
 public final class BasicErrorManagerTest extends TestCase {
   private static final String NULL_SOURCE = null;
 
-  private LeveledJSErrorComparator comparator = new LeveledJSErrorComparator();
+  private final LeveledJSErrorComparator comparator = new LeveledJSErrorComparator();
 
   static final CheckLevel E = CheckLevel.ERROR;
 

diff --git a/test/com/google/javascript/jscomp/ClosureCodeRemovalTest.java b/test/com/google/javascript/jscomp/ClosureCodeRemovalTest.java
@@ -23,7 +23,7 @@
  */
 public final class ClosureCodeRemovalTest extends CompilerTestCase {
 
-  private static String EXTERNS = "var window;";
+  private static final String EXTERNS = "var window;";
 
   public ClosureCodeRemovalTest() {
     super(EXTERNS);

diff --git a/test/com/google/javascript/jscomp/ClosureCodingConventionTest.java b/test/com/google/javascript/jscomp/ClosureCodingConventionTest.java
@@ -28,7 +28,7 @@
  * Test class for {@link GoogleCodingConvention}.
  */
 public final class ClosureCodingConventionTest extends TestCase {
-  private ClosureCodingConvention conv = new ClosureCodingConvention();
+  private final ClosureCodingConvention conv = new ClosureCodingConvention();
 
   public void testVarAndOptionalParams() {
     Node args = new Node(Token.PARAM_LIST,

diff --git a/test/com/google/javascript/jscomp/CombinedCompilerPassTest.java b/test/com/google/javascript/jscomp/CombinedCompilerPassTest.java
@@ -93,9 +93,9 @@ public void setUp() throws Exception {
    * rooted with specified strings.
    */
   private static class ConcatTraversal implements Callback {
-    private StringBuilder visited = new StringBuilder();
-    private StringBuilder shouldTraversed = new StringBuilder();
-    private Set<String> ignoring = new HashSet<>();
+    private final StringBuilder visited = new StringBuilder();
+    private final StringBuilder shouldTraversed = new StringBuilder();
+    private final Set<String> ignoring = new HashSet<>();
 
     ConcatTraversal ignore(String s) {
       ignoring.add(s);
@@ -135,9 +135,9 @@ Collection<String> getIgnoring() {
    * and the expected pre- and post-order traversal results.
    */
   private static class TestHelper {
-    private ConcatTraversal traversal;
-    private String expectedVisited;
-    private String shouldTraverseExpected;
+    private final ConcatTraversal traversal;
+    private final String expectedVisited;
+    private final String shouldTraverseExpected;
 
     TestHelper(ConcatTraversal traversal, String expectedVisited,
          String shouldTraverseExpected) {

diff --git a/test/com/google/javascript/jscomp/CompilerTest.java b/test/com/google/javascript/jscomp/CompilerTest.java
@@ -218,14 +218,14 @@ public void testResolveRelativeSourceMap() throws Exception {
     File tempDir = Files.createTempDir();
     String code = SOURCE_MAP_TEST_CODE + "\n//# sourceMappingURL=foo.js.map";
     File jsFile = new File(tempDir, "foo.js");
-    Files.write(code, jsFile, Charsets.UTF_8);
+    Files.asCharSink(jsFile, Charsets.UTF_8).write(code);
     File sourceMapFile = new File(tempDir, "foo.js.map");
-    Files.write(SOURCE_MAP, sourceMapFile, Charsets.UTF_8);
+    Files.asCharSink(sourceMapFile, Charsets.UTF_8).write(SOURCE_MAP);
 
     CompilerInput input = new CompilerInput(SourceFile.fromFile(jsFile.getAbsolutePath()));
     input.getAstRoot(compiler);
     // The source map is still
-    assertThat(compiler.inputSourceMaps.size()).isEqualTo(1);
+    assertThat(compiler.inputSourceMaps).hasSize(1);
 
     for (SourceMapInput inputSourceMap : compiler.inputSourceMaps.values()) {
       SourceMapConsumerV3 sourceMap = inputSourceMap.getSourceMap(null);
@@ -242,14 +242,14 @@ public void testResolveRelativeDirSourceMap() throws Exception {
     relativedir.mkdir();
     String code = SOURCE_MAP_TEST_CODE + "\n//# sourceMappingURL=relativedir/foo.js.map";
     File jsFile = new File(tempDir, "foo.js");
-    Files.write(code, jsFile, Charsets.UTF_8);
+    Files.asCharSink(jsFile, Charsets.UTF_8).write(code);
     File sourceMapFile = new File(relativedir, "foo.js.map");
-    Files.write(SOURCE_MAP, sourceMapFile, Charsets.UTF_8);
+    Files.asCharSink(sourceMapFile, Charsets.UTF_8).write(SOURCE_MAP);
 
     CompilerInput input = new CompilerInput(SourceFile.fromFile(jsFile.getAbsolutePath()));
     input.getAstRoot(compiler);
     // The source map is still
-    assertThat(compiler.inputSourceMaps.size()).isEqualTo(1);
+    assertThat(compiler.inputSourceMaps).hasSize(1);
 
     for (SourceMapInput inputSourceMap : compiler.inputSourceMaps.values()) {
       SourceMapConsumerV3 sourceMap = inputSourceMap.getSourceMap(null);
@@ -263,11 +263,11 @@ public void testMissingSourceMapFile() throws Exception {
     File tempDir = Files.createTempDir();
     String code = SOURCE_MAP_TEST_CODE + "\n//# sourceMappingURL=foo-does-not-exist.js.map";
     File jsFile = new File(tempDir, "foo2.js");
-    Files.write(code, jsFile, Charsets.UTF_8);
+    Files.asCharSink(jsFile, Charsets.UTF_8).write(code);
 
     CompilerInput input = new CompilerInput(SourceFile.fromFile(jsFile.getAbsolutePath()));
     input.getAstRoot(compiler);
-    assertThat(compiler.inputSourceMaps.size()).isEqualTo(1);
+    assertThat(compiler.inputSourceMaps).hasSize(1);
 
     TestErrorManager errorManager = new TestErrorManager();
     for (SourceMapInput inputSourceMap : compiler.inputSourceMaps.values()) {
@@ -286,12 +286,12 @@ public void testNoWarningMissingAbsoluteSourceMap() throws Exception {
     File tempDir = Files.createTempDir();
     String code = SOURCE_MAP_TEST_CODE + "\n//# sourceMappingURL=/some/missing/path/foo.js.map";
     File jsFile = new File(tempDir, "foo.js");
-    Files.write(code, jsFile, Charsets.UTF_8);
+    Files.asCharSink(jsFile, Charsets.UTF_8).write(code);
 
     CompilerInput input = new CompilerInput(SourceFile.fromFile(jsFile.getAbsolutePath()));
     input.getAstRoot(compiler);
     // The source map is still
-    assertThat(compiler.inputSourceMaps.size()).isEqualTo(0);
+    assertThat(compiler.inputSourceMaps).isEmpty();
 
     // No warnings for unresolved absolute paths.
     assertEquals(0, errorManager.getWarningCount());

diff --git a/test/com/google/javascript/jscomp/CompilerTestCase.java b/test/com/google/javascript/jscomp/CompilerTestCase.java
@@ -562,7 +562,7 @@ protected int getNumRepetitions() {
   /** Adds the given DiagnosticTypes to the set of warnings to ignore. */
   protected final void ignoreWarnings(DiagnosticType... warnings) {
     checkState(this.setUpRan, "Attempted to configure before running setUp().");
-    ignoredWarnings.addAll(Arrays.asList(warnings));
+    Collections.addAll(ignoredWarnings, warnings);
   }
 
   /** Adds the given DiagnosticGroups to the set of warnings to ignore. */
@@ -1916,7 +1916,7 @@ protected final List<Node> findQualifiedNameNodes(final String name, Node root)
         new NodeUtil.Visitor() {
           @Override
           public void visit(Node n) {
-            if (name.equals(n.getQualifiedName())) {
+            if (n.matchesQualifiedName(name)) {
               matches.add(n);
             }
           }

diff --git a/test/com/google/javascript/jscomp/DataFlowAnalysisTest.java b/test/com/google/javascript/jscomp/DataFlowAnalysisTest.java
@@ -951,7 +951,9 @@ public int compare(
       constProp.analyze(MAX_STEP);
       fail("Expected MaxIterationsExceededException to be thrown.");
     } catch (MaxIterationsExceededException e) {
-      assertEquals("Analysis did not terminate after " + MAX_STEP + " iterations", e.getMessage());
+      assertThat(e)
+          .hasMessageThat()
+          .isEqualTo("Analysis did not terminate after " + MAX_STEP + " iterations");
     }
   }
 

diff --git a/test/com/google/javascript/jscomp/DefaultCodingConventionTest.java b/test/com/google/javascript/jscomp/DefaultCodingConventionTest.java
@@ -22,14 +22,13 @@
 import com.google.javascript.rhino.Node;
 import com.google.javascript.rhino.StaticSourceFile;
 import com.google.javascript.rhino.Token;
-
 import junit.framework.TestCase;
 
 /**
  * Test class for the default {@link CodingConvention}.
  */
 public final class DefaultCodingConventionTest extends TestCase {
-  private CodingConvention conv = CodingConventions.getDefault();
+  private final CodingConvention conv = CodingConventions.getDefault();
 
   public void testVarAndOptionalParams() {
     Node args = new Node(Token.PARAM_LIST,

diff --git a/test/com/google/javascript/jscomp/DisambiguatePropertiesTest.java b/test/com/google/javascript/jscomp/DisambiguatePropertiesTest.java
@@ -33,7 +33,7 @@
 
 public final class DisambiguatePropertiesTest extends TypeICompilerTestCase {
   private DisambiguateProperties lastPass;
-  private static String renameFunctionDefinition =
+  private static final String RENAME_FUNCTION_DEFINITION =
       "/** @const */ var goog = {};\n"
           + "/** @const */ goog.reflect = {};\n"
           + "/** @return {string} */\n"
@@ -84,7 +84,7 @@ public void testOneType1() {
     testSets(js, js, "{a=[[Foo.prototype]]}");
 
     js =
-        renameFunctionDefinition
+        RENAME_FUNCTION_DEFINITION
             + "/** @constructor */ function Foo() {}\n"
             + "Foo.prototype.a = 0;\n"
             + "/** @type {Foo} */\n"
@@ -104,7 +104,7 @@ public void testOneType2() {
     testSets(js, js, expected);
 
     js =
-        renameFunctionDefinition
+        RENAME_FUNCTION_DEFINITION
             + "/** @constructor */ function Foo() {}\n"
             + "Foo.prototype = {a: 0};\n"
             + "/** @type {Foo} */\n"
@@ -125,7 +125,7 @@ public void testOneType3() {
     testSets(js, js, expected);
 
     js =
-        renameFunctionDefinition
+        RENAME_FUNCTION_DEFINITION
             + "/** @constructor */ function Foo() {}\n"
             + "Foo.prototype = { get a() {return  0},"
             + "                  set a(b) {} };\n"

diff --git a/test/com/google/javascript/jscomp/Es6SyntacticScopeCreatorTest.java b/test/com/google/javascript/jscomp/Es6SyntacticScopeCreatorTest.java
@@ -856,7 +856,7 @@ public void testFunctionName() {
     assertTrue(globalScope.isDeclared("f", false));
     assertFalse(globalScope.isDeclared("foo", false));
 
-    Node fNode = root.getFirstChild().getFirstChild().getFirstChild();
+    Node fNode = root.getFirstChild().getFirstFirstChild();
     Scope fScope = scopeCreator.createScope(fNode, globalScope);
     assertFalse(fScope.isDeclared("f", false));
     assertTrue(fScope.isDeclared("foo", false));
@@ -869,7 +869,7 @@ public void testClassName() {
     assertTrue(globalScope.isDeclared("Clazz", false));
     assertFalse(globalScope.isDeclared("Foo", false));
 
-    Node classNode = root.getFirstChild().getFirstChild().getFirstChild();
+    Node classNode = root.getFirstChild().getFirstFirstChild();
     Scope classScope = scopeCreator.createScope(classNode, globalScope);
     assertFalse(classScope.isDeclared("Clazz", false));
     assertTrue(classScope.isDeclared("Foo", false));

diff --git a/test/com/google/javascript/jscomp/FixedPointGraphTraversalTest.java b/test/com/google/javascript/jscomp/FixedPointGraphTraversalTest.java
@@ -16,6 +16,8 @@
 
 package com.google.javascript.jscomp;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import com.google.javascript.jscomp.graph.DiGraph;
 import com.google.javascript.jscomp.graph.FixedPointGraphTraversal;
 import com.google.javascript.jscomp.graph.FixedPointGraphTraversal.EdgeCallback;
@@ -48,7 +50,7 @@ public boolean traverseEdge(Counter source, String e, Counter dest) {
   private DiGraph<Counter, String> graph;
 
   private Counter A, B, C, D, E;
-  private CounterIncrementer callback = new CounterIncrementer();
+  private final CounterIncrementer callback = new CounterIncrementer();
   private FixedPointGraphTraversal<Counter, String> traversal =
       new FixedPointGraphTraversal<>(callback);
 
@@ -169,7 +171,7 @@ public boolean traverseEdge(Counter source, String e, Counter dest) {
       fail("Expecting Error: " +
           FixedPointGraphTraversal.NON_HALTING_ERROR_MSG);
     } catch (IllegalStateException e) {
-      assertEquals(FixedPointGraphTraversal.NON_HALTING_ERROR_MSG, e.getMessage());
+      assertThat(e).hasMessageThat().isEqualTo(FixedPointGraphTraversal.NON_HALTING_ERROR_MSG);
     }
   }
 

diff --git a/test/com/google/javascript/jscomp/FunctionInjectorTest.java b/test/com/google/javascript/jscomp/FunctionInjectorTest.java
@@ -39,7 +39,7 @@ public final class FunctionInjectorTest extends TestCase {
   static final InliningMode INLINE_DIRECT = InliningMode.DIRECT;
   static final InliningMode INLINE_BLOCK = InliningMode.BLOCK;
   private boolean assumeStrictThis = false;
-  private boolean assumeMinimumCapture = false;
+  private final boolean assumeMinimumCapture = false;
 
   @Override
   protected void setUp() throws Exception {