Clean up low-severity CodeQL code-quality alerts

commons/audit/handler-csv/src/main/java/org/forgerock/audit/handlers/csv/CsvAuditEventHandler.java

@@ -167,26 +167,26 @@ public CsvAuditEventHandler(
             }
         }
 
-        Map<String, Set<String>> fieldOrderByTopic = new HashMap<>();
-        Map<String, JsonPointer> jsonPointerByField = new HashMap<>();
-        Map<String, String> fieldDotNotationByField = new HashMap<>();
+        Map<String, Set<String>> orderByTopic = new HashMap<>();
+        Map<String, JsonPointer> pointerByField = new HashMap<>();
+        Map<String, String> dotNotationByField = new HashMap<>();
         for (String topic : this.eventTopicsMetaData.getTopics()) {
             try {
                 Set<String> fieldOrder = getFieldOrder(topic, this.eventTopicsMetaData);
                 for (String field : fieldOrder) {
-                    if (!jsonPointerByField.containsKey(field)) {
-                        jsonPointerByField.put(field, new JsonPointer(field));
-                        fieldDotNotationByField.put(field, jsonPointerToDotNotation(field));
+                    if (!pointerByField.containsKey(field)) {
+                        pointerByField.put(field, new JsonPointer(field));
+                        dotNotationByField.put(field, jsonPointerToDotNotation(field));
                     }
                 }
-                fieldOrderByTopic.put(topic, Collections.unmodifiableSet(fieldOrder));
+                orderByTopic.put(topic, Collections.unmodifiableSet(fieldOrder));
             } catch (ResourceException e) {
                 LOGGER.error(topic + " topic schema meta-data misconfigured.");
             }
         }
-        this.fieldOrderByTopic = Collections.unmodifiableMap(fieldOrderByTopic);
-        this.jsonPointerByField = Collections.unmodifiableMap(jsonPointerByField);
-        this.fieldDotNotationByField = Collections.unmodifiableMap(fieldDotNotationByField);
+        this.fieldOrderByTopic = Collections.unmodifiableMap(orderByTopic);
+        this.jsonPointerByField = Collections.unmodifiableMap(pointerByField);
+        this.fieldDotNotationByField = Collections.unmodifiableMap(dotNotationByField);
     }
 
     private CsvPreference createCsvPreference(final CsvAuditEventHandlerConfiguration config) {

commons/audit/handler-json/src/main/java/org/forgerock/audit/handlers/json/JsonFileWriter.java

@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.audit.handlers.json;
@@ -275,12 +276,12 @@ private QueueConsumer(final String fileNameSuffix, final Set<String> topics,
             filesToDelete = new HashSet<>();
 
             // build map of topic files
-            final Map<String, TopicEntry> topicEntryMap = new HashMap<>();
+            final Map<String, TopicEntry> entriesByTopic = new HashMap<>();
             for (final String topic : topics) {
                 final String fileName = topic + '.' + fileNameSuffix;
-                topicEntryMap.put(topic, new TopicEntry(fileName, configuration));
+                entriesByTopic.put(topic, new TopicEntry(fileName, configuration));
             }
-            this.topicEntryMap = Collections.unmodifiableMap(topicEntryMap);
+            this.topicEntryMap = Collections.unmodifiableMap(entriesByTopic);
         }
 
         /**

commons/auth-filters/authn-filter/jaspi-modules/iwa-module/src/main/java/org/forgerock/jaspi/modules/iwa/IWAModule.java

@@ -99,7 +99,7 @@ public Promise<AuthStatus, AuthenticationException> validateRequest(MessageInfoC
         String httpAuthorization = request.getHeaders().getFirst("Authorization");
 
         try {
-            if (httpAuthorization == null || "".equals(httpAuthorization)) {
+            if (httpAuthorization == null || httpAuthorization.isEmpty()) {
                 LOG.debug("IWAModule: Authorization Header NOT set in request.");
 
                 response.getHeaders().put("WWW-Authenticate", "Negotiate");

commons/auth-filters/authn-filter/jaspi-modules/iwa-module/src/main/java/org/forgerock/jaspi/modules/iwa/wdsso/WDSSO.java

@@ -234,7 +234,7 @@ private String getUserName(String user) {
         if (!returnRealm) {
             int index = user.indexOf("@");
             if (index != -1) {
-                userName = user.toString().substring(0, index);
+                userName = user.substring(0, index);
             }
         }
         return userName;

commons/auth-filters/authn-filter/jaspi-modules/jwt-session-module/src/main/java/org/forgerock/jaspi/modules/session/jwt/AbstractJwtSessionModule.java

@@ -259,7 +259,7 @@ public AuthStatus validateRequest(MessageInfo messageInfo, Subject clientSubject
      * @return <code>true</code> if the String is non-null and non-empty.
      */
     private boolean isEmpty(String s) {
-        return s == null || "".equals(s);
+        return s == null || s.isEmpty();
     }
 
     /**

commons/auth-filters/authn-filter/jaspi-modules/openam-session-module/src/main/java/org/forgerock/jaspi/modules/session/openam/OpenAMSessionModule.java

@@ -253,7 +253,7 @@ private KeyStore buildKeyStore(final String keystoreFile, final String type, fin
      * @return <code>true</code> if the String is non-null and non-empty.
      */
     private boolean isEmpty(String s) {
-        return s == null || "".equals(s);
+        return s == null || s.isEmpty();
     }
 
     /**

commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/build/ChunkedHtml.java

@@ -110,7 +110,6 @@ void prepareOlinkDB() throws MojoExecutionException {
                 cfg.add(element(name("targetDirectory"), m.path(m.getDocbkxOutputDirectory()) + "/html"));
                 cfg.add(element(name("targetsFilename"), m.getDocumentSrcName() + ".html.target.db"));
 
-                final String base = FilenameUtils.getBaseName(m.getDocumentSrcName());
                //cfg.add(element(name("chunkBaseDir"), chunkBaseDir));
 
                 executeMojo(
@@ -148,7 +147,6 @@ void build() throws MojoExecutionException {
 
                 cfg.add(element(name("includes"), docName + "/" + m.getDocumentSrcName()));
 
-                final String base = FilenameUtils.getBaseName(m.getDocumentSrcName());
                 //cfg.add(element(name("chunkBaseDir"), chunkBaseDir));
 
                 cfg.add(element(name("manifest"),

commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/post/Html.java

@@ -213,7 +213,7 @@ final void editBuiltHtml(final String htmlDir) throws MojoExecutionException {
             String linkToJira = getLinkToJira();
 
             String gascript = "";
-            if(m.getGoogleAnalyticsId() != null && !"".equals(m.getGoogleAnalyticsId())) {
+            if(m.getGoogleAnalyticsId() != null && !m.getGoogleAnalyticsId().isEmpty()) {
                 gascript = IOUtils.toString(
                         Html.class.getResourceAsStream("/endbody-ga.txt"), StandardCharsets.UTF_8);
                 gascript = gascript.replace("ANALYTICS-ID", m.getGoogleAnalyticsId());

commons/http-framework/core/src/main/java/org/forgerock/http/header/WarningHeader.java

@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.http.header;
@@ -159,9 +160,9 @@ public static WarningHeader newWarning(final String agentName, final String fmt,
      * @param warning Single {@link Warning}
      */
     public WarningHeader(final Warning warning) {
-        final List<Warning> warnings = new ArrayList<>(1);
-        warnings.add(Reject.checkNotNull(warning));
-        this.warnings = Collections.unmodifiableList(warnings);
+        final List<Warning> warningList = new ArrayList<>(1);
+        warningList.add(Reject.checkNotNull(warning));
+        this.warnings = Collections.unmodifiableList(warningList);
     }
 
     /**

commons/json-fluent/src/main/java/org/forgerock/json/fluent/JsonValue.java

@@ -1018,10 +1018,10 @@ public String toString() {
         } else if (isMap()) {
             sb.append("{ ");
             Map<Object, Object> map = (Map<Object, Object>)object;
-            for (Iterator<Object> i = map.keySet().iterator(); i.hasNext();) {
-                Object key = i.next();
-                sb.append('"').append(key.toString()).append("\": ");
-                sb.append(new JsonValue(map.get(key)).toString()); // recursion
+            for (Iterator<Map.Entry<Object, Object>> i = map.entrySet().iterator(); i.hasNext();) {
+                Map.Entry<Object, Object> entry = i.next();
+                sb.append('"').append(entry.getKey().toString()).append("\": ");
+                sb.append(new JsonValue(entry.getValue()).toString()); // recursion
                 if (i.hasNext()) {
                     sb.append(", ");
                 }

commons/json-web-token/src/main/java/org/forgerock/json/jose/jws/JwtSecureHeader.java

@@ -77,7 +77,7 @@ public JwtSecureHeader(Map<String, Object> headers) {
      * @param jwkSetUrl The JWK Set URL.
      */
     public void setJwkSetUrl(URL jwkSetUrl) {
-        put(JKU.value(), new String(jwkSetUrl.toString()));
+        put(JKU.value(), jwkSetUrl.toString());
     }
 
     /**
@@ -133,7 +133,7 @@ public JWK getJsonWebKey() {
      * @param x509Url The X.509 URL.
      */
     public void setX509Url(URL x509Url) {
-        put(X5U.value(), new String(x509Url.toString()));
+        put(X5U.value(), x509Url.toString());
     }
 
     /**

commons/launcher/launcher/src/main/java/org/forgerock/commons/launcher/OSGiFrameworkService.java

@@ -627,7 +627,7 @@ protected Properties loadPropertyFile(URI projectDirectory, String propertyFile)
             File pFile = new File(propertyFile);
             if (!pFile.isAbsolute()) {
                 is =
-                        projectDirectory.resolve(propertyFile.toString()).toURL().openConnection()
+                        projectDirectory.resolve(propertyFile).toURL().openConnection()
                                 .getInputStream();
             } else {
                 is =  pFile.toURI().toURL().openConnection().getInputStream();

commons/rest/api-descriptor/src/main/java/org/forgerock/api/CrestApiProducer.java

@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.api;
@@ -75,7 +76,7 @@ public ApiDescription withPath(ApiDescription api, String parentPath) {
         Paths.Builder paths = paths();
         Set<String> names = api.getPaths().getNames();
         for (String subpath : names) {
-            paths.put(subpath.equals("") ? parentPath : parentPath + "/" + subpath,
+            paths.put(subpath.isEmpty() ? parentPath : parentPath + "/" + subpath,
                     api.getPaths().get(subpath));
         }
         return createApi(api.getDefinitions(), api.getErrors(), api.getServices(), paths.build());
@@ -90,7 +91,8 @@ public ApiDescription withVersion(ApiDescription api, Version version) {
             if (singleton(UNVERSIONED).equals(versionedPath.getVersions())) {
                 paths.put(path, versionedPath().put(version, versionedPath.get(UNVERSIONED)).build());
             } else {
-                throw new IllegalStateException("Trying to version something already versioned: " + versionedPath);
+                throw new IllegalStateException(
+                        "Trying to version something already versioned: " + versionedPath.getVersions());
             }
         }
         return createApi(api.getDefinitions(), api.getErrors(), api.getServices(), paths.build());

commons/rest/json-resource/src/main/java/org/forgerock/json/resource/MemoryBackend.java

@@ -82,7 +82,7 @@ static Cookie valueOf(String base64) throws ResourceException {
             final String[] splitKeys = split[1].split(",");
 
             for (String key : splitKeys) {
-                if (!key.equals("")) {
+                if (!key.isEmpty()) {
                     sortKeys.add(SortKey.valueOf(key));
                 }
             }

commons/util/util/src/main/java/org/forgerock/json/JsonValue.java

@@ -1343,12 +1343,12 @@ public String toString() {
         } else if (isMap()) {
             sb.append("{ ");
             final Map<Object, Object> map = (Map<Object, Object>) object;
-            for (final Iterator<Object> i = map.keySet().iterator(); i.hasNext();) {
-                final Object key = i.next();
+            for (final Iterator<Map.Entry<Object, Object>> i = map.entrySet().iterator(); i.hasNext();) {
+                final Map.Entry<Object, Object> entry = i.next();
                 sb.append('"');
-                appendEscapedString(sb, key.toString());
+                appendEscapedString(sb, entry.getKey().toString());
                 sb.append("\": ");
-                sb.append(new JsonValue(map.get(key)).toString()); // recursion
+                sb.append(new JsonValue(entry.getValue()).toString()); // recursion
                 if (i.hasNext()) {
                     sb.append(", ");
                 }

commons/util/util/src/main/java/org/forgerock/util/time/Duration.java

@@ -165,7 +165,7 @@ public static Duration duration(final String value) {
         for (String fragment : fragments) {
             fragment = fragment.trim();
 
-            if ("".equals(fragment)) {
+            if (fragment.isEmpty()) {
                 throw new IllegalArgumentException("Cannot parse empty duration, expecting '<value> <unit>' pattern");
             }
 

maven-external-dependency-plugin/maven-external-dependency-plugin/src/main/java/com/savage7/maven/plugin/dependency/ArtifactItem.java

@@ -1,4 +1,4 @@
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements. See the NOTICE file distributed with this
  * work for additional information regarding copyright ownership. The ASF
@@ -242,7 +242,7 @@
      */
     private String filterEmptyString(final String in)
     {
-        if (in == null || in.equals(""))
+        if (in == null || in.isEmpty())
         {
             return null;
         }
@@ -357,12 +357,12 @@
         if (this.classifier == null)
         {
             return groupId + ":" + artifactId + ":"
                 + StringUtils.defaultString(version, "?") + ":" + packaging;
         }
         else
         {
             return groupId + ":" + artifactId + ":" + classifier + ":"
                 + StringUtils.defaultString(version, "?") + ":" + packaging;
         }
     }
 

persistit/doc/build/src/AsciiDocIndex.java

@@ -177,7 +177,6 @@ private void indexOneTerm(final String wholeTag, String href, final String url,
             }
 
             else {
-                final String className = href.substring(0, pHtml).replace('/', '.');
                 final String name = href.substring(pHash + 1);
                 final int pLeftParen = name.indexOf('(');
                 if (pLeftParen == -1) {

persistit/doc/conf.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 #
+# Portions Copyrighted 2026 3A Systems, LLC.
+#
 # Persistit documentation build configuration file, created by
 # sphinx-quickstart on Fri May 18 15:19:04 2012.
 #
@@ -11,8 +13,6 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys, os
-
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.