Shim Java 10 collections APIs

aggregate/pom.xml

@@ -5,15 +5,16 @@
   <packaging>pom</packaging>
   <version>20220608.2-SNAPSHOT</version>
   <parent>
-    <relativePath>../parent</relativePath>
+    <relativePath>..</relativePath>
     <groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
     <artifactId>parent</artifactId>
     <version>20220608.2-SNAPSHOT</version>
   </parent>
 
   <modules>
     <module>..</module>
-    <module>../html-types</module>
-    <module>../parent</module>
+    <module>../java8-shim</module>
+    <module>../java10-shim</module>
+    <module>../owasp-java-html-sanitizer</module>
   </modules>
 </project>

empiricism/pom.xml

@@ -5,7 +5,7 @@
   <version>20220608.2-SNAPSHOT</version>
   <packaging>jar</packaging>
   <parent>
-    <relativePath>../parent</relativePath>
+    <relativePath>..</relativePath>
     <groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
     <artifactId>parent</artifactId>
     <version>20220608.2-SNAPSHOT</version>

html-types/pom.xml

@@ -5,7 +5,7 @@
   <version>20220608.2-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <parent>
-    <relativePath>../parent</relativePath>
+    <relativePath>..</relativePath>
     <groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
     <artifactId>parent</artifactId>
     <version>20220608.2-SNAPSHOT</version>

java10-shim/pom.xml

@@ -0,0 +1,41 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>java10-shim</artifactId>
+  <packaging>jar</packaging>
+  <parent>
+    <relativePath>..</relativePath>
+    <groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
+    <artifactId>parent</artifactId>
+    <version>20220608.2-SNAPSHOT</version>
+  </parent>
+
+  <name>Java 10 Shim</name>
+  <description>
+    Provides an implementation of java8-shim that interoperates with
+    Java >= 10 idioms for immutable collections.
+  </description>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <release>10</release>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
+      <artifactId>java8-shim</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>

java10-shim/src/main/java/org/owasp/shim/ForJava9AndLater.java

@@ -0,0 +1,67 @@
+package org.owasp.shim;
+
+import java.util.*;
+
+@SuppressWarnings("Since15") // We're compiling two versions to handle @since problems.
+final class ForJava9AndLater extends Java8Shim {
+
+    @Override public <T> List<T> listOf() {
+        return List.of();
+    }
+
+    @Override public <T> List<T> listOf(T a) {
+        return List.of(a);
+    }
+
+    @Override public <T> List<T> listOf(T a, T b) {
+        return List.of(a, b);
+    }
+
+    @Override public <T> List<T> listOf(T a, T b, T c) {
+        return List.of(a, b, c);
+    }
+
+    @Override public <T> List<T> listOf(T... els) {
+        return List.of(els);
+    }
+
+    @Override public <T> List<T> listCopyOf(Collection<? extends T> c) {
+        return List.copyOf(c);
+    }
+
+    @Override public <K, V> Map<K, V> mapCopyOf(Map<? extends K, ? extends V> m) {
+        return Map.copyOf(m);
+    }
+
+    @Override public <K, V> Map.Entry<K, V> mapEntry(K key, V value) {
+        return Map.entry(key, value);
+    }
+
+    @Override public <K, V> Map<K, V> mapOfEntries(Map.Entry<K, V>... entries) {
+        return Map.ofEntries(entries);
+    }
+
+    @Override public <T> Set<T> setOf() {
+        return Set.of();
+    }
+
+    @Override public <T> Set<T> setOf(T a) {
+        return Set.of(a);
+    }
+
+    @Override public <T> Set<T> setOf(T a, T b) {
+        return Set.of(a, b);
+    }
+
+    @Override public <T> Set<T> setOf(T a, T b, T c) {
+        return Set.of(a, b, c);
+    }
+
+    @Override public <T> Set<T> setOf(T... els) {
+        return Set.of(els);
+    }
+
+    @Override public <T> Set<T> setCopyOf(Collection<? extends T> c) {
+        return Set.copyOf(c);
+    }
+}

java8-shim/pom.xml

@@ -0,0 +1,38 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>java8-shim</artifactId>
+  <packaging>jar</packaging>
+  <parent>
+    <relativePath>..</relativePath>
+    <groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
+    <artifactId>parent</artifactId>
+    <version>20220608.2-SNAPSHOT</version>
+  </parent>
+
+  <name>Java 8 Shim</name>
+  <description>
+    Backports @since Java 9 collection factories like List.of onto
+    Java8 in a way that uses the real ones where available, falls back
+    to a conforming implementation on Java8 and JIT compiles well.
+  </description>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <release>8</release>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>