Break a cycle between javadoc and java packages

cushon · cushon · commit bb45148d20d4 · 2018-04-09T18:29:38.000-07:00
This makes GJF more jadep-friendly.

MOE_MIGRATED_REVID=191617991
diff --git a/core/src/main/java/com/google/googlejavaformat/java/JavaFormatterOptions.java b/core/src/main/java/com/google/googlejavaformat/java/JavaFormatterOptions.java
@@ -15,6 +15,7 @@
 package com.google.googlejavaformat.java;
 
 import com.google.errorprone.annotations.Immutable;
+import com.google.googlejavaformat.java.javadoc.JavadocOptions;
 
 /**
  * Options for a google-java-format invocation.
@@ -27,7 +28,7 @@
  * preferences, and in fact it would work directly against our primary goals.
  */
 @Immutable
-public class JavaFormatterOptions {
+public class JavaFormatterOptions implements JavadocOptions {
 
   static final int DEFAULT_MAX_LINE_LENGTH = 100;
 
@@ -57,6 +58,7 @@ private JavaFormatterOptions(Style style) {
   }
 
   /** Returns the maximum formatted width */
+  @Override
   public int maxLineLength() {
     return DEFAULT_MAX_LINE_LENGTH;
   }
diff --git a/core/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocFormatter.java b/core/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocFormatter.java
@@ -21,7 +21,6 @@
 import static java.util.regex.Pattern.compile;
 
 import com.google.common.collect.ImmutableList;
-import com.google.googlejavaformat.java.JavaFormatterOptions;
 import com.google.googlejavaformat.java.javadoc.JavadocLexer.LexException;
 import java.util.List;
 import java.util.regex.Matcher;
@@ -40,7 +39,7 @@ public final class JavadocFormatter {
    * Formats the given Javadoc comment, which must start with ∕✱✱ and end with ✱∕. The output will
    * start and end with the same characters.
    */
-  public static String formatJavadoc(String input, int blockIndent, JavaFormatterOptions options) {
+  public static String formatJavadoc(String input, int blockIndent, JavadocOptions options) {
     ImmutableList<Token> tokens;
     try {
       tokens = lex(input);
@@ -51,7 +50,7 @@ public static String formatJavadoc(String input, int blockIndent, JavaFormatterO
     return makeSingleLineIfPossible(blockIndent, result, options);
   }
 
-  private static String render(List<Token> input, int blockIndent, JavaFormatterOptions options) {
+  private static String render(List<Token> input, int blockIndent, JavadocOptions options) {
     JavadocWriter output = new JavadocWriter(blockIndent, options);
     for (Token token : input) {
       switch (token.getType()) {
@@ -164,7 +163,7 @@ private static Token standardize(Token token, Token standardToken) {
    * fits on one line.
    */
   private static String makeSingleLineIfPossible(
-      int blockIndent, String input, JavaFormatterOptions options) {
+      int blockIndent, String input, JavadocOptions options) {
     int oneLinerContentLength = options.maxLineLength() - "/**  */".length() - blockIndent;
     Matcher matcher = ONE_CONTENT_LINE_PATTERN.matcher(input);
     if (matcher.matches() && matcher.group(1).isEmpty()) {
diff --git a/core/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocOptions.java b/core/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc.
+ * Copyright 2018 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -12,13 +12,9 @@
  * the License.
  */
 
-package com.google.googlejavaformat.java;
+package com.google.googlejavaformat.java.javadoc;
 
-import java.util.Optional;
-
-class GoogleJavaFormatVersion {
-
-  static String version() {
-    return "%VERSION%";
-  }
+/** Options for javadoc formatting. */
+public interface JavadocOptions {
+  int maxLineLength();
 }
diff --git a/core/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocWriter.java b/core/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocWriter.java
@@ -29,7 +29,6 @@
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Ordering;
-import com.google.googlejavaformat.java.JavaFormatterOptions;
 import com.google.googlejavaformat.java.javadoc.Token.Type;
 
 /**
@@ -41,7 +40,7 @@
  */
 final class JavadocWriter {
   private final int blockIndent;
-  private final JavaFormatterOptions options;
+  private final JavadocOptions options;
   private final StringBuilder output = new StringBuilder();
   /**
    * Whether we are inside an {@code <li>} element, excluding the case in which the {@code <li>}
@@ -61,7 +60,7 @@ final class JavadocWriter {
   private int indentForMoeEndStripComment;
   private boolean wroteAnythingSignificant;
 
-  JavadocWriter(int blockIndent, JavaFormatterOptions options) {
+  JavadocWriter(int blockIndent, JavadocOptions options) {
     this.blockIndent = blockIndent;
     this.options = checkNotNull(options);
   }
