diff --git a/src/main/java/org/owasp/html/CssTokens.java b/src/main/java/org/owasp/html/CssTokens.java
index 626ecb29..4c2ec3ad 100644
--- a/src/main/java/org/owasp/html/CssTokens.java
+++ b/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;
diff --git a/src/main/java/org/owasp/html/Handler.java b/src/main/java/org/owasp/html/Handler.java
index 8a65ad84..73339a96 100644
--- a/src/main/java/org/owasp/html/Handler.java
+++ b/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.
     }
diff --git a/src/main/java/org/owasp/html/HtmlChangeReporter.java b/src/main/java/org/owasp/html/HtmlChangeReporter.java
index 74ce94b7..efb676de 100644
--- a/src/main/java/org/owasp/html/HtmlChangeReporter.java
+++ b/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;
diff --git a/src/main/java/org/owasp/html/HtmlElementTables.java b/src/main/java/org/owasp/html/HtmlElementTables.java
index 2bb97812..e230b870 100644
--- a/src/main/java/org/owasp/html/HtmlElementTables.java
+++ b/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]);
         }
diff --git a/src/main/java/org/owasp/html/HtmlEntities.java b/src/main/java/org/owasp/html/HtmlEntities.java
index 6ba51a48..bc5a80c0 100644
--- a/src/main/java/org/owasp/html/HtmlEntities.java
+++ b/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;
   }
 
diff --git a/src/main/java/org/owasp/html/HtmlPolicyBuilder.java b/src/main/java/org/owasp/html/HtmlPolicyBuilder.java
index b8475350..54c0305f 100644
--- a/src/main/java/org/owasp/html/HtmlPolicyBuilder.java
+++ b/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);
diff --git a/src/main/java/org/owasp/html/Joinable.java b/src/main/java/org/owasp/html/Joinable.java
index 1061d65f..4a11155d 100644
--- a/src/main/java/org/owasp/html/Joinable.java
+++ b/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);
         }
 
