From 0cf88d8e7998442eb6a0c91f8a3c0e9646b5c1a0 Mon Sep 17 00:00:00 2001
From: Valery Kharseko <vharseko@3a-systems.ru>
Date: Wed, 29 Jul 2026 14:20:11 +0000
Subject: [PATCH] Remove containers whose contents are never read (java/unused-container CodeQL alerts) (#784)
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java | 2 -
opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java | 3 -
opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java | 4 -
opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateMessageFileMojo.java | 30 --------------
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeSearcherQueue.java | 9 +---
opendj-server-legacy/src/main/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java | 14 ------
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewIndexPanel.java | 9 +---
7 files changed, 9 insertions(+), 62 deletions(-)
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java
index 80b3f0c..3fd8f46 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java
@@ -13,6 +13,7 @@
*
* Copyright 2007-2010 Sun Microsystems, Inc.
* Portions Copyright 2012-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
*/
package org.forgerock.opendj.config.dsconfig;
@@ -1168,7 +1169,6 @@
final Map<RelationDefinition<?, ?>, CreateSubCommandHandler<?, ?>> createHandlers = new HashMap<>();
final Map<RelationDefinition<?, ?>, DeleteSubCommandHandler> deleteHandlers = new HashMap<>();
final Map<RelationDefinition<?, ?>, ListSubCommandHandler> listHandlers = new HashMap<>();
- final Map<RelationDefinition<?, ?>, GetPropSubCommandHandler> getPropHandlers = new HashMap<>();
final Map<RelationDefinition<?, ?>, SetPropSubCommandHandler> setPropHandlers = new HashMap<>();
for (final CreateSubCommandHandler<?, ?> ch : handlerFactory.getCreateSubCommandHandlers()) {
@@ -1188,7 +1188,6 @@
for (final GetPropSubCommandHandler gh : handlerFactory.getGetPropSubCommandHandlers()) {
relations.add(gh.getRelationDefinition());
- getPropHandlers.put(gh.getRelationDefinition(), gh);
}
for (final SetPropSubCommandHandler sh : handlerFactory.getSetPropSubCommandHandlers()) {
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java
index 32efebf..d5785e8 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java
@@ -13,6 +13,7 @@
*
* Copyright 2008-2010 Sun Microsystems, Inc.
* Portions Copyright 2013-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
*/
package org.forgerock.opendj.config.dsconfig;
@@ -857,10 +858,7 @@
@Override
public MenuResult<Boolean> invoke(ConsoleApplication app) throws ClientException {
app.println();
- SortedSet<T> previousValues = new TreeSet<>(currentValues);
readPropertyValues(app, mo.getManagedObjectDefinition(), d, currentValues);
- SortedSet<T> addedValues = new TreeSet<>(currentValues);
- addedValues.removeAll(previousValues);
isLastChoiceReset = false;
return MenuResult.success(false);
}
diff --git a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateMessageFileMojo.java b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateMessageFileMojo.java
index 9b0a4d6..0e7abe7 100644
--- a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateMessageFileMojo.java
+++ b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateMessageFileMojo.java
@@ -13,6 +13,7 @@
*
* Copyright 2008-2010 Sun Microsystems, Inc.
* Portions Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
*/
package org.forgerock.opendj.maven.doc;
@@ -47,7 +48,6 @@
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
-import org.forgerock.i18n.LocalizableMessage;
/** Generates an XML file of log messages found in properties files. */
@Mojo(name = "generate-xml-messages-doc", defaultPhase = PRE_SITE)
@@ -69,34 +69,6 @@
/** A list which contains all file names, the extension is not needed. */
@Parameter(required = true)
private List<String> messageFileNames;
- /** One-line descriptions for log reference categories. */
- private static final Map<String, LocalizableMessage> CATEGORY_DESCRIPTIONS = new HashMap<>();
- static {
- CATEGORY_DESCRIPTIONS.put("ACCESS_CONTROL", CATEGORY_ACCESS_CONTROL.get());
- CATEGORY_DESCRIPTIONS.put("ADMIN", CATEGORY_ADMIN.get());
- CATEGORY_DESCRIPTIONS.put("ADMIN_TOOL", CATEGORY_ADMIN_TOOL.get());
- CATEGORY_DESCRIPTIONS.put("AUDIT", CATEGORY_AUDIT.get());
- CATEGORY_DESCRIPTIONS.put("BACKEND", CATEGORY_BACKEND.get());
- CATEGORY_DESCRIPTIONS.put("CONFIG", CATEGORY_CONFIG.get());
- CATEGORY_DESCRIPTIONS.put("CORE", CATEGORY_CORE.get());
- CATEGORY_DESCRIPTIONS.put("DSCONFIG", CATEGORY_DSCONFIG.get());
- CATEGORY_DESCRIPTIONS.put("EXTENSIONS", CATEGORY_EXTENSIONS.get());
- CATEGORY_DESCRIPTIONS.put("JVM", CATEGORY_JVM.get());
- CATEGORY_DESCRIPTIONS.put("LOG", CATEGORY_LOG.get());
- CATEGORY_DESCRIPTIONS.put("PLUGIN", CATEGORY_PLUGIN.get());
- CATEGORY_DESCRIPTIONS.put("PROTOCOL", CATEGORY_PROTOCOL.get());
- CATEGORY_DESCRIPTIONS.put("QUICKSETUP", CATEGORY_QUICKSETUP.get());
- CATEGORY_DESCRIPTIONS.put("RUNTIME_INFORMATION", CATEGORY_RUNTIME_INFORMATION.get());
- CATEGORY_DESCRIPTIONS.put("SCHEMA", CATEGORY_SCHEMA.get());
- CATEGORY_DESCRIPTIONS.put("SDK", CATEGORY_SDK.get());
- CATEGORY_DESCRIPTIONS.put("SYNC", CATEGORY_SYNC.get());
- CATEGORY_DESCRIPTIONS.put("TASK", CATEGORY_TASK.get());
- CATEGORY_DESCRIPTIONS.put("THIRD_PARTY", CATEGORY_THIRD_PARTY.get());
- CATEGORY_DESCRIPTIONS.put("TOOLS", CATEGORY_TOOLS.get());
- CATEGORY_DESCRIPTIONS.put("USER_DEFINED", CATEGORY_USER_DEFINED.get());
- CATEGORY_DESCRIPTIONS.put("UTIL", CATEGORY_UTIL.get());
- CATEGORY_DESCRIPTIONS.put("VERSION", CATEGORY_VERSION.get());
- }
/** Message giving formatting rules for string keys. */
public static final String KEY_FORM_MSG = ".\n\nOpenDJ message property keys must be of the form\n\n"
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeSearcherQueue.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeSearcherQueue.java
index 8910c43..5c4deaf 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeSearcherQueue.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeSearcherQueue.java
@@ -13,6 +13,7 @@
*
* Copyright 2008-2010 Sun Microsystems, Inc.
* Portions Copyright 2015-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
*/
package org.opends.guitools.controlpanel.browser;
@@ -37,7 +38,6 @@
private final String name;
private final List<AbstractNodeTask> waitingQueue = new ArrayList<>();
private final Map<BasicNode, AbstractNodeTask> workingList = new HashMap<>();
- private final Map<BasicNode, BasicNode> cancelList = new HashMap<>();
private final ThreadGroup threadGroup;
@@ -111,7 +111,6 @@
// Mark the on-going task as cancelled
AbstractNodeTask task = workingList.get(node);
if (task != null) {
- cancelList.put(node, node);
task.cancel();
}
notify();
@@ -134,10 +133,7 @@
waitingQueue.clear();
for (Map.Entry<BasicNode, AbstractNodeTask> entry : workingList.entrySet())
{
- BasicNode node = entry.getKey();
- AbstractNodeTask task = entry.getValue();
- cancelList.put(node, node);
- task.cancel();
+ entry.getValue().cancel();
}
}
@@ -201,7 +197,6 @@
throw new IllegalArgumentException("null argument");
}
workingList.remove(task.getNode());
- cancelList.remove(task.getNode());
notify();
// System.out.println("Flushed " + task + " from " + _name);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewIndexPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewIndexPanel.java
index 9261d76..a7f3be9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewIndexPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewIndexPanel.java
@@ -13,6 +13,7 @@
*
* Copyright 2008-2009 Sun Microsystems, Inc.
* Portions Copyright 2014-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
*/
package org.opends.guitools.controlpanel.ui;
@@ -120,7 +121,6 @@
BackendDescriptor backend = getBackendByID(backendName.getText());
TreeSet<String> standardAttrNames = new TreeSet<>();
- TreeSet<String> configurationAttrNames = new TreeSet<>();
TreeSet<String> customAttrNames = new TreeSet<>();
for (AttributeType attr : schema.getAttributeTypes())
{
@@ -131,12 +131,9 @@
{
standardAttrNames.add(name);
}
- else if (Utilities.isConfiguration(attr))
+ else if (!Utilities.isConfiguration(attr))
{
- configurationAttrNames.add(name);
- }
- else
- {
+ // Configuration attributes are not offered for indexing.
customAttrNames.add(name);
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java
index 8624e84..645127b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java
@@ -1251,10 +1251,8 @@
try (final PhaseTwoProgressReporter progressReporter = new PhaseTwoProgressReporter())
{
final List<Callable<Void>> tasks = new ArrayList<>();
- final Set<String> importedBaseDNs = new HashSet<>();
for (Map.Entry<TreeName, Chunk> treeChunk : transaction.getChunks().entrySet())
{
- importedBaseDNs.add(treeChunk.getKey().getBaseDN());
tasks.add(importStrategy.newPhaseTwoTask(treeChunk.getKey(), treeChunk.getValue(), progressReporter));
}
invokeParallel(phase2ThreadNameTemplate, tasks);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
index fd94e1c..a274e8b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
@@ -13,6 +13,7 @@
*
* Copyright 2006-2008 Sun Microsystems, Inc.
* Portions Copyright 2014-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
*/
package org.opends.server.extensions;
@@ -53,19 +54,6 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- /**
- * The set of names for the account status notification types that may be
- * logged by this notification handler.
- */
- private static final HashSet<String> NOTIFICATION_TYPE_NAMES = new HashSet<>();
- static
- {
- for (AccountStatusNotificationType t : AccountStatusNotificationType.values())
- {
- NOTIFICATION_TYPE_NAMES.add(t.getName());
- }
- }
-
/** The DN of the configuration entry for this notification handler. */
private DN configEntryDN;
--
Gitblit v1.10.0