Eliminate ErrorProne warnings (GoogleContainerTools#3410)

* Eliminate ErrorProne warnings * Eliminate ErrorProne warnings Co-authored-by: torePos <b2bfired8@gmail.com>
aivantsov · Aug 17, 2021 · d401e76 · d401e76
1 parent 2efed25
commit d401e76
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/jib-cli/src/main/java/com/google/cloud/tools/jib/cli/buildfile/BaseImageSpec.java b/jib-cli/src/main/java/com/google/cloud/tools/jib/cli/buildfile/BaseImageSpec.java
@@ -29,8 +29,8 @@
  * <pre>{@code
  * image: gcr.io/example/baseimage
  * platforms:
- *   - see {@link PlatformSpec}
- *   - see {@link PlatformSpec}
+ *   - see }{@link PlatformSpec}{@code
+ *   - see }{@link PlatformSpec}{@code
  * }</pre>
  */
 public class BaseImageSpec {

diff --git a/jib-cli/src/main/java/com/google/cloud/tools/jib/cli/buildfile/BuildFileSpec.java b/jib-cli/src/main/java/com/google/cloud/tools/jib/cli/buildfile/BuildFileSpec.java
@@ -42,7 +42,7 @@
  * <pre>{@code
  * apiVersion: v1alpha1
  * kind: BuildFile
- * from: see {@link BaseImageSpec}
+ * from: see }{@link BaseImageSpec}{@code
  * creationTime: 100
  * format: docker
  * environment:
@@ -60,7 +60,7 @@
  *   - -jar
  * cmd:
  *   - myjar.jar
- * layers: see {@link LayersSpec}
+ * layers: see }{@link LayersSpec}{@code
  * }</pre>
  */
 public class BuildFileSpec {

diff --git a/jib-cli/src/main/java/com/google/cloud/tools/jib/cli/buildfile/CopySpec.java b/jib-cli/src/main/java/com/google/cloud/tools/jib/cli/buildfile/CopySpec.java
@@ -39,7 +39,7 @@
  * excludes:
  *   - **\/goose.txt
  *   - **\/moose.txt
- * properties: see {@link FilePropertiesSpec}
+ * properties: see }{@link FilePropertiesSpec}{@code
  * }</pre>
  */
 public class CopySpec {

diff --git a/jib-cli/src/main/java/com/google/cloud/tools/jib/cli/buildfile/FileLayerSpec.java b/jib-cli/src/main/java/com/google/cloud/tools/jib/cli/buildfile/FileLayerSpec.java
@@ -32,10 +32,10 @@
  * <pre>{@code
  * name: "my classes layer"
  * files:
- *   - {@link CopySpec}
- *   - {@link CopySpec}
+ *   - }{@link CopySpec}{@code
+ *   - }{@link CopySpec}{@code
  * // optional properties
- * properties: see {@link FilePropertiesSpec}
+ * properties: see }{@link FilePropertiesSpec}{@code
  * }</pre>
  */
 @JsonDeserialize(using = JsonDeserializer.None.class) // required since LayerSpec overrides this

diff --git a/jib-cli/src/main/java/com/google/cloud/tools/jib/cli/buildfile/LayersSpec.java b/jib-cli/src/main/java/com/google/cloud/tools/jib/cli/buildfile/LayersSpec.java
@@ -28,10 +28,10 @@
  * <p>Example use of this yaml snippet.
  *
  * <pre>{@code
- * properties: see {@link FilePropertiesSpec}
+ * properties: see }{@link FilePropertiesSpec}{@code
  * entries:
- *   - see {@link LayerSpec}
- *   - see {@link LayerSpec}
+ *   - see }{@link LayerSpec}{@code
+ *   - see }{@link LayerSpec}{@code
  * }</pre>
  */
 public class LayersSpec {

diff --git a/jib-core/src/main/java/com/google/cloud/tools/jib/image/json/JsonToImageTranslator.java b/jib-core/src/main/java/com/google/cloud/tools/jib/image/json/JsonToImageTranslator.java
@@ -249,8 +249,8 @@ static ImmutableSet<Port> portMapToSet(@Nullable Map<String, Map<String, String>
   }
 
   /**
-   * Converts a map of volumes strings to a set of {@link AbsoluteUnixPath}s (e.g. {@code {@code
-   * {"/var/log/my-app-logs":{}}} -> AbsoluteUnixPath().get("/var/log/my-app-logs")}).
+   * Converts a map of volumes strings to a set of {@link AbsoluteUnixPath}s (e.g. {@code
+   * {"/var/log/my-app-logs":{}}} -> {@code AbsoluteUnixPath().get("/var/log/my-app-logs")}).
    *
    * @param volumeMap the map to convert
    * @return a set of {@link AbsoluteUnixPath}s

diff --git a/...integration-test/java/com/google/cloud/tools/jib/maven/BuildImageMojoIntegrationTest.java b/...integration-test/java/com/google/cloud/tools/jib/maven/BuildImageMojoIntegrationTest.java
@@ -154,7 +154,7 @@ private static String buildAndRun(
       assertThat(new Command("docker", "run", "--rm", id).run()).isEqualTo(output);
 
     } catch (InvalidImageReferenceException ex) {
-      fail("error replacing tag with digest");
+      throw new AssertionError("error replacing tag with digest", ex);
     }
 
     return output;