diff --git a/src/main/java/org/owasp/html/PolicyFactory.java b/src/main/java/org/owasp/html/PolicyFactory.java
index 5da3210d..cc26aaf4 100644
--- a/src/main/java/org/owasp/html/PolicyFactory.java
+++ b/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();
diff --git a/src/main/java/org/owasp/html/Trie.java b/src/main/java/org/owasp/html/Trie.java
index b947abdf..2a923c43 100644
--- a/src/main/java/org/owasp/html/Trie.java
+++ b/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];
diff --git a/src/main/java/org/owasp/html/examples/UrlTextExample.java b/src/main/java/org/owasp/html/examples/UrlTextExample.java
index f9347cd0..e213728c 100644
--- a/src/main/java/org/owasp/html/examples/UrlTextExample.java
+++ b/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);
diff --git a/src/test/java/org/owasp/html/Benchmark.java b/src/test/java/org/owasp/html/Benchmark.java
index e4a917ad..ea172b7d 100644
--- a/src/test/java/org/owasp/html/Benchmark.java
+++ b/src/test/java/org/owasp/html/Benchmark.java
@@ -147,7 +147,7 @@ private static String sanitize(String html) {
     StringBuilder sb = new StringBuilder(html.length());
 
     final HtmlStreamRenderer renderer = HtmlStreamRenderer.create(
-        sb, new Handler<String>() {
+        sb, new Handler<>() {
 
           public void handle(String x) {
             throw new AssertionError(x);
diff --git a/src/test/java/org/owasp/html/HtmlChangeReporterTest.java b/src/test/java/org/owasp/html/HtmlChangeReporterTest.java
index 9c8ad7d5..20643932 100644
--- a/src/test/java/org/owasp/html/HtmlChangeReporterTest.java
+++ b/src/test/java/org/owasp/html/HtmlChangeReporterTest.java
@@ -47,7 +47,7 @@ public static final void testChangeReporting() {
     final StringBuilder log = new StringBuilder();
     HtmlStreamRenderer renderer = HtmlStreamRenderer.create(
         out, Handler.DO_NOTHING);
-    HtmlChangeListener<Context> listener = new HtmlChangeListener<Context>() {
+    HtmlChangeListener<Context> listener = new HtmlChangeListener<>() {
       public void discardedTag(Context context, String elementName) {
         assertSame(testContext, context);
         log.append('<').append(elementName).append("> ");
@@ -63,7 +63,7 @@ public void discardedAttributes(
         log.append("> ");
       }
     };
-    HtmlChangeReporter<Context> hcr = new HtmlChangeReporter<Context>(
+    HtmlChangeReporter<Context> hcr = new HtmlChangeReporter<>(
         renderer, listener, testContext);
 
     hcr.setPolicy(Sanitizers.FORMATTING.apply(hcr.getWrappedRenderer()));
diff --git a/src/test/java/org/owasp/html/HtmlSanitizerFuzzerTest.java b/src/test/java/org/owasp/html/HtmlSanitizerFuzzerTest.java
index b860c55c..c302dd8e 100644
--- a/src/test/java/org/owasp/html/HtmlSanitizerFuzzerTest.java
+++ b/src/test/java/org/owasp/html/HtmlSanitizerFuzzerTest.java
@@ -71,13 +71,13 @@ public final void testFuzzHtmlParser() throws Exception {
     char[] fuzzyHtml1 = new char[length];
 
     final LinkedBlockingQueue<Throwable> failures
-        = new LinkedBlockingQueue<Throwable>();
+        = new LinkedBlockingQueue<>();
 
     final int runCount = 1000;
     // Use an executor so that any infinite loops do not cause the test runner
     // to fail.
     ThreadPoolExecutor executor = new ThreadPoolExecutor(
-        10, 10, 10, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());
+        10, 10, 10, TimeUnit.SECONDS, new LinkedBlockingQueue<>());
 
     for (int run = runCount; --run >= 0;) {
       for (int i = length; --i >= 0;) { fuzzyHtml0[i] = html.charAt(i); }
diff --git a/src/test/java/org/owasp/html/IntVectorTest.java b/src/test/java/org/owasp/html/IntVectorTest.java
index 8cd4aeeb..3c07a8bc 100644
--- a/src/test/java/org/owasp/html/IntVectorTest.java
+++ b/src/test/java/org/owasp/html/IntVectorTest.java
@@ -15,7 +15,7 @@ public static void testIntVector() {
     Random r = new Random(0xA03B79241106C82FL);
 
     IntVector iv = new IntVector();
-    LinkedList<Integer> ad = new LinkedList<Integer>();
+    LinkedList<Integer> ad = new LinkedList<>();
 
     for (int i = 0; i < 200000; ++i) {
       switch (r.nextInt(4)) {
diff --git a/src/test/java/org/owasp/html/PolicyFactoryTest.java b/src/test/java/org/owasp/html/PolicyFactoryTest.java
index 43784e92..b2871812 100644
--- a/src/test/java/org/owasp/html/PolicyFactoryTest.java
+++ b/src/test/java/org/owasp/html/PolicyFactoryTest.java
@@ -123,7 +123,7 @@ public static void testAnd() {
       final StringBuilder out = new StringBuilder();
 
       // A noisy listener that logs.
-      HtmlChangeListener<Object> listener = new HtmlChangeListener<Object>() {
+      HtmlChangeListener<Object> listener = new HtmlChangeListener<>() {
 
         public void discardedTag(Object ctx, String elementName) {
           assertEquals(context, ctx);
@@ -141,7 +141,7 @@ public void discardedAttributes(
 
       };
 
-      Handler<IOException> ioHandler = new Handler<IOException>() {
+      Handler<IOException> ioHandler = new Handler<>() {
 
         public void handle(IOException x) {
           log.append("Handled IOException " + x.getMessage() + "\n");
@@ -150,7 +150,7 @@ public void handle(IOException x) {
       };
 
       // Should not be called.
-      Handler<String> badHtmlHandler = new Handler<String>() {
+      Handler<String> badHtmlHandler = new Handler<>() {
 
         public void handle(String x) {
           throw new AssertionError(x);
@@ -611,7 +611,7 @@ static final class SubstringFilter implements AttributePolicy {
 
     public String apply(
         String elementName, String attributeName, String value) {
-      List<String> outParts = new ArrayList<String>();
+      List<String> outParts = new ArrayList<>();
       for (String part : value.split(",")) {
         part = part.trim();
         if (part.contains(substr)) {
diff --git a/src/test/java/org/owasp/html/SanitizersTest.java b/src/test/java/org/owasp/html/SanitizersTest.java
index d14d1156..bce8f537 100644
--- a/src/test/java/org/owasp/html/SanitizersTest.java
+++ b/src/test/java/org/owasp/html/SanitizersTest.java
@@ -382,7 +382,7 @@ public static final void testAndOrdering() {
         + "<img src=\"http://example.org\" />oogle</a>";
 
     for (List<PolicyFactory> permutation :
-         new Permutations<PolicyFactory>(
+         new Permutations<>(
              Sanitizers.BLOCKS,
              Sanitizers.IMAGES,
              Sanitizers.STYLES,
@@ -584,7 +584,7 @@ private static class Permutations<T> implements Iterable<List<T>> {
     }
 
     public Iterator<List<T>> iterator() {
-      return new Iterator<List<T>>() {
+      return new Iterator<>() {
         private int i;
         private final int limit;
         private final BitSet mask;