Cleanup redundant specification of type parameters (#320)

Signed-off-by: Sven Strickroth <[email protected]>

Author: csware

src/main/java/org/owasp/html/CssTokens.java

@@ -427,7 +427,7 @@ void lex() {
       sb.setLength(0);
       if (pos == cssLimit) { return; }
 
-      tokenTypes = new ArrayList<TokenType>();
+      tokenTypes = new ArrayList<>();
 
       @SuppressWarnings("hiding")  // final
       String css = this.css;

src/main/java/org/owasp/html/Handler.java

@@ -43,7 +43,7 @@ public interface Handler<T> {
   void handle(T x);
 
   /** A handler that does nothing given any input. */
-  public static final Handler<Object> DO_NOTHING = new Handler<Object>() {
+  public static final Handler<Object> DO_NOTHING = new Handler<>() {
     public void handle(Object x) {
       // Really, do nothing.
     }

src/main/java/org/owasp/html/HtmlChangeReporter.java

@@ -62,7 +62,7 @@ public HtmlChangeReporter(
       HtmlStreamEventReceiver renderer,
       HtmlChangeListener<? super T> listener, @Nullable T context) {
     this.output = new OutputChannel(renderer);
-    this.input = new InputChannel<T>(output, listener, context);
+    this.input = new InputChannel<>(output, listener, context);
   }
 
   /**
@@ -149,7 +149,7 @@ public void text(String textChunk) {
   private static final class OutputChannel implements HtmlStreamEventReceiver {
     private final HtmlStreamEventReceiver renderer;
     String expectedElementName;
-    Set<String> expectedAttrNames = new LinkedHashSet<String>();
+    Set<String> expectedAttrNames = new LinkedHashSet<>();
 
     OutputChannel(HtmlStreamEventReceiver renderer) {
       this.renderer = renderer;

src/main/java/org/owasp/html/HtmlElementTables.java

@@ -721,7 +721,7 @@ public enum TextContentModelBit {
   }
 
   static final Comparator<int[]> COMPARE_BY_ZEROTH =
-      new Comparator<int[]>() {
+      new Comparator<>() {
         public int compare(int[] a, int[] b) {
           return Integer.compare(a[0], b[0]);
         }

src/main/java/org/owasp/html/HtmlEntities.java

@@ -2293,7 +2293,7 @@ final class HtmlEntities {
 
     final Map<String, String> entityNameToCodePointMap = Collections.unmodifiableMap(builder);
 
-    ENTITY_TRIE = new Trie<String>(entityNameToCodePointMap);
+    ENTITY_TRIE = new Trie<>(entityNameToCodePointMap);
     LONGEST_ENTITY_NAME = longestEntityName;
   }
 

src/main/java/org/owasp/html/HtmlPolicyBuilder.java

@@ -1038,7 +1038,7 @@ public String apply(String elementName, List<String> attrs) {
             relValue = DEFAULT_RELS_ON_TARGETTED_LINKS_STR;
           } else {
             StringBuilder sb = new StringBuilder();
-            Set<String> present = new HashSet<String>();
+            Set<String> present = new HashSet<>();
             if (relIndex >= 0) {
               // Preserve values that are not explicitly skipped.
               String rels = attrs.get(relIndex);

src/main/java/org/owasp/html/Joinable.java

@@ -43,7 +43,7 @@ static abstract class JoinHelper<T, SJ extends Joinable<SJ>> {
     final T zeroValue;
     final T identityValue;
     private Map<JoinStrategy<SJ>, Set<SJ>> requireSpecialJoining;
-    private Set<T> uniq = new LinkedHashSet<T>();
+    private Set<T> uniq = new LinkedHashSet<>();
 
     JoinHelper(
         Class<T> baseType,
@@ -74,11 +74,11 @@ void unroll(T x) {
         JoinStrategy<SJ> strategy = sj.getJoinStrategy();
 
         if (requireSpecialJoining == null) {
-          requireSpecialJoining = new LinkedHashMap<Joinable.JoinStrategy<SJ>, Set<SJ>>();
+          requireSpecialJoining = new LinkedHashMap<>();
         }
         Set<SJ> toJoinTogether = requireSpecialJoining.get(strategy);
         if (toJoinTogether == null) {
-          toJoinTogether = new LinkedHashSet<SJ>();
+          toJoinTogether = new LinkedHashSet<>();
           requireSpecialJoining.put(strategy, toJoinTogether);
         }
 

src/main/java/org/owasp/html/PolicyFactory.java

@@ -96,7 +96,7 @@ public <CTX> HtmlSanitizer.Policy apply(
     if (listener == null) {
       return apply(out);
     } else {
-      HtmlChangeReporter<CTX> r = new HtmlChangeReporter<CTX>(
+      HtmlChangeReporter<CTX> r = new HtmlChangeReporter<>(
           out, listener, context);
       r.setPolicy(apply(r.getWrappedRenderer()));
       return r.getWrappedPolicy();

src/main/java/org/owasp/html/Trie.java

@@ -106,14 +106,14 @@ private Trie(
       char ch = elements.get(i).getKey().charAt(depth);
       if (ch != lastCh) {
         childMap[childIndex] = lastCh;
-        children[childIndex++] = new Trie<T>(
+        children[childIndex++] = new Trie<>(
           elements, depth + 1, childStart, i);
         childStart = i;
         lastCh = ch;
       }
     }
     childMap[childIndex] = lastCh;
-    children[childIndex++] = new Trie<T>(elements, depth + 1, childStart, end);
+    children[childIndex++] = new Trie<>(elements, depth + 1, childStart, end);
   }
 
   /** Does this node correspond to a complete string in the input set. */
@@ -151,8 +151,8 @@ public boolean contains(char ch) {
 
   private static <U> List<Map.Entry<String, U>> sortedUniqEntries(
       Map<String, U> m) {
-    return new ArrayList<Map.Entry<String, U>>(
-        new TreeMap<String, U>(m).entrySet());
+    return new ArrayList<>(
+        new TreeMap<>(m).entrySet());
   }
 
   private static final char[] ZERO_CHARS = new char[0];

src/main/java/org/owasp/html/examples/UrlTextExample.java

@@ -49,7 +49,7 @@ public class UrlTextExample {
 
   /** An event receiver that emits the domain of a link or image after it. */
   static class AppendDomainAfterText extends HtmlStreamEventReceiverWrapper {
-    private final List<String> pendingText = new ArrayList<String>();
+    private final List<String> pendingText = new ArrayList<>();
 
     AppendDomainAfterText(HtmlStreamEventReceiver underlying) {
       super(underlying);