Make safe-to-static nested classes static and drop dead locals

OpenICF-csvfile-connector/src/main/java/org/forgerock/openicf/csvfile/CSVFileConnector.java

@@ -14,6 +14,7 @@
  * Copyright 2015-2016 ForgeRock AS
  * Portions Copyright 2011 Viliam Repan
  * Portions Copyright 2011 Radovan Semancik
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.forgerock.openicf.csvfile;
 
@@ -1189,7 +1190,7 @@ private CellProcessor[] getProcessors(String[] header) {
         return processors;
     }
 
-    private class OptionalTrim extends CellProcessorAdaptor implements BoolCellProcessor, DateCellProcessor, DoubleCellProcessor,
+    private static class OptionalTrim extends CellProcessorAdaptor implements BoolCellProcessor, DateCellProcessor, DoubleCellProcessor,
             LongCellProcessor, StringCellProcessor {
 
         /**

OpenICF-dbcommon/src/main/java/org/identityconnectors/dbcommon/SQLUtil.java

@@ -245,7 +245,6 @@ public void access(char[] clearChars) {
     public static Connection getDriverMangerConnection(final String driver, final String url,
             final Properties properties) {
         // create the connection base on the configuration..
-        Connection[] ret = new Connection[1];
         try {
             // load the driver class..
             Class.forName(driver);

OpenICF-groovy-connector/src/main/java/org/forgerock/openicf/misc/crest/AbstractRemoteConnection.java

@@ -533,7 +533,7 @@ private Promise<ResourceResponse, ResourceException> handleRequestAsync(final Co
         }
     }
 
-    class InternalFutureCallback<T> implements FutureCallback<T> {
+    static class InternalFutureCallback<T> implements FutureCallback<T> {
         final PromiseImpl<T, ResourceException> promise;
 
         public InternalFutureCallback(PromiseImpl<T, ResourceException> promise) {

OpenICF-java-framework/connector-framework-contract/src/main/java/org/identityconnectors/contract/test/UpdateApiOpTests.java

@@ -230,9 +230,6 @@ public void testUpdateToNull(ObjectClass objectClass) {
                         getObjectClassInfo(objectClass), getTestName(), 2, getOperationOptionsByOp(objectClass, CreateApiOp.class));
                 assertNotNull(uid,"Create returned null Uid.");
 
-                ConnectorObject originalObject = getConnectorFacade().getObject(objectClass, uid,
-                        getOperationOptionsByOp(objectClass, GetApiOp.class));
-
                 Collection<String> skippedAttributesForUpdateToNullValue = getSkippedAttributesForUpdateToNullValue();
                 for (AttributeInfo attInfo : getObjectClassInfo(objectClass).getAttributeInfo()) {
                     if (attInfo.isUpdateable() && !attInfo.isRequired() && !AttributeUtil.isSpecial(attInfo) && !attInfo.getType().isPrimitive()) {

OpenICF-java-framework/connector-framework-server/src/main/java/org/forgerock/openicf/framework/async/impl/ConnectorEventSubscriptionApiOpImpl.java

@@ -128,7 +128,7 @@ public Promise<Void, RuntimeException> trySubscribe(final ObjectClass objectClas
                         .setConnectorEventSubscriptionOpRequest(requestBuilder), handler));
     }
 
-    private class InternalRequestFactory extends
+    private static class InternalRequestFactory extends
             AbstractRemoteOperationRequestFactory<Void, InternalRequest> {
         private final OperationRequest.Builder operationRequest;
         final Observer<ConnectorObject> handler;

OpenICF-java-framework/connector-framework-server/src/main/java/org/forgerock/openicf/framework/client/ClientRemoteConnectorInfoManager.java

@@ -161,8 +161,8 @@ protected void preConfigure(final Connection conn) {
                 final ICFWebSocket socket =
                         new ICFWebSocket(protocolHandler, getOperationMessageListener());
                 final WebSocketHolder holder = WebSocketHolder.set(conn, protocolHandler, socket);
-                final RemoteConnectionContext context =
-                        new RemoteConnectionContext(conn, connectionInfo);
+                // The constructor registers itself on the connection (RemoteConnectionContext.set()).
+                new RemoteConnectionContext(conn, connectionInfo);
 
                 holder.handshake =
                         protocolHandler.createClientHandShake(connectionInfo.getRemoteURI());

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.
  */
 
 /**
@@ -167,9 +168,6 @@ protected void doClose() {
             }
             registry.clear();
 
-            for (WebSocketConnectionGroup group : connectionGroups.values()) {
-                // group.close();
-            }
             connectionGroups.clear();
 
             clientTransport.shutdownNow();

OpenICF-java-framework/connector-framework-server/src/main/java/org/forgerock/openicf/framework/remote/OpenICFServerAdapter.java

@@ -265,7 +265,7 @@ public void onPing(WebSocketConnectionHolder socket, byte[] bytes) {
         // Nothing to do, pong response has been sent
         logger.info("{0} onPing()", loggerName());
         try {
-            RPCMessages.PingMessage message = RPCMessages.PingMessage.parseFrom(bytes);
+            RPCMessages.PingMessage.parseFrom(bytes);
         } catch (InvalidProtocolBufferException e) {
             logger.warn(e, "{0} failed parse message", loggerName());
         }
@@ -276,7 +276,7 @@ public void onPong(WebSocketConnectionHolder socket, byte[] bytes) {
         // Confirm ping response!
         logger.info("{0} onPong()", loggerName());
         try {
-            RPCMessages.PingMessage message = RPCMessages.PingMessage.parseFrom(bytes);
+            RPCMessages.PingMessage.parseFrom(bytes);
         } catch (InvalidProtocolBufferException e) {
             logger.warn(e, "{0} failed parse message", loggerName());
         }

OpenICF-java-framework/connector-server-grizzly/src/main/java/org/forgerock/openicf/framework/server/Main.java

@@ -20,6 +20,7 @@
  * "Portions Copyrighted [year] [name of copyright owner]"
  * ====================
  * Portions Copyrighted 2015-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems LLC.
  */
 package org.forgerock.openicf.framework.server;
 
@@ -193,7 +194,6 @@ private static void loadProperties(Properties properties) throws Exception {
         String useSSLStr = properties.getProperty(PROP_SSL);
         String ifAddress = properties.getProperty(PROP_IFADDRESS);
         String keyHash = properties.getProperty(PROP_KEY);
-        String facadeLifeTime = properties.getProperty(PROP_FACADE_LIFETIME);
         String loggerClass = properties.getProperty(PROP_LOGGER_CLASS);
         String url  = properties.getProperty(PROP_REMOTE_URL);
 

OpenICF-java-framework/testbundlev1/src/main/java/org/identityconnectors/testconnector/TstAbstractConnector.java

@@ -20,6 +20,8 @@
  * with the fields 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.testconnector;
@@ -803,7 +805,7 @@ public void run() {
      * Simulated Use Case 3: execute returns a batch token immediately and processes results in a separate thread.
      * No need to call queryBatch() unless the caller is interrupted and needs to reestablish the connection.
      */
-    private class BatchUseCase3Processor extends Thread {
+    private static class BatchUseCase3Processor extends Thread {
         private OperationOptions options;
         private Observer<BatchResult> observer;
         private BatchToken token;

OpenICF-java-framework/testbundlev1/src/main/java/org/identityconnectors/testconnector/TstConnector.java

@@ -20,6 +20,7 @@
  * "Portions Copyrighted [year] [name of copyright owner]"
  * ====================
  * Portions Copyrighted 2010-2013 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems LLC.
  */
 package org.identityconnectors.testconnector;
 
@@ -366,7 +367,7 @@ public Object getReturnValue() {
         return ret;
     }
 
-    private class BatchUseCase2Processor extends Thread {
+    private static class BatchUseCase2Processor extends Thread {
         private OperationOptions options;
         private String token;
 

OpenICF-ldap-connector/src/main/java/org/identityconnectors/ldap/AppendingAttributes.java

@@ -19,6 +19,8 @@
  * 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.ldap;
 
@@ -112,7 +114,7 @@ public final int size() {
         return size;
     }
 
-    private abstract class AppendingEnumeration<T> implements NamingEnumeration<T> {
+    private abstract static class AppendingEnumeration<T> implements NamingEnumeration<T> {
 
         private final NamingEnumeration<? extends T> delegate;
         private Enumeration<T> remainingValues;

OpenICF-ldap-connector/src/main/java/org/identityconnectors/ldap/LdapConnection.java

@@ -21,6 +21,7 @@
  * ====================
  *
  * Portions Copyrighted 2013-2016 ForgeRock AS
+ * Portions Copyrighted 2026 3A Systems LLC
  */
 package org.identityconnectors.ldap;
 
@@ -159,7 +160,6 @@ private Hashtable getDefaultContextEnv(){
     }
 
     private LdapContext getAnonymousContext() throws NamingException {
-        InitialLdapContext ctx = null;
         return new InitialLdapContext(getDefaultContextEnv(), null);
     }
 

OpenICF-ldap-connector/src/main/java/org/identityconnectors/ldap/search/VlvIndexSearchStrategy.java

@@ -21,6 +21,7 @@
  * ====================
  *
  *  "Portions Copyrighted 2013-2015 ForgeRock AS"
+ *  "Portions Copyrighted 2026 3A Systems LLC"
  */
 package org.identityconnectors.ldap.search;
 
@@ -190,7 +191,7 @@ private void processResponseControls(Control[] controls) throws NamingException
 
                         try {
                             reader.readStartSequence();
-                            final int offset = (int) reader.readInteger();
+                            reader.readInteger(); // offset, not used by this strategy
                             lastListSize = (int) reader.readInteger();
 
                             getLog().ok("Response control: lastListSize = {0}", lastListSize);