Fix/suppress all rawtypes/unchecked errors.

------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=255629244
google · Jul 1, 2019 · 2514916 · 2514916
1 parent dc29495
commit 2514916
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 32 deletions.
diff --git a/src/com/google/javascript/jscomp/AmbiguateProperties.java b/src/com/google/javascript/jscomp/AmbiguateProperties.java
@@ -426,8 +426,9 @@ public Property getValue() {
     }
 
     @Override
-    public Annotation getAnnotation() {
+    @SuppressWarnings("unchecked")
-      return annotation;
+    public <A extends Annotation> A getAnnotation() {
+      return (A) annotation;
     }
 
     @Override

diff --git a/src/com/google/javascript/jscomp/CommandLineRunner.java b/src/com/google/javascript/jscomp/CommandLineRunner.java
@@ -82,7 +82,6 @@
 import org.kohsuke.args4j.NamedOptionDef;
 import org.kohsuke.args4j.Option;
 import org.kohsuke.args4j.OptionDef;
-import org.kohsuke.args4j.OptionHandlerFilter;
 import org.kohsuke.args4j.spi.FieldSetter;
 import org.kohsuke.args4j.spi.IntOptionHandler;
 import org.kohsuke.args4j.spi.OptionHandler;
@@ -1063,18 +1062,13 @@ private void printCategoryUsage(
             parser.printUsage(
                 stringWriter,
                 null,
-                new OptionHandlerFilter() {
+                (optionHandler) -> {
-                  @Override
+                  if (optionHandler.option instanceof NamedOptionDef) {
-                  public boolean select(OptionHandler optionHandler) {
+                    return !optionHandler.option.hidden()
-                    if (optionHandler.option instanceof NamedOptionDef) {
+                        && optionName.equals(
-                      return !optionHandler.option.hidden()
+                            ((NamedOptionDef) optionHandler.option).name().replaceFirst("^--", ""));
-                          && optionName.equals(
-                              ((NamedOptionDef) optionHandler.option)
-                                  .name()
-                                  .replaceFirst("^--", ""));
-                    }
-                    return false;
                   }
+                  return false;
                 });
             stringWriter.flush();
             String rawOptionUsage = stringWriter.toString();
@@ -1108,16 +1102,13 @@ public boolean select(OptionHandler optionHandler) {
           parser.printUsage(
               outputStream,
               null,
-              new OptionHandlerFilter() {
+              (optionHandler) -> {
-                @Override
+                if (optionHandler.option instanceof NamedOptionDef) {
-                public boolean select(OptionHandler optionHandler) {
+                  return !optionHandler.option.hidden()
-                  if (optionHandler.option instanceof NamedOptionDef) {
+                      && options.contains(
-                    return !optionHandler.option.hidden()
+                          ((NamedOptionDef) optionHandler.option).name().replaceFirst("^--", ""));
-                        && options.contains(
-                            ((NamedOptionDef) optionHandler.option).name().replaceFirst("^--", ""));
-                  }
-                  return false;
                 }
+                return false;
               });
         }
 

diff --git a/src/com/google/javascript/jscomp/gwt/client/Util.java b/src/com/google/javascript/jscomp/gwt/client/Util.java
@@ -125,7 +125,7 @@ public final void set(int i, T value) {
 
     @JsOverlay
     public final List<T> asList() {
-      return new JsArrayList(this);
+      return new JsArrayList<>(this);
     }
 
     @JsOverlay

diff --git a/src/com/google/javascript/jscomp/transpile/CachingTranspiler.java b/src/com/google/javascript/jscomp/transpile/CachingTranspiler.java
@@ -38,16 +38,17 @@ public final class CachingTranspiler implements Transpiler {
   private final LoadingCache<Key, TranspileResult> cache;
   private final Supplier<String> runtime;
 
-  @SuppressWarnings("unchecked")
   public CachingTranspiler(
       final Transpiler delegate, CacheBuilder<Object, ? super TranspileResult> builder) {
     checkNotNull(delegate);
-    this.cache = builder.build(new CacheLoader<Key, TranspileResult>() {
+    this.cache =
-      @Override
+        builder.<Key, TranspileResult>build(
-      public TranspileResult load(Key key) {
+            new CacheLoader<Key, TranspileResult>() {
-        return delegate.transpile(key.path, key.code);
+              @Override
-      }
+              public TranspileResult load(Key key) {
-    });
+                return delegate.transpile(key.path, key.code);
+              }
+            });
     this.runtime = Suppliers.memoize(delegate::runtime);
   }
 
@@ -80,11 +81,13 @@ private static final class Key {
       this.path = checkNotNull(path);
       this.code = checkNotNull(code);
     }
+
     @Override
     public boolean equals(Object other) {
       return other instanceof Key
           && ((Key) other).path.equals(path) && ((Key) other).code.equals(code);
     }
+
     @Override
     public int hashCode() {
       return Objects.hash(path, code);

diff --git a/src/com/google/javascript/jscomp/transpile/TranspilerBuilder.java b/src/com/google/javascript/jscomp/transpile/TranspilerBuilder.java
@@ -65,7 +65,7 @@ public TranspilerBuilder caching(String spec) {
    * that the builder itself is not changed.
    */
   @CheckReturnValue
-  public TranspilerBuilder caching(CacheBuilder builder) {
+  public TranspilerBuilder caching(CacheBuilder<Object, ? super TranspileResult> builder) {
     return new TranspilerBuilder(new CachingTranspiler(transpiler, builder));
   }