Remove redundant type arguments

and add parameter commands in places where the parameters aren't very
self-documenting.

Fixes #130

MOE_MIGRATED_REVID=172167200

Author: jbduncan

core/src/main/java/com/google/googlejavaformat/Doc.java

@@ -271,11 +271,11 @@ public State computeBreaks(CommentsHelper commentsHelper, int maxWidth, State st
     private static void splitByBreaks(List<Doc> docs, List<List<Doc>> splits, List<Break> breaks) {
       splits.clear();
       breaks.clear();
-      splits.add(new ArrayList<Doc>());
+      splits.add(new ArrayList<>());
       for (Doc doc : docs) {
         if (doc instanceof Break) {
           breaks.add((Break) doc);
-          splits.add(new ArrayList<Doc>());
+          splits.add(new ArrayList<>());
         } else {
           getLast(splits).add(doc);
         }
@@ -288,7 +288,7 @@ private State computeBroken(CommentsHelper commentsHelper, int maxWidth, State s
 
       state =
           computeBreakAndSplit(
-              commentsHelper, maxWidth, state, Optional.<Break>absent(), splits.get(0));
+              commentsHelper, maxWidth, state, /* optBreakDoc= */ Optional.absent(), splits.get(0));
 
       // Handle following breaks and split.
       for (int i = 0; i < breaks.size(); i++) {
@@ -571,19 +571,19 @@ private Break(FillMode fillMode, String flat, Indent plusIndent, Optional<BreakT
      * Make a {@code Break}.
      *
      * @param fillMode the {@link FillMode}
-     * @param flat the the text when not broken
+     * @param flat the text when not broken
      * @param plusIndent extra indent if taken
      * @return the new {@code Break}
      */
     public static Break make(FillMode fillMode, String flat, Indent plusIndent) {
-      return new Break(fillMode, flat, plusIndent, Optional.<BreakTag>absent());
+      return new Break(fillMode, flat, plusIndent, /* optTag= */ Optional.absent());
     }
 
     /**
      * Make a {@code Break}.
      *
      * @param fillMode the {@link FillMode}
-     * @param flat the the text when not broken
+     * @param flat the text when not broken
      * @param plusIndent extra indent if taken
      * @param optTag an optional tag for remembering whether the break was taken
      * @return the new {@code Break}

core/src/main/java/com/google/googlejavaformat/OpsBuilder.java

@@ -81,7 +81,8 @@ public abstract static class BlankLineWanted {
      * Explicitly preserve blank lines from the input (e.g. before the first member in a class
      * declaration). Overrides conditional blank lines.
      */
-    public static final BlankLineWanted PRESERVE = new SimpleBlankLine(Optional.<Boolean>absent());
+    public static final BlankLineWanted PRESERVE =
+        new SimpleBlankLine(/* wanted= */ Optional.absent());
 
     /** Is the blank line wanted? */
     public abstract Optional<Boolean> wanted();
@@ -239,7 +240,10 @@ public final void drain() {
         Input.Token token = tokens.get(tokenI++);
         add(
             Doc.Token.make(
-                token, Doc.Token.RealOrImaginary.IMAGINARY, ZERO, Optional.<Indent>absent()));
+                token,
+                Doc.Token.RealOrImaginary.IMAGINARY,
+                ZERO,
+                /* breakAndIndentTrailingComment= */ Optional.absent()));
       }
     }
     this.inputPosition = inputPosition;
@@ -265,7 +269,7 @@ public final Optional<String> peekToken() {
     ImmutableList<? extends Input.Token> tokens = input.getTokens();
     return tokenI < tokens.size()
         ? Optional.of(tokens.get(tokenI).getTok().getOriginalText())
-        : Optional.<String>absent();
+        : Optional.absent();
   }
 
   /**
@@ -275,7 +279,11 @@ public final Optional<String> peekToken() {
    * @param token the optional token
    */
   public final void guessToken(String token) {
-    token(token, Doc.Token.RealOrImaginary.IMAGINARY, ZERO, Optional.<Indent>absent());
+    token(
+        token,
+        Doc.Token.RealOrImaginary.IMAGINARY,
+        ZERO,
+        /* breakAndIndentTrailingComment=  */ Optional.absent());
   }
 
   public final void token(
@@ -314,7 +322,10 @@ public final void op(String op) {
     int opN = op.length();
     for (int i = 0; i < opN; i++) {
       token(
-          op.substring(i, i + 1), Doc.Token.RealOrImaginary.REAL, ZERO, Optional.<Indent>absent());
+          op.substring(i, i + 1),
+          Doc.Token.RealOrImaginary.REAL,
+          ZERO,
+          /* breakAndIndentTrailingComment=  */ Optional.absent());
     }
   }
 
@@ -382,7 +393,7 @@ public final void breakToFill(String flat) {
    * @param plusIndent extra indent if taken
    */
   public final void breakOp(Doc.FillMode fillMode, String flat, Indent plusIndent) {
-    breakOp(fillMode, flat, plusIndent, Optional.<BreakTag>absent());
+    breakOp(fillMode, flat, plusIndent, /* optionalTag=  */ Optional.absent());
   }
 
   /**
@@ -596,8 +607,8 @@ private static boolean isForcedBreak(Op op) {
 
   private static List<Op> makeComment(Input.Tok comment) {
     return comment.isSlashStarComment()
-        ? ImmutableList.<Op>of(Doc.Tok.make(comment))
-        : ImmutableList.<Op>of(Doc.Tok.make(comment), Doc.Break.makeForced());
+        ? ImmutableList.of(Doc.Tok.make(comment))
+        : ImmutableList.of(Doc.Tok.make(comment), Doc.Break.makeForced());
   }
 
   @Override

core/src/main/java/com/google/googlejavaformat/java/DimensionHelpers.java

@@ -115,7 +115,7 @@ private static Tree extractDims(Deque<List<AnnotationTree>> dims, Tree node) {
           return node;
         }
         node = extractDims(dims, annotatedTypeTree.getUnderlyingType());
-        dims.addFirst(ImmutableList.<AnnotationTree>copyOf(annotatedTypeTree.getAnnotations()));
+        dims.addFirst(ImmutableList.copyOf(annotatedTypeTree.getAnnotations()));
         return node;
       default:
         return node;

core/src/main/java/com/google/googlejavaformat/java/Formatter.java

@@ -31,7 +31,6 @@
 import com.google.googlejavaformat.Newlines;
 import com.google.googlejavaformat.Op;
 import com.google.googlejavaformat.OpsBuilder;
-import java.io.File;
 import java.io.IOError;
 import java.io.IOException;
 import java.net.URI;
@@ -122,7 +121,7 @@ static void format(
     JCCompilationUnit unit;
     JavacFileManager fileManager = new JavacFileManager(context, true, UTF_8);
     try {
-      fileManager.setLocation(StandardLocation.PLATFORM_CLASS_PATH, ImmutableList.<File>of());
+      fileManager.setLocation(StandardLocation.PLATFORM_CLASS_PATH, ImmutableList.of());
     } catch (IOException e) {
       // impossible
       throw new IOError(e);

core/src/main/java/com/google/googlejavaformat/java/GoogleJavaFormatVersion.java

@@ -15,5 +15,5 @@
 package com.google.googlejavaformat.java;
 
 public class GoogleJavaFormatVersion {
-  public static final String VERSION = "1.5-SNAPSHOT";
+  public static final String VERSION = "1.0";
 }

core/src/main/java/com/google/googlejavaformat/java/JavaInput.java

@@ -328,7 +328,7 @@ public ImmutableMap<Integer, Integer> getPositionToColumnMap() {
 
   /** Lex the input and build the list of toks. */
   private ImmutableList<Tok> buildToks(String text) throws FormatterException {
-    ImmutableList<Tok> toks = buildToks(text, ImmutableSet.<TokenKind>of());
+    ImmutableList<Tok> toks = buildToks(text, ImmutableSet.of());
     kN = getLast(toks).getIndex();
     computeRanges(toks);
     return toks;