From 25149165f87ed8e817fdf424d29d284a1762fe34 Mon Sep 17 00:00:00 2001 From: nickreid Date: Fri, 28 Jun 2019 10:49:09 -0700 Subject: [PATCH] Fix/suppress all rawtypes/unchecked errors. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=255629244 --- .../jscomp/AmbiguateProperties.java | 5 +-- .../javascript/jscomp/CommandLineRunner.java | 33 +++++++------------ .../javascript/jscomp/gwt/client/Util.java | 2 +- .../jscomp/transpile/CachingTranspiler.java | 17 ++++++---- .../jscomp/transpile/TranspilerBuilder.java | 2 +- 5 files changed, 27 insertions(+), 32 deletions(-) diff --git a/src/com/google/javascript/jscomp/AmbiguateProperties.java b/src/com/google/javascript/jscomp/AmbiguateProperties.java index 5da59da72d2..11ca30d0340 100644 --- 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() { - return annotation; + @SuppressWarnings("unchecked") + public A getAnnotation() { + return (A) annotation; } @Override diff --git a/src/com/google/javascript/jscomp/CommandLineRunner.java b/src/com/google/javascript/jscomp/CommandLineRunner.java index d6143799cb8..6331e049d3b 100644 --- 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() { - @Override - public boolean select(OptionHandler optionHandler) { - if (optionHandler.option instanceof NamedOptionDef) { - return !optionHandler.option.hidden() - && optionName.equals( - ((NamedOptionDef) optionHandler.option) - .name() - .replaceFirst("^--", "")); - } - return false; + (optionHandler) -> { + if (optionHandler.option instanceof NamedOptionDef) { + return !optionHandler.option.hidden() + && optionName.equals( + ((NamedOptionDef) optionHandler.option).name().replaceFirst("^--", "")); } + return false; }); stringWriter.flush(); String rawOptionUsage = stringWriter.toString(); @@ -1108,16 +1102,13 @@ public boolean select(OptionHandler optionHandler) { parser.printUsage( outputStream, null, - new OptionHandlerFilter() { - @Override - public boolean select(OptionHandler optionHandler) { - if (optionHandler.option instanceof NamedOptionDef) { - return !optionHandler.option.hidden() - && options.contains( - ((NamedOptionDef) optionHandler.option).name().replaceFirst("^--", "")); - } - return false; + (optionHandler) -> { + if (optionHandler.option instanceof NamedOptionDef) { + return !optionHandler.option.hidden() + && options.contains( + ((NamedOptionDef) optionHandler.option).name().replaceFirst("^--", "")); } + return false; }); } diff --git a/src/com/google/javascript/jscomp/gwt/client/Util.java b/src/com/google/javascript/jscomp/gwt/client/Util.java index f1f6048e0ef..0d856a2a80f 100644 --- 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 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 index 379e35a44fa..8239bf96ae6 100644 --- 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 cache; private final Supplier runtime; - @SuppressWarnings("unchecked") public CachingTranspiler( final Transpiler delegate, CacheBuilder builder) { checkNotNull(delegate); - this.cache = builder.build(new CacheLoader() { - @Override - public TranspileResult load(Key key) { - return delegate.transpile(key.path, key.code); - } - }); + this.cache = + builder.build( + new CacheLoader() { + @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 index 535bb4336a3..35abc98858f 100644 --- 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 builder) { return new TranspilerBuilder(new CachingTranspiler(transpiler, builder)); }