From e31fcec957ccf98954e03209efc17dc436f39d4a Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Fri, 18 Sep 2026 23:31:28 +0300 Subject: [PATCH] Replace the last deprecated calls: Grizzly SSLContextConfigurator and SecurityManager createSSLContext() is deprecated in favour of createSSLContext(boolean); the no-arg version is exactly createSSLContext(false) (verified against the Grizzly source), so the three call sites switch to that with no behaviour change. CCLWatchThreadFactory is its own copy of java.util.concurrent.Executors.DefaultThreadFactory. The JDK's own copy dropped the SecurityManager check once the Security Manager was permanently disabled (JEP 486); this one follows suit. --- .../framework/server/impl/CCLWatchThreadFactory.java | 7 +++++-- .../openicf/framework/client/ConnectionManager.java | 5 +++-- .../openicf/framework/server/ConnectorServer.java | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/OpenICF-java-framework/connector-framework-internal/src/main/java/org/identityconnectors/framework/server/impl/CCLWatchThreadFactory.java b/OpenICF-java-framework/connector-framework-internal/src/main/java/org/identityconnectors/framework/server/impl/CCLWatchThreadFactory.java index f57d04dd8..50565b0f8 100644 --- a/OpenICF-java-framework/connector-framework-internal/src/main/java/org/identityconnectors/framework/server/impl/CCLWatchThreadFactory.java +++ b/OpenICF-java-framework/connector-framework-internal/src/main/java/org/identityconnectors/framework/server/impl/CCLWatchThreadFactory.java @@ -19,6 +19,7 @@ * enclosed by brackets [] replaced by your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" * ==================== + * Portions Copyrighted 2026 3A Systems, LLC */ package org.identityconnectors.framework.server.impl; @@ -38,8 +39,10 @@ public class CCLWatchThreadFactory implements ThreadFactory { final String namePrefix; CCLWatchThreadFactory() { - SecurityManager s = System.getSecurityManager(); - group = (s != null) ? s.getThreadGroup() : Thread.currentThread().getThreadGroup(); + // matches java.util.concurrent.Executors.DefaultThreadFactory, which + // dropped its SecurityManager check once the Security Manager was + // permanently disabled (JEP 486) + group = Thread.currentThread().getThreadGroup(); namePrefix = "pool-" + POOL_NUMBER.getAndIncrement() + "-thread-"; } diff --git a/OpenICF-java-framework/connector-framework-server/src/main/java/org/forgerock/openicf/framework/client/ConnectionManager.java b/OpenICF-java-framework/connector-framework-server/src/main/java/org/forgerock/openicf/framework/client/ConnectionManager.java index 9737418a4..36d610442 100644 --- a/OpenICF-java-framework/connector-framework-server/src/main/java/org/forgerock/openicf/framework/client/ConnectionManager.java +++ b/OpenICF-java-framework/connector-framework-server/src/main/java/org/forgerock/openicf/framework/client/ConnectionManager.java @@ -11,6 +11,7 @@ * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under. * ==================== * Portions Copyrighted 2015 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems, LLC */ /** @@ -297,11 +298,11 @@ public void onTimeout(Connection connection) { SSLContextConfigurator contextConfigurator = createSSLContextConfigurator(clientConfig); SSLContext context = - null != contextConfigurator ? contextConfigurator.createSSLContext() : null; + null != contextConfigurator ? contextConfigurator.createSSLContext(false) : null; boolean defaultSecState = (context != null); if (context == null) { try { - context = DEFAULT_CONFIG.createSSLContext(); + context = DEFAULT_CONFIG.createSSLContext(false); } catch (Exception e) { throw new IllegalStateException(e); } diff --git a/OpenICF-java-framework/connector-server-grizzly/src/main/java/org/forgerock/openicf/framework/server/ConnectorServer.java b/OpenICF-java-framework/connector-server-grizzly/src/main/java/org/forgerock/openicf/framework/server/ConnectorServer.java index d611dd1ba..8c927d0d9 100644 --- a/OpenICF-java-framework/connector-server-grizzly/src/main/java/org/forgerock/openicf/framework/server/ConnectorServer.java +++ b/OpenICF-java-framework/connector-server-grizzly/src/main/java/org/forgerock/openicf/framework/server/ConnectorServer.java @@ -367,7 +367,7 @@ protected SSLEngineConfigurator createSSLConfig(final SSLContextConfigurator con boolean wantClientAuth = false; SSLEngineConfigurator result = - new SSLEngineConfigurator(contextConfigurator.createSSLContext(), false, + new SSLEngineConfigurator(contextConfigurator.createSSLContext(false), false, needClientAuth, wantClientAuth); result.setEnabledCipherSuites(ConnectorServer.RECOMMENDED_CIPHERS);