Java 11 (#1) (#495)

.github/workflows/build.yml

@@ -11,8 +11,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java: [ '8']
-        os: [ 'ubuntu-latest', 'macos-latest', 'windows-latest' ]
+        java: [ '8', '11' ]
+        os: [ 'ubuntu-latest', 'macos-10.15', 'windows-latest' ]
     steps:
     - uses: actions/checkout@v3
       with:
@@ -151,4 +151,4 @@ jobs:
         shell: bash
         run: |
           docker run --rm -it -d --name=test localhost:5000/${GITHUB_REPOSITORY,,}:${{ env.release_version }}-alpine
-          timeout 3m bash -c 'until docker inspect --format="{{json .State.Health.Status}}" test | grep -q \"healthy\"; do sleep 10; done'
+          timeout 3m bash -c 'until docker inspect --format="{{json .State.Health.Status}}" test | grep -q \"healthy\"; do sleep 10; done'

openam-authentication/openam-auth-oauth2/src/test/java/org/forgerock/openam/authentication/modules/oauth2/ESIATest.java

@@ -12,11 +12,13 @@
 import org.forgerock.openam.authentication.modules.oauth2.service.esia.Signer;
 import org.mockito.Matchers;
 import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.testng.PowerMockTestCase;
 import org.testng.annotations.Test;
 
 @PrepareForTest(HttpRequestContent.class)
+@PowerMockIgnore("jdk.internal.reflect.*")
 public class ESIATest extends PowerMockTestCase {
 
 	@Test

openam-cassandra/openam-cassandra-embedded/src/test/java/ServerTest.java

@@ -15,7 +15,6 @@
  */
 
 
-
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;

openam-core/src/main/java/org/forgerock/openam/cts/impl/query/worker/queries/CTSWorkerPastExpiryDateQuery.java

@@ -20,6 +20,7 @@
 
 import javax.inject.Inject;
 import java.util.Calendar;
+import java.util.List;
 
 import org.forgerock.openam.cts.CoreTokenConfig;
 import org.forgerock.openam.sm.datalayer.api.ConnectionFactory;
@@ -28,8 +29,10 @@
 import org.forgerock.openam.sm.datalayer.api.query.QueryBuilder;
 import org.forgerock.openam.sm.datalayer.api.query.QueryFactory;
 import org.forgerock.openam.tokens.CoreTokenField;
+import org.forgerock.opendj.ldap.Filter;
 import org.forgerock.util.Reject;
 import org.forgerock.util.query.QueryFilter;
+import org.forgerock.util.query.QueryFilterVisitor;
 
 /**
  * A query that selects all CTS tokens whose expiry date field is prior to the current timestamp (e.g. who have
@@ -39,7 +42,7 @@
  */
 public class CTSWorkerPastExpiryDateQuery<C> extends CTSWorkerBaseQuery {
 
-    private final QueryFactory<C, CoreTokenField> queryFactory;
+    private final QueryFactory<C, Filter> queryFactory;
     private final int pageSize;
 
     @Inject
@@ -58,8 +61,11 @@ public QueryBuilder getQuery() {
 
         QueryFilter<CoreTokenField> filter = QueryFilter.lessThan(CoreTokenField.EXPIRY_DATE, now);
 
+        QueryFilterVisitor<Filter, Void, CoreTokenField> fc = queryFactory.createFilterConverter();
+
+        Filter accepted = filter.accept(fc, null);
         return queryFactory.createInstance()
-                .withFilter(filter.accept(queryFactory.createFilterConverter(), null))
+                .withFilter(accepted)
                 .pageResultsBy(pageSize)
                 .returnTheseAttributes(CoreTokenField.TOKEN_ID);
     }

openam-core/src/test/java/com/iplanet/dpro/session/service/SessionServerConfigTest.java

@@ -6,6 +6,7 @@
 import com.sun.identity.shared.debug.Debug;
 import org.forgerock.openam.session.SessionServiceURLService;
 import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.testng.PowerMockTestCase;
 import org.testng.annotations.Test;
@@ -16,6 +17,7 @@
 import static org.mockito.Mockito.mock;
 
 @PrepareForTest({ SystemProperties.class, WebtopNaming.class })
+@PowerMockIgnore("jdk.internal.reflect.*")
 public class SessionServerConfigTest extends PowerMockTestCase {
 
     @Test

openam-core/src/test/java/org/forgerock/openam/cts/impl/LDAPConfigTest.java

@@ -18,6 +18,7 @@
 import com.iplanet.am.util.SystemProperties;
 import org.forgerock.opendj.ldap.DN;
 import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.testng.PowerMockTestCase;
 import org.testng.annotations.BeforeMethod;
@@ -33,6 +34,7 @@
  * @author [email protected]
  */
 @PrepareForTest(SystemProperties.class)
+@PowerMockIgnore("jdk.internal.reflect.*")
 public class LDAPConfigTest extends PowerMockTestCase {
 
     private LDAPConfig config;

openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/ldap/ExternalLdapConfigTest.java

@@ -31,6 +31,7 @@
 import org.forgerock.openam.cts.impl.CTSDataLayerConfiguration;
 import org.forgerock.openam.ldap.LDAPURL;
 import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.testng.PowerMockTestCase;
 import org.testng.annotations.BeforeMethod;
@@ -41,6 +42,7 @@
 import com.sun.identity.shared.debug.Debug;
 
 @PrepareForTest({ SystemProperties.class, WebtopNaming.class })
+@PowerMockIgnore("jdk.internal.reflect.*")
 public class ExternalLdapConfigTest extends PowerMockTestCase {
 
     private Debug debug;

openam-federation/OpenFM/src/main/java/com/sun/identity/classloader/MaskingClassLoader.java

@@ -30,11 +30,11 @@
 
 import java.util.Collection;
 import java.util.Enumeration;
+import java.util.NoSuchElementException;
 import java.util.Vector;
 import java.io.IOException;
 import java.net.URL;
 import java.net.MalformedURLException;
-import sun.misc.CompoundEnumeration;
 
 /**
  * {@link ClassLoader} that masks a specified set of classes
@@ -252,4 +252,37 @@ public synchronized String toString() {
         return "com.sun.identity.classloader.MaskingClassLoader : Super is : " 
             + super.toString();
     }
+
+    static class CompoundEnumeration<E> implements Enumeration<E> {
+        private final Enumeration<E>[] enums;
+        private int index;
+
+        public CompoundEnumeration(Enumeration<E>[] enums) {
+            this.enums = enums;
+        }
+
+        private boolean next() {
+            while(this.index < this.enums.length) {
+                if (this.enums[this.index] != null && this.enums[this.index].hasMoreElements()) {
+                    return true;
+                }
+
+                ++this.index;
+            }
+
+            return false;
+        }
+
+        public boolean hasMoreElements() {
+            return this.next();
+        }
+
+        public E nextElement() {
+            if (!this.next()) {
+                throw new NoSuchElementException();
+            } else {
+                return this.enums[this.index].nextElement();
+            }
+        }
+    }
 }

openam-federation/openam-federation-library/src/main/java/com/sun/identity/sae/api/SecureAttrs.java

@@ -37,7 +37,6 @@
 import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import sun.misc.CharacterEncoder;
 import com.sun.identity.shared.encode.Base64;
 import com.sun.identity.security.DataEncryptor;
 import java.security.*;

openam-scripting/src/main/java/org/forgerock/openam/scripting/ThreadPoolScriptEvaluator.java

@@ -172,8 +172,8 @@ public void onConfigurationChange(final ScriptEngineConfiguration newConfigurati
                                 newConfiguration.getThreadPoolIdleTimeoutSeconds());
                     }
 
-                    delegateConfigurator.setCorePoolSize(newConfiguration.getThreadPoolCoreSize());
                     delegateConfigurator.setMaximumPoolSize(newConfiguration.getThreadPoolMaxSize());
+                    delegateConfigurator.setCorePoolSize(newConfiguration.getThreadPoolCoreSize());
                     delegateConfigurator.setKeepAliveTime(newConfiguration.getThreadPoolIdleTimeoutSeconds(), TimeUnit.SECONDS);
                 }
 

pom.xml

@@ -181,6 +181,7 @@
             <artifactId>maven-javadoc-plugin</artifactId>
             <inherited>false</inherited>
             <configuration>
+              <source>8</source>
               <charset>utf-8</charset>
               <encoding>utf-8</encoding>
               <source>${maven.compiler.source}</source>
@@ -271,7 +272,7 @@
     <profile>
       <id>jdk8.options</id>
       <activation>
-        <jdk>[1.8,)</jdk>
+        <jdk>1.8</jdk>
       </activation>
       <properties>
         <!-- Disable Doclint on JDK8+ -->
@@ -281,6 +282,20 @@
         <!-- JavaDoc Setting Properties -->
         <javadoc.options>-J-Xms2g -J-Xmx2g</javadoc.options>
       </properties>
+    </profile>
+    <profile>
+      <id>jdk11.options</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <properties>
+        <!-- Disable Doclint on JDK8+ -->
+        <javadoc.opts>-Xdoclint:none</javadoc.opts>
+        <!-- Surefire Argument Line -->
+        <java.surefire.options>-Xmx1g --add-exports java.base/jdk.internal.ref=ALL-UNNAMED</java.surefire.options>
+        <!-- JavaDoc Setting Properties -->
+        <javadoc.options>-J-Xms2g -J-Xmx2g</javadoc.options>
+      </properties>
     </profile>
    	<profile>
         <id>release-sign-artifacts</id>
@@ -2037,6 +2052,7 @@
 			    </execution>
 			  </executions>
 			  <configuration>
+                <source>8</source>
 			  	<doclint>none</doclint>
 			  </configuration>
 			</plugin>