From ace0dc341cf3a206345702029165e44fb6e8efd9 Mon Sep 17 00:00:00 2001
From: Valery Kharseko <vharseko@3a-systems.ru>
Date: Tue, 04 Aug 2026 08:30:04 +0000
Subject: [PATCH] Fix CodeQL note-severity alerts: calls to the deprecated Entry compatibility methods (#826)
---
opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java b/opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java
index a1c58aa..57a7052 100644
--- a/opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java
+++ b/opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2013-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
*/
package org.forgerock.opendj.adapter.server3x;
@@ -94,7 +95,7 @@
org.opends.server.types.Entry entry =
new org.opends.server.types.Entry(sdkEntry.getName(), null, null, null);
Schema schema = DirectoryServer.getInstance().getServerContext().getSchema();
- List<ByteString> duplicateValues = new ArrayList<>();
+ Collection<ByteString> duplicateValues = new ArrayList<>();
for (org.opends.server.types.Attribute attribute : toAttributes(sdkEntry.getAllAttributes())) {
if (attribute.getAttributeDescription().getAttributeType().isObjectClass()) {
for (ByteString attrName : attribute) {
@@ -128,7 +129,7 @@
new org.opends.server.types.Entry(value.getName(), null, null, null);
org.opends.server.types.SearchResultEntry searchResultEntry =
new org.opends.server.types.SearchResultEntry(entry, to(value.getControls()));
- List<ByteString> duplicateValues = new ArrayList<>();
+ Collection<ByteString> duplicateValues = new ArrayList<>();
for (org.opends.server.types.Attribute attribute : toAttributes(value.getAllAttributes())) {
searchResultEntry.addAttribute(attribute, duplicateValues);
}
@@ -672,7 +673,7 @@
@Override
public int getAttributeCount() {
- return srvResultEntry.getAttributes().size();
+ return Iterables.size(srvResultEntry.getAllAttributes());
}
@Override
--
Gitblit v1.10.0