From a0640389975a5237c7b72926f72185b38eb2f603 Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Thu, 16 Jul 2026 13:49:09 +0300 Subject: [PATCH] Enable strict Javadoc doclint (all,-missing) and fix all doclint issues Make the Javadoc build fail on any doclint error or warning across all modules, and clean up every existing issue so it stays green from JDK 17 through JDK 26. pom.xml: - add an inherited `doclint` property (all,-missing) and reference it from maven-javadoc-plugin via ${doclint} (was doclint=none) - bump maven-javadoc-plugin to 3.12.0 and enable failOnWarnings - put j2objc-annotations on the Javadoc classpath so Guava's @ReflectionSupport(Level.FULL) resolves instead of warning Fix 218 doclint issues in 92 files across 26 modules: block @inheritDoc on overrides, self-closing

, broken {@link}/@see references, /

/
 HTML, bad HTML entities, and stale
@throws/@param/@return tags. Javadoc comments only; no code changes.

Verified: full-reactor `mvn javadoc:jar` builds clean with zero warnings
on both JDK 17 and JDK 26.
---
 .../scriptedbundler/CustomObjectType.java     |  5 ++-
 .../CustomObjectTypeProperty.java             |  5 ++-
 .../CustomObjectTypePropertyFlag.java         |  5 ++-
 .../CustomObjectTypePropertyItemProperty.java |  5 ++-
 .../CustomObjectTypePropertyItems.java        |  5 ++-
 .../tools/scriptedbundler/CustomProperty.java |  5 ++-
 .../scriptedbundler/ProvidedProperty.java     |  5 ++-
 .../openidm/audit/impl/AuditLogger.java       |  2 +-
 .../auth/modules/oauth/OAuthModule.java       |  3 +-
 .../config/manage/ConfigObjectService.java    |  4 +-
 .../persistence/ConfigPersisterMarker.java    |  3 +-
 .../openidm/internal/metadata/ConfigMeta.java |  7 +---
 .../openidm/managed/RelationshipProvider.java |  5 ++-
 .../openidm/sync/PendingActionContext.java    |  3 +-
 .../forgerock/openidm/sync/ReconContext.java  |  3 +-
 .../openidm/sync/impl/ReconTypeBase.java      | 14 ++-----
 .../openidm/sync/impl/ReconTypeByQuery.java   |  4 +-
 .../sync/impl/ReconciliationStatistic.java    |  3 +-
 .../openidm/sync/impl/ResultEntry.java        |  5 ++-
 .../impl/metadata/ConfigMeta.java             |  7 +---
 .../external/email/metadata/ConfigMeta.java   |  7 +---
 .../idp/impl/ProviderConfigMapper.java        |  5 ++-
 .../health/DatabaseInfoResourceProvider.java  |  3 +-
 .../openidm/info/metadata/ConfigMeta.java     |  7 +---
 .../openidm/jetty/JettyErrorHandler.java      |  5 +--
 .../upgrade/ComparableVersion.java            |  4 +-
 .../openidm/policy/metadata/ConfigMeta.java   |  7 +---
 .../openicf/ConnectorInfoProvider.java        |  2 +-
 .../openicf/ConnectorReference.java           |  3 +-
 .../provisioner/openicf/OperationHelper.java  | 11 +++---
 .../openicf/commons/AttributeInfoHelper.java  | 12 +++---
 .../openicf/commons/ConnectorUtil.java        | 37 +++++++++----------
 .../commons/ObjectClassInfoHelper.java        |  3 +-
 .../openicf/commons/OperationType.java        |  3 +-
 .../impl/ConnectorInfoProviderService.java    |  4 +-
 .../impl/OpenICFProvisionerService.java       | 18 ++++-----
 .../openicf/impl/OperationHelperImpl.java     |  3 +-
 .../syncfailure/SyncHandlerException.java     |  8 +---
 .../org/forgerock/openidm/provisioner/Id.java |  7 ++--
 .../provisioner/ProvisionerService.java       | 11 +++---
 .../provisioner/SimpleSystemIdentifier.java   |  3 +-
 .../openidm/quartz/impl/JobWrapper.java       |  3 +-
 .../quartz/impl/RepoJobStoreUtils.java        |  3 +-
 .../openidm/quartz/impl/package-info.java     |  3 +-
 .../jdbc/impl/DB2SQLExceptionHandler.java     |  4 +-
 .../repo/jdbc/impl/DB2TableHandler.java       |  4 +-
 .../jdbc/impl/DefaultSQLExceptionHandler.java |  7 +---
 .../repo/jdbc/impl/GenericTableHandler.java   |  7 +---
 .../repo/jdbc/impl/MSSQLExceptionHandler.java |  4 +-
 .../repo/jdbc/impl/MSSQLTableHandler.java     |  4 +-
 .../repo/jdbc/impl/MappedTableHandler.java    |  4 +-
 .../repo/jdbc/impl/MySQLExceptionHandler.java |  4 +-
 .../repo/jdbc/impl/OracleTableHandler.java    |  4 +-
 .../jdbc/impl/PostgreSQLTableHandler.java     |  3 +-
 .../orientdb/impl/OrientDBRepoService.java    |  8 ----
 .../repo/orientdb/metadata/ConfigMeta.java    |  7 +---
 .../openidm/repo/QueryConstants.java          |  7 ++--
 .../openidm/repo/RepoBootService.java         |  5 ++-
 .../openidm/repo/RepositoryService.java       |  5 ++-
 .../util/AbstractSQLQueryFilterVisitor.java   | 14 ++++---
 .../util/StringSQLQueryFilterVisitor.java     | 13 ++++---
 .../openidm/router/IDMConnectionFactory.java  |  3 +-
 .../forgerock/openidm/router/RouteEvent.java  |  2 +-
 .../openidm/router/RouteListener.java         |  5 ++-
 .../openidm/router/metadata/ConfigMeta.java   |  7 +---
 .../openidm/router/package-info.java          |  3 +-
 .../script/ScriptedRequestHandler.java        |  4 +-
 .../script/impl/metadata/ConfigMeta.java      |  8 +---
 .../ServletRegistration.java                  |  3 +-
 .../openidm/shell/CustomCommandScope.java     |  5 ++-
 .../openidm/shell/felixgogo/MetaVar.java      |  5 ++-
 .../smartevent/core/BlockingPublisher.java    | 10 +----
 .../smartevent/core/DisabledEventEntry.java   | 10 +----
 .../smartevent/core/DisabledPublisher.java    | 10 +----
 .../core/DisruptorReferringEventEntry.java    |  4 +-
 .../core/DisruptorReferringPublisher.java     | 10 +----
 .../core/DisruptorShortEventEntry.java        | 10 +----
 .../core/DisruptorShortPublisher.java         | 10 +----
 .../smartevent/core/EventEntryImpl.java       | 10 +----
 .../smartevent/core/PluggablePublisher.java   |  7 ++--
 .../smartevent/core/StatisticsHandler.java    | 25 +------------
 .../openidm/core/IdentityServer.java          |  5 ++-
 .../forgerock/openidm/core/PropertyUtil.java  |  5 ++-
 .../openidm/core/ServerConstants.java         |  2 +-
 .../org/forgerock/openidm/osgi/OsgiName.java  |  6 ++-
 .../openidm/patch/PatchValueTransformer.java  |  2 +-
 .../org/forgerock/openidm/util/FileUtil.java  |  3 +-
 .../forgerock/openidm/util/ResourceUtil.java  |  3 +-
 .../org/forgerock/openidm/util/Script.java    |  3 +-
 .../org/forgerock/openidm/util/Scripts.java   |  5 ++-
 .../activiti/impl/SharedIdentityService.java  |  3 +-
 .../activiti/metadata/ConfigMeta.java         |  7 +---
 pom.xml                                       | 20 +++++++++-
 93 files changed, 232 insertions(+), 357 deletions(-)

diff --git a/custom-scripted-connector-bundler/src/main/java/org/forgerock/openidm/tools/scriptedbundler/CustomObjectType.java b/custom-scripted-connector-bundler/src/main/java/org/forgerock/openidm/tools/scriptedbundler/CustomObjectType.java
index d1617808fe..dddce0203b 100644
--- a/custom-scripted-connector-bundler/src/main/java/org/forgerock/openidm/tools/scriptedbundler/CustomObjectType.java
+++ b/custom-scripted-connector-bundler/src/main/java/org/forgerock/openidm/tools/scriptedbundler/CustomObjectType.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2015 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -32,7 +33,7 @@
  * A single connector configuration objectType, contained in {@link CustomConfiguration}.
  *
  * Given a JSON configuration such as:
- * 

+ * 
  *      "objectTypes" : [
  *          {
  *              "name" : "group",
@@ -66,7 +67,7 @@
  *              ]
  *          }
  *      ]
- * 

+ *
* this object represents a single objectType array element. */ public class CustomObjectType extends CustomBaseObject { diff --git a/custom-scripted-connector-bundler/src/main/java/org/forgerock/openidm/tools/scriptedbundler/CustomObjectTypeProperty.java b/custom-scripted-connector-bundler/src/main/java/org/forgerock/openidm/tools/scriptedbundler/CustomObjectTypeProperty.java index 9f61614d94..a181b7ec3d 100644 --- a/custom-scripted-connector-bundler/src/main/java/org/forgerock/openidm/tools/scriptedbundler/CustomObjectTypeProperty.java +++ b/custom-scripted-connector-bundler/src/main/java/org/forgerock/openidm/tools/scriptedbundler/CustomObjectTypeProperty.java @@ -2,6 +2,7 @@ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright (c) 2015 ForgeRock AS. All Rights Reserved + * Portions Copyrighted 2026 3A Systems, LLC. * * The contents of this file are subject to the terms * of the Common Development and Distribution License @@ -32,7 +33,7 @@ * A single connector objectType property, contained in {@link CustomObjectType}. * * Given a JSON configuration such as: - * 

+ * 
  *      "properties" : [
  *          {
  *              "name" : "name",
@@ -57,7 +58,7 @@
  *              ...
  *          }
  *      ]
- *
+ * * this object represents a single properties array element. */ public class CustomObjectTypeProperty extends CustomBaseObject { diff --git a/custom-scripted-connector-bundler/src/main/java/org/forgerock/openidm/tools/scriptedbundler/CustomObjectTypePropertyFlag.java b/custom-scripted-connector-bundler/src/main/java/org/forgerock/openidm/tools/scriptedbundler/CustomObjectTypePropertyFlag.java index 94be191691..02cc1f8495 100644 --- a/custom-scripted-connector-bundler/src/main/java/org/forgerock/openidm/tools/scriptedbundler/CustomObjectTypePropertyFlag.java +++ b/custom-scripted-connector-bundler/src/main/java/org/forgerock/openidm/tools/scriptedbundler/CustomObjectTypePropertyFlag.java @@ -2,6 +2,7 @@ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright (c) 2015 ForgeRock AS. All Rights Reserved + * Portions Copyrighted 2026 3A Systems, LLC. * * The contents of this file are subject to the terms * of the Common Development and Distribution License @@ -31,12 +32,12 @@ * A single objectType property flag, contained in {@link CustomObjectTypeProperty}. * * Represented in a JSON configuration list as: - * 

+ * 
  *      "flags" : [
  *          "NOT_READABLE",
  *          "NOT_RETURNED_BY_DEFAULT"
  *      ],
- *
+ * */ public class CustomObjectTypePropertyFlag extends CustomBaseObject { /** diff --git a/custom-scripted-connector-bundler/src/main/java/org/forgerock/openidm/tools/scriptedbundler/CustomObjectTypePropertyItemProperty.java b/custom-scripted-connector-bundler/src/main/java/org/forgerock/openidm/tools/scriptedbundler/CustomObjectTypePropertyItemProperty.java index aa06fea807..077964e774 100644 --- a/custom-scripted-connector-bundler/src/main/java/org/forgerock/openidm/tools/scriptedbundler/CustomObjectTypePropertyItemProperty.java +++ b/custom-scripted-connector-bundler/src/main/java/org/forgerock/openidm/tools/scriptedbundler/CustomObjectTypePropertyItemProperty.java @@ -2,6 +2,7 @@ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright (c) 2015 ForgeRock AS. All Rights Reserved + * Portions Copyrighted 2026 3A Systems, LLC. * * The contents of this file are subject to the terms * of the Common Development and Distribution License @@ -31,12 +32,12 @@ * A single property of an objectType item, contained in {@link CustomObjectTypePropertyItems}. * * Represented in JSON as: - * 

+ * 
  *      {
  *          "name" : "uid",
  *          "type" : "string"
  *      }
- *
+ * */ public class CustomObjectTypePropertyItemProperty extends CustomBaseObject { /** diff --git a/custom-scripted-connector-bundler/src/main/java/org/forgerock/openidm/tools/scriptedbundler/CustomObjectTypePropertyItems.java b/custom-scripted-connector-bundler/src/main/java/org/forgerock/openidm/tools/scriptedbundler/CustomObjectTypePropertyItems.java index dacb4434c1..ac19ba3f4b 100644 --- a/custom-scripted-connector-bundler/src/main/java/org/forgerock/openidm/tools/scriptedbundler/CustomObjectTypePropertyItems.java +++ b/custom-scripted-connector-bundler/src/main/java/org/forgerock/openidm/tools/scriptedbundler/CustomObjectTypePropertyItems.java @@ -2,6 +2,7 @@ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright (c) 2015 ForgeRock AS. All Rights Reserved + * Portions Copyrighted 2026 3A Systems, LLC. * * The contents of this file are subject to the terms * of the Common Development and Distribution License @@ -33,7 +34,7 @@ * A single connector configuration objectType, contained in {@link CustomObjectTypeProperty}. * * Represented in a JSON configuration as: - * 

+ * 
  *      {
  *          "type" : "object",
  *          "nativeType" : "object",
@@ -42,7 +43,7 @@
  *              "type" : "string"
  *          }]
  *      }
- *
+ * */ public class CustomObjectTypePropertyItems extends CustomBaseObject { diff --git a/custom-scripted-connector-bundler/src/main/java/org/forgerock/openidm/tools/scriptedbundler/CustomProperty.java b/custom-scripted-connector-bundler/src/main/java/org/forgerock/openidm/tools/scriptedbundler/CustomProperty.java index 3a56e3692d..46ec4adcf4 100644 --- a/custom-scripted-connector-bundler/src/main/java/org/forgerock/openidm/tools/scriptedbundler/CustomProperty.java +++ b/custom-scripted-connector-bundler/src/main/java/org/forgerock/openidm/tools/scriptedbundler/CustomProperty.java @@ -2,6 +2,7 @@ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright (c) 2015 ForgeRock AS. All Rights Reserved + * Portions Copyrighted 2026 3A Systems, LLC. * * The contents of this file are subject to the terms * of the Common Development and Distribution License @@ -34,7 +35,7 @@ * A single connector configuration property, contained in {@link CustomConfiguration}. * * The JSON configuration might contain something like the following: - * 

+ * 
  * "properties" : [
  *      {
  *          "order" : 0,
@@ -58,7 +59,7 @@
  *          "group" : "default"
  *      }
  *  ]
- *
+ * * * This object represents a single property in the list above. These properties define the connector's * configuration properties and are the data source for generating the code to support connector metadata diff --git a/custom-scripted-connector-bundler/src/main/java/org/forgerock/openidm/tools/scriptedbundler/ProvidedProperty.java b/custom-scripted-connector-bundler/src/main/java/org/forgerock/openidm/tools/scriptedbundler/ProvidedProperty.java index fc9f25cdb5..836e9392c1 100644 --- a/custom-scripted-connector-bundler/src/main/java/org/forgerock/openidm/tools/scriptedbundler/ProvidedProperty.java +++ b/custom-scripted-connector-bundler/src/main/java/org/forgerock/openidm/tools/scriptedbundler/ProvidedProperty.java @@ -2,6 +2,7 @@ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright (c) 2015 ForgeRock AS. All Rights Reserved + * Portions Copyrighted 2026 3A Systems, LLC. * * The contents of this file are subject to the terms * of the Common Development and Distribution License @@ -34,7 +35,7 @@ * A single connector configuration property, contained in {@link org.forgerock.openidm.tools.scriptedbundler.CustomConfiguration}. * * The JSON configuration might contain something like the following: - * 

+ * 
  * "providedProperties" : [
  *      {
  *          "name" : "FirstProperty",
@@ -46,7 +47,7 @@
  *          "type" : "Float"
  *      }
  *  ]
- *
+ * * * This object represents a single property in the list above. These properties populate values for the properties * defined by default in the connector's base configuration class. For example, the ScriptedSQLConfiguration class diff --git a/openidm-audit/src/main/java/org/forgerock/openidm/audit/impl/AuditLogger.java b/openidm-audit/src/main/java/org/forgerock/openidm/audit/impl/AuditLogger.java index 25ebc91c2f..5b3514f1a3 100644 --- a/openidm-audit/src/main/java/org/forgerock/openidm/audit/impl/AuditLogger.java +++ b/openidm-audit/src/main/java/org/forgerock/openidm/audit/impl/AuditLogger.java @@ -2,6 +2,7 @@ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright 2011-2015 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems, LLC. * * The contents of this file are subject to the terms * of the Common Development and Distribution License @@ -109,7 +110,6 @@ public interface AuditLogger { * @param handler the {@link QueryResourceHandler} object. * @param type the type of audit log entries to query * @param formatted whether to format the results. - * @return the query result object. * @throws NotFoundException if the specified object could not be found. * @throws ForbiddenException if access to the object or the specified query is forbidden. */ diff --git a/openidm-authnfilter/src/main/java/org/forgerock/openidm/auth/modules/oauth/OAuthModule.java b/openidm-authnfilter/src/main/java/org/forgerock/openidm/auth/modules/oauth/OAuthModule.java index ddeab17ab3..058e7fd082 100644 --- a/openidm-authnfilter/src/main/java/org/forgerock/openidm/auth/modules/oauth/OAuthModule.java +++ b/openidm-authnfilter/src/main/java/org/forgerock/openidm/auth/modules/oauth/OAuthModule.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.openidm.auth.modules.oauth; @@ -190,7 +191,6 @@ public Promise validateRequest(MessageInfoC * @param messageInfo {@inheritDoc} * @param subject {@inheritDoc} * @return {@inheritDoc} - * @throws AuthException {@inheritDoc} */ @Override public Promise secureResponse(MessageInfoContext messageInfo, @@ -203,7 +203,6 @@ public Promise secureResponse(MessageInfoCo * * @param messageInfo {@inheritDoc} * @param subject {@inheritDoc} - * @throws AuthException {@inheritDoc} */ @Override public Promise cleanSubject(MessageInfoContext messageInfo, Subject subject) { diff --git a/openidm-config/src/main/java/org/forgerock/openidm/config/manage/ConfigObjectService.java b/openidm-config/src/main/java/org/forgerock/openidm/config/manage/ConfigObjectService.java index fa27d9d41e..509483bf68 100644 --- a/openidm-config/src/main/java/org/forgerock/openidm/config/manage/ConfigObjectService.java +++ b/openidm-config/src/main/java/org/forgerock/openidm/config/manage/ConfigObjectService.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2011-2016 ForgeRock AS. - * Portions Copyrighted 2024 3A Systems LLC. + * Portions Copyrighted 2024-2026 3A Systems LLC. */ @@ -313,7 +313,7 @@ public Promise apply( /** * Creates a new object in the object set. - *

+ *

* This method sets the {@code _id} property to the assigned identifier for the object, * and the {@code _rev} property to the revised object version (For optimistic concurrency) * diff --git a/openidm-config/src/main/java/org/forgerock/openidm/config/persistence/ConfigPersisterMarker.java b/openidm-config/src/main/java/org/forgerock/openidm/config/persistence/ConfigPersisterMarker.java index 8a163d02ae..31fd424d91 100644 --- a/openidm-config/src/main/java/org/forgerock/openidm/config/persistence/ConfigPersisterMarker.java +++ b/openidm-config/src/main/java/org/forgerock/openidm/config/persistence/ConfigPersisterMarker.java @@ -2,6 +2,7 @@ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright 2011-2015 ForgeRock AS. All Rights Reserved + * Portions Copyrighted 2026 3A Systems, LLC. * * The contents of this file are subject to the terms * of the Common Development and Distribution License @@ -37,7 +38,7 @@ public interface ConfigPersisterMarker { * Notifies the extension when the system determined that * all necessary services are ready, and checks if the * extension itself is ready - * @throws an exception if the extension could not initiate + * @throws BootstrapFailure if the extension could not initiate */ void checkReady() throws BootstrapFailure; } diff --git a/openidm-core/src/main/java/org/forgerock/openidm/internal/metadata/ConfigMeta.java b/openidm-core/src/main/java/org/forgerock/openidm/internal/metadata/ConfigMeta.java index d6b2ed530c..1c87c35b92 100644 --- a/openidm-core/src/main/java/org/forgerock/openidm/internal/metadata/ConfigMeta.java +++ b/openidm-core/src/main/java/org/forgerock/openidm/internal/metadata/ConfigMeta.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Portions copyright 2011-2015 ForgeRock AS. + * Portions Copyrighted 2026 3A Systems, LLC. */ package org.forgerock.openidm.internal.metadata; @@ -46,9 +47,6 @@ public class ConfigMeta implements MetaDataProvider { * JsonPointer("/")); properties = Collections.unmodifiableList(p); } */ - /** - * @inheritDoc - */ public List getPropertiesToEncrypt(String pidOrFactory, String instanceAlias, JsonValue config) throws WaitForMetaData, NotConfiguration { if (ManagedObjectService.PID.equalsIgnoreCase(pidOrFactory)) { @@ -58,9 +56,6 @@ public List getPropertiesToEncrypt(String pidOrFactory, String inst return null; } - /** - * @inheritDoc - */ // @Override public void setCallback(MetaDataProviderCallback callback) { // This instance won't be updated diff --git a/openidm-core/src/main/java/org/forgerock/openidm/managed/RelationshipProvider.java b/openidm-core/src/main/java/org/forgerock/openidm/managed/RelationshipProvider.java index 544523f5c9..58f09545cf 100644 --- a/openidm-core/src/main/java/org/forgerock/openidm/managed/RelationshipProvider.java +++ b/openidm-core/src/main/java/org/forgerock/openidm/managed/RelationshipProvider.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.openidm.managed; @@ -165,7 +166,7 @@ public ResourceResponse apply(ResourceResponse resourceResponse) throws Resource * Returns a Function to format a resource from the repository to that expected by the provider consumer. First * object properties are removed and {@code secondId} (or {@code firstId} if it's a reverse relationship) * will be converted to {@code _ref} - *

+ *

* This will convert repo resources in the format of: * 

      *     {
@@ -177,7 +178,7 @@ public ResourceResponse apply(ResourceResponse resourceResponse) throws Resource
      *         "properties": { ... }
      *     }
      *
- *

+ *

* To a provider response format of: * * 

diff --git a/openidm-core/src/main/java/org/forgerock/openidm/sync/PendingActionContext.java b/openidm-core/src/main/java/org/forgerock/openidm/sync/PendingActionContext.java
index 4009e6840c..aa12599ce5 100644
--- a/openidm-core/src/main/java/org/forgerock/openidm/sync/PendingActionContext.java
+++ b/openidm-core/src/main/java/org/forgerock/openidm/sync/PendingActionContext.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Portions copyright 2014-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package org.forgerock.openidm.sync;
 
@@ -78,8 +79,6 @@ public boolean isPending() {
     
     /**
      * Clears pending link data, sets pending to false.
-     *
-     * @return this object's name
      */
     public void clear() {
         data.remove(ATTR_ACTION_DATA);
diff --git a/openidm-core/src/main/java/org/forgerock/openidm/sync/ReconContext.java b/openidm-core/src/main/java/org/forgerock/openidm/sync/ReconContext.java
index ec12651bdc..0309e8b6c1 100644
--- a/openidm-core/src/main/java/org/forgerock/openidm/sync/ReconContext.java
+++ b/openidm-core/src/main/java/org/forgerock/openidm/sync/ReconContext.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openidm.sync;
@@ -37,7 +38,7 @@ public class ReconContext extends AbstractContext {
      * Create a new recon context from an existing (parent) context.
      *
      * @param parent the parent server context
-     * @param trigger the trigger source
+     * @param mapping the name of the mapping associated with the reconciliation
      */
     public ReconContext(final Context parent, String mapping) {
         super(checkNotNull(parent, "Cannot instantiate ReconContext with null parent Context"), CONTEXT_NAME);
diff --git a/openidm-core/src/main/java/org/forgerock/openidm/sync/impl/ReconTypeBase.java b/openidm-core/src/main/java/org/forgerock/openidm/sync/impl/ReconTypeBase.java
index 1b125056c8..7146f73b00 100644
--- a/openidm-core/src/main/java/org/forgerock/openidm/sync/impl/ReconTypeBase.java
+++ b/openidm-core/src/main/java/org/forgerock/openidm/sync/impl/ReconTypeBase.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Portions copyright 2014-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package org.forgerock.openidm.sync.impl;
 
@@ -85,7 +86,7 @@ public enum QuerySide {SOURCE, TARGET};
     /**
      * A constructor.
      * 
-     * @param reconContext a {@link RconciliationContext} object.
+     * @param reconContext a {@link ReconciliationContext} object.
      * @param defaultRunTargetPhase a boolean indicating if target phase should be run.
      */
     public ReconTypeBase(ReconciliationContext reconContext, boolean defaultRunTargetPhase) {
@@ -203,7 +204,7 @@ protected boolean specifiesQuery(JsonValue queryCfg) {
      * sensitive fashion, or if false it populates as lower case only
      * @param pageSize the page size if paging
      * @param pagingCookie the cookie to use if paging, null if first page
-     * @param reconContext the {@link RconciliationContext} object associated with this recon
+     * @param reconContext the {@link ReconciliationContext} object associated with this recon
      * @param querySide an indicator for which side of a reconciliation (source or target) a query is for
      * @return a {@link ReconQueryResult} containing the collection of (unqualified) ids
      * @throws SynchronizationException if retrieving or processing the ids failed
@@ -309,21 +310,12 @@ private boolean hasFullEntry(JsonValue entry, QuerySide querySide) {
         }
     }
 
-    /**
-     * @inheritDoc
-     */
     @Override
     public abstract ReconQueryResult querySource(int pageSize, String pagingCookie) throws SynchronizationException;
 
-    /**
-     * @inheritDoc
-     */
     @Override
     public abstract ResultIterable queryTarget() throws SynchronizationException;
 
-    /**
-     * @inheritDoc
-     */
     @Override
     public abstract JsonValue getReconParameters();
 }
diff --git a/openidm-core/src/main/java/org/forgerock/openidm/sync/impl/ReconTypeByQuery.java b/openidm-core/src/main/java/org/forgerock/openidm/sync/impl/ReconTypeByQuery.java
index 56c66a28bb..0503ae3ffe 100644
--- a/openidm-core/src/main/java/org/forgerock/openidm/sync/impl/ReconTypeByQuery.java
+++ b/openidm-core/src/main/java/org/forgerock/openidm/sync/impl/ReconTypeByQuery.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Portions copyright 2013-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package org.forgerock.openidm.sync.impl;
 
@@ -50,8 +51,7 @@ public class ReconTypeByQuery extends ReconTypeBase {
     /**
      * A constructor.
      * 
-     * @param reconContext a {@link RconciliationContext} object.
-     * @throws BadRequestException
+     * @param reconContext a {@link ReconciliationContext} object.
      */
     public ReconTypeByQuery(ReconciliationContext reconContext) {
         super(reconContext, DEFAULT_RUN_TARGET_PHASE);
diff --git a/openidm-core/src/main/java/org/forgerock/openidm/sync/impl/ReconciliationStatistic.java b/openidm-core/src/main/java/org/forgerock/openidm/sync/impl/ReconciliationStatistic.java
index 7e3ca068b8..b24ba58b4b 100644
--- a/openidm-core/src/main/java/org/forgerock/openidm/sync/impl/ReconciliationStatistic.java
+++ b/openidm-core/src/main/java/org/forgerock/openidm/sync/impl/ReconciliationStatistic.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Portions copyright 2012-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package org.forgerock.openidm.sync.impl;
 
@@ -269,7 +270,7 @@ public long getDuration() {
     }
 
     /**
-     * @return the duration, in milliseconds, of an event defined by a {@code startTime} and an {@code endTime}
+     * Returns the duration, in milliseconds, of an event defined by a {@code startTime} and an {@code endTime}.
      *
      * @param startTime the start time
      * @param endTime the end time
diff --git a/openidm-core/src/main/java/org/forgerock/openidm/sync/impl/ResultEntry.java b/openidm-core/src/main/java/org/forgerock/openidm/sync/impl/ResultEntry.java
index 8300bda5c3..adbee9676d 100644
--- a/openidm-core/src/main/java/org/forgerock/openidm/sync/impl/ResultEntry.java
+++ b/openidm-core/src/main/java/org/forgerock/openidm/sync/impl/ResultEntry.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Portions copyright 2014-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package org.forgerock.openidm.sync.impl;
 
@@ -25,8 +26,8 @@ public class ResultEntry {
     private final JsonValue value;
     
     /** 
-     * @param The normalized identifier
-     * @param optional pre-queried value, or null if value not pre-queried
+     * @param id The normalized identifier
+     * @param value optional pre-queried value, or null if value not pre-queried
      */
     public ResultEntry(String id, JsonValue value) {
         this.id = id;
diff --git a/openidm-customendpoint/src/main/java/org/forgerock/openidm/customendpoint/impl/metadata/ConfigMeta.java b/openidm-customendpoint/src/main/java/org/forgerock/openidm/customendpoint/impl/metadata/ConfigMeta.java
index f1300ffd79..341bd59b5f 100644
--- a/openidm-customendpoint/src/main/java/org/forgerock/openidm/customendpoint/impl/metadata/ConfigMeta.java
+++ b/openidm-customendpoint/src/main/java/org/forgerock/openidm/customendpoint/impl/metadata/ConfigMeta.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright 2013-2015 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -51,9 +52,6 @@ public class ConfigMeta implements MetaDataProvider {
      */
     final static Logger logger = LoggerFactory.getLogger(ConfigMeta.class);
 
-    /**
-     * @inheritDoc
-     */
     public List getPropertiesToEncrypt(String pidOrFactory, String instanceAlias,
             JsonValue config) throws WaitForMetaData {
         if (EndpointsService.PID.equalsIgnoreCase(pidOrFactory)) {
@@ -74,9 +72,6 @@ public List getPropertiesToEncrypt(String pidOrFactory, String inst
         return null;
     }
 
-    /**
-     * @inheritDoc
-     */
     @Override
     public void setCallback(MetaDataProviderCallback callback) {
         // This newBuilder won't be updated
diff --git a/openidm-external-email/src/main/java/org/forgerock/openidm/external/email/metadata/ConfigMeta.java b/openidm-external-email/src/main/java/org/forgerock/openidm/external/email/metadata/ConfigMeta.java
index 9dbe89e20c..73cbe90d68 100644
--- a/openidm-external-email/src/main/java/org/forgerock/openidm/external/email/metadata/ConfigMeta.java
+++ b/openidm-external-email/src/main/java/org/forgerock/openidm/external/email/metadata/ConfigMeta.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2015 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -55,9 +56,6 @@ public ConfigMeta() {
         propertiesToEncrypt.put(EmailServiceImpl.PID, props);
     }
 
-    /**
-     * @inheritDoc
-     */
     public List getPropertiesToEncrypt(String pidOrFactory, String instanceAlias, JsonValue config) {
         if (propertiesToEncrypt.containsKey(pidOrFactory)) {
             return propertiesToEncrypt.get(pidOrFactory);
@@ -65,9 +63,6 @@ public List getPropertiesToEncrypt(String pidOrFactory, String inst
         return null;
     }
 
-    /**
-     * @inheritDoc
-     */
     @Override
     public void setCallback(MetaDataProviderCallback callback) {
         this.callback = callback;
diff --git a/openidm-identity-provider/src/main/java/org/forgerock/openidm/idp/impl/ProviderConfigMapper.java b/openidm-identity-provider/src/main/java/org/forgerock/openidm/idp/impl/ProviderConfigMapper.java
index 2ee799c73c..1f7946a5ce 100644
--- a/openidm-identity-provider/src/main/java/org/forgerock/openidm/idp/impl/ProviderConfigMapper.java
+++ b/openidm-identity-provider/src/main/java/org/forgerock/openidm/idp/impl/ProviderConfigMapper.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.openidm.idp.impl;
 
@@ -73,14 +74,14 @@ public JsonValue apply(ProviderConfig providerConfig) {
      * Converts a {@link ProviderConfig} to {@link JsonValue}.
      *
      * @param config of {@link ProviderConfig} to convert to {@link JsonValue}
-     * @return {@link ProviderConfig as {@link JsonValue}}
+     * @return {@link ProviderConfig} as {@link JsonValue}
      */
     public static JsonValue toJsonValue(ProviderConfig config) {
         return toJsonValue.apply(config);
     }
 
     /**
-     * Converts a List of {@Link ProviderConfig} to {@link JsonValue}.
+     * Converts a List of {@link ProviderConfig} to {@link JsonValue}.
      *
      * @param configList of {@link ProviderConfig}
      * @return {@link ProviderConfig} list as a {@link JsonValue}
diff --git a/openidm-infoservice/src/main/java/org/forgerock/openidm/info/health/DatabaseInfoResourceProvider.java b/openidm-infoservice/src/main/java/org/forgerock/openidm/info/health/DatabaseInfoResourceProvider.java
index 5f66b77160..4fa9784c57 100644
--- a/openidm-infoservice/src/main/java/org/forgerock/openidm/info/health/DatabaseInfoResourceProvider.java
+++ b/openidm-infoservice/src/main/java/org/forgerock/openidm/info/health/DatabaseInfoResourceProvider.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.openidm.info.health;
@@ -47,7 +48,7 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * Gets BoneCP usage statistics from the {@link com.jolbox.bonecp.StatisticsMBean StatisticsMBean}.
+ * Gets BoneCP usage statistics from the {@code StatisticsMBean}.
  */
 @SingletonProvider(@Handler(
         id = "databaseInfoResourceProvider:0",
diff --git a/openidm-infoservice/src/main/java/org/forgerock/openidm/info/metadata/ConfigMeta.java b/openidm-infoservice/src/main/java/org/forgerock/openidm/info/metadata/ConfigMeta.java
index 0c1db89387..2d73e37a15 100644
--- a/openidm-infoservice/src/main/java/org/forgerock/openidm/info/metadata/ConfigMeta.java
+++ b/openidm-infoservice/src/main/java/org/forgerock/openidm/info/metadata/ConfigMeta.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -49,9 +50,6 @@ public class ConfigMeta implements MetaDataProvider {
      */
     final static Logger logger = LoggerFactory.getLogger(ConfigMeta.class);
 
-    /**
-     * @inheritDoc
-     */
     public List getPropertiesToEncrypt(String pidOrFactory, String instanceAlias,
             JsonValue config) throws WaitForMetaData, NotConfiguration {
         if (HealthService.PID.equalsIgnoreCase(pidOrFactory)) {
@@ -65,9 +63,6 @@ public List getPropertiesToEncrypt(String pidOrFactory, String inst
         return null;
     }
 
-    /**
-     * @inheritDoc
-     */
     @Override
     public void setCallback(MetaDataProviderCallback callback) {
         // This metadata won't be updated
diff --git a/openidm-jetty-fragment/src/main/java/org/forgerock/openidm/jetty/JettyErrorHandler.java b/openidm-jetty-fragment/src/main/java/org/forgerock/openidm/jetty/JettyErrorHandler.java
index a9239154b8..53c95a8f11 100644
--- a/openidm-jetty-fragment/src/main/java/org/forgerock/openidm/jetty/JettyErrorHandler.java
+++ b/openidm-jetty-fragment/src/main/java/org/forgerock/openidm/jetty/JettyErrorHandler.java
@@ -12,7 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
- * Portions copyright 2025 3A Systems LLC.
+ * Portions copyright 2025-2026 3A Systems LLC.
  */
 
 package org.forgerock.openidm.jetty;
@@ -45,7 +45,6 @@ public class JettyErrorHandler extends org.eclipse.jetty.ee10.servlet.ErrorHandl
     /**
      * Handles Jetty errors originating from HTTP requests. Add the following entry to {@code jetty.xml} or directly
      * to an {@code org.eclipse.jetty.server.Server} instance.
-     * 

      * 
      * <Configure id="Server" class="org.eclipse.jetty.server.Server">
      *   ...
@@ -58,8 +57,6 @@ public class JettyErrorHandler extends org.eclipse.jetty.ee10.servlet.ErrorHandl
      * </Configure>
      * 

      *
-     * @param target The target of the request, which is either a URI, name, or {@code null}.
-     * @param baseRequest Jetty HTTP request
      * @param request Servlet HTTP request
      * @param response Servlet HTTP response
      * @throws IOException I/O error
diff --git a/openidm-maintenance/src/main/java/org/forgerock/openidm/maintenance/upgrade/ComparableVersion.java b/openidm-maintenance/src/main/java/org/forgerock/openidm/maintenance/upgrade/ComparableVersion.java
index cb31053aa2..74cbd92aa7 100644
--- a/openidm-maintenance/src/main/java/org/forgerock/openidm/maintenance/upgrade/ComparableVersion.java
+++ b/openidm-maintenance/src/main/java/org/forgerock/openidm/maintenance/upgrade/ComparableVersion.java
@@ -15,6 +15,8 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ *
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openidm.maintenance.upgrade;
@@ -51,7 +53,7 @@
  *     Unknown qualifiers are considered after known qualifiers, with lexical order (always case insensitive),
  *   
  * 
  • a dash usually precedes a qualifier, and is always less important than something preceded with a dot.
    • 
- * 
    
+ * 
  *
  * @see "Versioning" on Maven Wiki
  * @author Kenney Westerhof
diff --git a/openidm-policy/src/main/java/org/forgerock/openidm/policy/metadata/ConfigMeta.java b/openidm-policy/src/main/java/org/forgerock/openidm/policy/metadata/ConfigMeta.java
index c5f8e9ddd4..8f15ebc290 100644
--- a/openidm-policy/src/main/java/org/forgerock/openidm/policy/metadata/ConfigMeta.java
+++ b/openidm-policy/src/main/java/org/forgerock/openidm/policy/metadata/ConfigMeta.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -48,9 +49,6 @@ public class ConfigMeta implements MetaDataProvider {
      */
     final static Logger logger = LoggerFactory.getLogger(ConfigMeta.class);
 
-    /**
-     * @inheritDoc
-     */
     public List getPropertiesToEncrypt(String pidOrFactory, String instanceAlias,
             JsonValue config) throws WaitForMetaData, NotConfiguration {
         if (PolicyService.PID.equalsIgnoreCase(pidOrFactory)) {
@@ -60,9 +58,6 @@ public List getPropertiesToEncrypt(String pidOrFactory, String inst
         return null;
     }
 
-    /**
-     * @inheritDoc
-     */
     @Override
     public void setCallback(MetaDataProviderCallback callback) {
         // This metadata won't be updated
diff --git a/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/ConnectorInfoProvider.java b/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/ConnectorInfoProvider.java
index 4005aab11c..9b2080c459 100644
--- a/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/ConnectorInfoProvider.java
+++ b/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/ConnectorInfoProvider.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package org.forgerock.openidm.provisioner.openicf;
 
@@ -66,7 +67,6 @@ public interface ConnectorInfoProvider {
     /**
      * Create a new configuration object from the {@code configuration}
      * parameter.
-     * 
    
      *
      * @param configuration
      * @return
diff --git a/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/ConnectorReference.java b/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/ConnectorReference.java
index 4e64f0bf0f..7d34bc251b 100644
--- a/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/ConnectorReference.java
+++ b/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/ConnectorReference.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -28,7 +29,7 @@
 import org.identityconnectors.framework.api.ConnectorKey;
 
 /**
- * ConnectorReference holds the required {@ConnectorKey} value to
+ * ConnectorReference holds the required {@link ConnectorKey} value to
  * find the correct connector in the
  * {@link org.identityconnectors.framework.api.ConnectorInfoManager}. The
  * {@code getConnectorHost} is the key for the ConnectorInfoManager newBuilder.
diff --git a/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/OperationHelper.java b/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/OperationHelper.java
index cda9d179f0..8ed6afa5f1 100644
--- a/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/OperationHelper.java
+++ b/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/OperationHelper.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright 2011-2015 ForgeRock AS. All rights reserved.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -50,10 +51,10 @@ public interface OperationHelper {
      *
      * @param operation
      * @return if {@code denied} is true and the {@code onDeny} equals
-     *         {@link org.forgerock.openidm.provisioner.openicf.commons.OperationOptionInfoHelper.OnDenyAction#DO_NOTHING}
+     *         {@code OperationOptionInfoHelper.OnDenyAction.DO_NOTHING}
      *         returns false else true
      * @throws ResourceException if {@code denied} is true and the {@code onDeny} equals
-     *                            {@link org.forgerock.openidm.provisioner.openicf.commons.OperationOptionInfoHelper.OnDenyAction#THROW_EXCEPTION}
+     *                            {@code OperationOptionInfoHelper.OnDenyAction.THROW_EXCEPTION}
      */
     boolean isOperationPermitted(Class operation) throws ResourceException;
 
@@ -78,7 +79,7 @@ public interface OperationHelper {
 
     /**
      * Generate the fully qualified id from unqualified object {@link Uid}
-     * 
    
+     * 
    
      * The result id will be system/{@code [endSystemName]}/{@code [objectType]}/{@code [escapedObjectId]}
      *
      * @param uid original un escaped unique identifier of the object
@@ -97,8 +98,6 @@ public interface OperationHelper {
     /**
      * Build new {@code Filter} instance form the {@code query} and {@code params} values.
      *
-     * @param query
-     * @param params
      * @return
      * @throws Exception
      */
@@ -110,7 +109,7 @@ public interface OperationHelper {
 
     /**
      * Build a new Map object from the {@code source} object.
-     * 
    
+     * 
    
      * This class uses the embedded schema to convert the {@code source}.
      *
      * @param source
diff --git a/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/commons/AttributeInfoHelper.java b/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/commons/AttributeInfoHelper.java
index 3b18040a94..1e12701126 100644
--- a/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/commons/AttributeInfoHelper.java
+++ b/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/commons/AttributeInfoHelper.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openidm.provisioner.openicf.commons;
@@ -176,9 +177,10 @@ public AttributeInfoHelper(String name, boolean isOperationalOption, JsonValue s
 
     /**
      * Get the Java Class for the {@code type} value in the schema.
-     * 
    
+     * 
    
      * The Default mapping:
      * 
+     * 
      * 
      * 
      * 
@@ -188,7 +190,6 @@ public AttributeInfoHelper(String name, boolean isOperationalOption, JsonValue s
      * 
      * 
      * 
-     * 
      * 
    Default JSON to Java type mapping
    JSON TypeJava Type
    any{@link Object}
    boolean{@link Boolean}
    number{@link Number}
    object{@link Map}
    string{@link String}
    
      *
      * @return
@@ -227,13 +228,12 @@ public Attribute build(Object source, final CryptoService cryptoService)
     }
 
     /**
-     * The {@link org.forgerock.json.resource.QueryFilterVisitor} use this
+     * The {@code org.forgerock.json.resource.QueryFilterVisitor} use this
      * method to convert the string value to {@link Attribute} use in
      * {@link org.identityconnectors.framework.common.objects.filter.Filter}
-     * 
+     *
      * @param source
      * @return
-     * @throws Exception
      */
     public Attribute build(Object source) {
         return build(attributeInfo, source);
@@ -312,7 +312,7 @@ public Object build(Attribute source, CryptoService cryptoService) throws JsonCr
      * @throws IOException
      * @throws IllegalArgumentException
      *             if the type is not on the supported list.
-     * @see {@link org.identityconnectors.framework.common.FrameworkUtil#checkOperationOptionType(Class)}
+     * @see org.identityconnectors.framework.common.FrameworkUtil#checkOperationOptionType(Class)
      */
     public void build(OperationOptionsBuilder builder, Object value) throws IOException {
         if (value == null || (value instanceof JsonValue && !((JsonValue) value).isNull())) {
diff --git a/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/commons/ConnectorUtil.java b/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/commons/ConnectorUtil.java
index 12c632c160..783250c6dd 100644
--- a/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/commons/ConnectorUtil.java
+++ b/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/commons/ConnectorUtil.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright 2011-2016 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -191,29 +192,30 @@ public class ConnectorUtil {
 
     /**
      * Get the Java Class for the {@code type} value in the schema.
-     * 
    
+     * 
    
      * The Default mapping:
      * 
+     * 
      * 
      * 
      * 
-     * 
+     * 
      * 
-     * 
-     * 
+     * 
+     * 
      * 
      * 
-     * 
+     * 
      * 
      * 
-     * 
+     * 
      * 
      * 
      * 
-     * 
+     * 
      * 
      * 
-     * 
+     * 
      * 
      * 
      * 
@@ -236,7 +238,7 @@ public static Class findClassForName(String name) {
 
     /**
      * Find the string code of the given {@code clazz}.
-     * 
    
+     * 
    
      * Encodes the {@link Class} to String code
      *
      * @param clazz
@@ -254,7 +256,7 @@ public static String findNameForClass(Class clazz) {
 
     /**
      * Find the proper target simple class type for the source type.
-     * 
    
+     * 
    
      * JSON schema has predefined types abd this method maps the {@code clazz} Class to proper representation
      *
      * @param clazz
@@ -279,7 +281,6 @@ public static String findJSONTypeForClass(Class clazz) {
 
     /**
      * Convert the {@link ObjectPoolConfiguration} to simple Map.
-     * 
    
      *
      * @param info
      * @return
@@ -316,7 +317,6 @@ public static void configureResultsHandlerConfiguration(JsonValue source, Result
 
     /**
      * Convert the {@link ObjectPoolConfiguration} to simple Map.
-     * 
    
      *
      * @param info
      * @return
@@ -520,7 +520,7 @@ public static JsonValue createSystemConfigurationFromAPIConfiguration(
 
     /**
      * Convert the {@link ConnectorKey} into a Map.
-     * 
    
+     * 
    
      * The connector key is saved in a JSON object and this method converts it to simple Map.
      *
      * @param info
@@ -536,7 +536,7 @@ public static Map getConnectorKey(ConnectorKey info) {
 
     /**
      * Create a new {@link ConnectorKey} newBuilder form the {@code configuration} object.
-     * 
    
+     * 
    
      * The Configuration object MUST contain the three required String properties.
      * 
      
      * 
    • bundleName
      • 
@@ -547,7 +547,6 @@ public static Map getConnectorKey(ConnectorKey info) {
      * @param configuration
      * @return new newBuilder of {@link ConnectorKey}
      * @throws IllegalArgumentException when one of the three required parameter is null.
-     * @throws IOException              when the property value can not be converted to String.
      */
     public static ConnectorKey getConnectorKey(JsonValue configuration) throws JsonValueException {
         String bundleName = configuration.get(OPENICF_BUNDLENAME).asString();
@@ -753,7 +752,7 @@ public static Map getObjectClassInfoMap(ObjectClassInfo info) {
 
     /**
      * Build a {@link Map} from the given {@link org.identityconnectors.framework.common.objects.AttributeInfo}
-     * 
      
+     * 
      
      * The result will look like this:
      * {
      * "type"    : "number",
@@ -825,7 +824,7 @@ public static Map getOperationOptionInfoMap(OperationOptionInfo
 
     /**
      * Create a new {@link SyncToken} from the input.
-     * 
      
+     * 
      
      * The source object:
      * {@code
      * {
@@ -852,7 +851,7 @@ public static SyncToken convertToSyncToken(JsonValue token) {
 
     /**
      * Create a new Map from the given {@link SyncToken}.
-     * 
      
+     * 
      
      * The target object:
      * {@code
      * {
@@ -885,14 +884,12 @@ public static String normalizeConnectorName(String connectorName) {
 
     /**
      * Coerce the {@code source} object to an object of {@code clazz} type.
-     * 
      
      *
      * @param 
      * @param source
      * @param clazz
      * @return
      * @throws NumberFormatException
-     * @throws URISyntaxException
      * @throws UnsupportedOperationException
      */
     @SuppressWarnings("unchecked")
diff --git a/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/commons/ObjectClassInfoHelper.java b/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/commons/ObjectClassInfoHelper.java
index 7d54dab5bc..146fc6876c 100644
--- a/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/commons/ObjectClassInfoHelper.java
+++ b/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/commons/ObjectClassInfoHelper.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openidm.provisioner.openicf.commons;
@@ -115,7 +116,7 @@ public ObjectClass getObjectClass() {
 
     /**
      * Get a read only set of attributes should return by default.
-     * 
      
+     * 
      
      * If the {@link OperationOptions#OP_ATTRIBUTES_TO_GET} attribute value is null this is the default always.
      *
      * @return set of attribute names to get for the object.
diff --git a/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/commons/OperationType.java b/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/commons/OperationType.java
index 7bb0adf90c..0d9dedc7c0 100644
--- a/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/commons/OperationType.java
+++ b/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/commons/OperationType.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -28,9 +29,7 @@
 
 /**
  * 
      Java class for OperationType.
- * 
      
  * 
      The following schema fragment specifies the expected content contained within this class.
- * 
      
  * 
        * <simpleType name="OperationType">
  *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
diff --git a/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/impl/ConnectorInfoProviderService.java b/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/impl/ConnectorInfoProviderService.java
index 33b378d14a..0dc3ccecbd 100644
--- a/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/impl/ConnectorInfoProviderService.java
+++ b/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/impl/ConnectorInfoProviderService.java
@@ -12,7 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2011-2016 ForgeRock AS.
- * Portions Copyrighted 2024 3A Systems LLC.
+ * Portions Copyrighted 2024-2026 3A Systems LLC.
  */
 package org.forgerock.openidm.provisioner.openicf.impl;
 
@@ -113,8 +113,6 @@
  * The ConnectorInfoProviderService initiates the the embedded OpenICF and makes it available as a
  * service.
- * 
      
- *
  */
 @Component(
         name = ConnectorInfoProviderService.PID,
diff --git a/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/impl/OpenICFProvisionerService.java b/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/impl/OpenICFProvisionerService.java
index 81acbd4e00..6508c68a58 100644
--- a/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/impl/OpenICFProvisionerService.java
+++ b/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/impl/OpenICFProvisionerService.java
@@ -12,7 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2011-2016 ForgeRock AS.
- * Portions Copyrighted 2024 3A Systems LLC.
+ * Portions Copyrighted 2024-2026 3A Systems LLC.
  */
 package org.forgerock.openidm.provisioner.openicf.impl;
 
@@ -115,7 +115,6 @@
  * The OpenICFProvisionerService is the implementation of
  * {@link CollectionResourceProvider} interface with OpenICF.
- * 
      
  */
 @Component(
         name = OpenICFProvisionerService.PID,
@@ -565,7 +564,7 @@ private ConnectorFacade getConnectorFacade0(Class operat
 
     /**
      * Gets the unique {@link org.forgerock.openidm.provisioner.SystemIdentifier} of this instance.
-     * 
      
+     * 
      
      * The service which refers to this service instance can distinguish between multiple instances by this value.
      *
      * @return the system identifier
@@ -756,25 +755,25 @@ public boolean apply(Entry entry) {
     /**
      * This newBuilder and this method can not be scheduled. The call MUST go
      * through the {@code org.forgerock.openidm.provisioner}
-     * 
      
+     * 
      
      * Invoked by the scheduler when the scheduler triggers.
-     * 
      
+     * 
      
      * Synchronization object: {@code "connectorData" : "syncToken" :
      * "1305555929000", "nativeType" : "JAVA_TYPE_LONG" },
      * "synchronizationStatus" : { "errorStatus" : null, "lastKnownServer" :
      * "localServer", "lastModDate" : "2011-05-16T14:47:58.587Z", "lastModNum" :
      * 668, "lastPollDate" : "2011-05-16T14:47:52.875Z", "lastStartTime" :
      * "2011-05-16T14:29:07.863Z", "progressMessage" : "SUCCEEDED" } }}
-     * 
      
+     * 
      
      * {@inheritDoc} Synchronize the changes from the end system for the given
      * {@code objectType}.
-     * 
      
+     * 
      
      * OpenIDM takes active role in the synchronization process by asking the
      * end system to get all changed object. Not all systems are capable to
      * fulfill this kind of request but if the end system is capable then the
      * implementation sends each change to a new request on the router and when
      * it is finished, it returns a new stage object.
-     * 
      
+     * 
      
      * The {@code previousStage} object is the previously returned value of this
      * method.
      *
@@ -792,8 +791,7 @@ public boolean apply(Entry entry) {
      *             connector.
      * @throws org.forgerock.json.JsonValueException
      *             if the {@code previousStage} is not Map.
-     * @see {@link ConnectorUtil#convertToSyncToken(org.forgerock.json.JsonValue)}
-     *      or any exception happed inside the connector.
+     * @see org.forgerock.openidm.provisioner.openicf.commons.ConnectorUtil#convertToSyncToken(org.forgerock.json.JsonValue)
      */
     public JsonValue liveSynchronize(final Context context, final String objectType, final JsonValue previousStage)
             throws ResourceException {
diff --git a/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/impl/OperationHelperImpl.java b/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/impl/OperationHelperImpl.java
index 9b3b3df512..778911cc3f 100644
--- a/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/impl/OperationHelperImpl.java
+++ b/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/impl/OperationHelperImpl.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright 2011-2015 ForgeRock AS. All rights reserved.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -139,7 +140,7 @@ public void resetUid(Uid uid, JsonValue target) {
 
     /**
      * Generate the fully qualified id from unqualified object {@link org.identityconnectors.framework.common.objects.Uid}
-     * 
      
+     * 
      
      * The result id will be system/{@code [endSystemName]}/{@code [objectType]}/{@code [escapedObjectId]}
      *
      * @param uid original un escaped unique identifier of the object
diff --git a/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/syncfailure/SyncHandlerException.java b/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/syncfailure/SyncHandlerException.java
index 35ecc1dd7f..3ec98d2cc7 100644
--- a/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/syncfailure/SyncHandlerException.java
+++ b/openidm-provisioner-openicf/src/main/java/org/forgerock/openidm/provisioner/openicf/syncfailure/SyncHandlerException.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2013 ForgeRock, AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms of the Common Development and
  * Distribution License (the License). You may not use this file except in compliance with the
@@ -21,16 +22,11 @@
  */
 public class SyncHandlerException extends RuntimeException {
     static final long serialVersionUID = 1L;
-    /**
-     * {@inheritDoc}
-     */
+
     public SyncHandlerException(String message) {
         super(message);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public SyncHandlerException(String message, Throwable cause) {
         super(message, cause);
     }
diff --git a/openidm-provisioner/src/main/java/org/forgerock/openidm/provisioner/Id.java b/openidm-provisioner/src/main/java/org/forgerock/openidm/provisioner/Id.java
index 75e759eb8e..578bfcac5c 100644
--- a/openidm-provisioner/src/main/java/org/forgerock/openidm/provisioner/Id.java
+++ b/openidm-provisioner/src/main/java/org/forgerock/openidm/provisioner/Id.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright © 2011 ForgeRock AS. All rights reserved.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -40,12 +41,12 @@
 
 /**
  * Id is a util class to work with the {@code id} property in the
- * {@link org.forgerock.json.resource.JsonResource} interface.
- * 
      
+ * {@code org.forgerock.json.resource.JsonResource} interface.
+ * 
      
  * A valid ID MAY start with {@code system} and followed by the name of the end
  * system, type of the object. The third token may be the local identifier of
  * the object instance.
- * 
      
+ * 
      
  * Valid identifiers: {@code
  * system/LDAP/account
  * LDAP/account
diff --git a/openidm-provisioner/src/main/java/org/forgerock/openidm/provisioner/ProvisionerService.java b/openidm-provisioner/src/main/java/org/forgerock/openidm/provisioner/ProvisionerService.java
index 293efc54b4..32090eff96 100644
--- a/openidm-provisioner/src/main/java/org/forgerock/openidm/provisioner/ProvisionerService.java
+++ b/openidm-provisioner/src/main/java/org/forgerock/openidm/provisioner/ProvisionerService.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright 2011-2015 ForgeRock AS. All rights reserved.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -42,7 +43,7 @@ public interface ProvisionerService {
 
     /**
      * Gets the unique {@link SystemIdentifier} of this instance.
-     * 
      
+     * 
      
      * The service which refers to this service instance can distinguish between multiple instances by this value.
      *
      * @return the provisioner's system identifier
@@ -51,7 +52,7 @@ public interface ProvisionerService {
 
     /**
      * Gets a brief stats report about the current status of this service instance.
-     * 
      
+     * 
      
      * TODO Provide a sample object
      *
      * @param context the request's Context in case the status report operation needs to perform a router request
@@ -68,15 +69,15 @@ public interface ProvisionerService {
 
     /**
      * Synchronise the changes from the end system for the given {@code objectType}.
-     * 
      
+     * 
      
      * OpenIDM takes active role in the synchronisation process by asking the end system to get all changed object.
      * Not all systems are capable to fulfill this kind of request but if the end system is capable then the
      * implementation sends each change to a new request on the router and when it is finished, it returns
      * a new stage object.
-     * 
      
+     * 
      
      * The {@code previousStage} object is the previously returned value of this method.
      * Unhandled exception will result not to update the stage object in repository.
-     * 
      
+     * 
      
      * All exceptions must be handled to save the the new stage object.
      *
      * @param context the request context associated with the invocation
diff --git a/openidm-provisioner/src/main/java/org/forgerock/openidm/provisioner/SimpleSystemIdentifier.java b/openidm-provisioner/src/main/java/org/forgerock/openidm/provisioner/SimpleSystemIdentifier.java
index a92a115011..bf93cf11b0 100644
--- a/openidm-provisioner/src/main/java/org/forgerock/openidm/provisioner/SimpleSystemIdentifier.java
+++ b/openidm-provisioner/src/main/java/org/forgerock/openidm/provisioner/SimpleSystemIdentifier.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright 2011-2015 ForgeRock AS. All rights reserved.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -33,7 +34,7 @@
 /**
  * SimpleSystemIdentifier class helps to match the id against the name of the
  * system configuration.
- * 
      
+ * 
      
  * Matching id pattern: system/{@code name}/*
  *
  */
diff --git a/openidm-quartz-fragment/src/main/java/org/forgerock/openidm/quartz/impl/JobWrapper.java b/openidm-quartz-fragment/src/main/java/org/forgerock/openidm/quartz/impl/JobWrapper.java
index dd4e9b3d0e..431fd98a55 100644
--- a/openidm-quartz-fragment/src/main/java/org/forgerock/openidm/quartz/impl/JobWrapper.java
+++ b/openidm-quartz-fragment/src/main/java/org/forgerock/openidm/quartz/impl/JobWrapper.java
@@ -2,6 +2,7 @@
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2012-2015 ForgeRock AS. All Rights Reserved
+* Portions Copyrighted 2026 3A Systems, LLC.
 *
 * The contents of this file are subject to the terms
 * of the Common Development and Distribution License
@@ -119,7 +120,6 @@ public boolean isPaused() {
     /**
      * Sets the JobWrapper in the "paused" state.
      * 
-     * @return the paused JobWrapper
      */
     public void pause() {
         setPaused(true);
@@ -128,7 +128,6 @@ public void pause() {
     /**
      * Resumes the JobWrapper from the paused state
      * 
-     * @return the resumed JobWrapper
      */
     public void resume() {
         setPaused(false);
diff --git a/openidm-quartz-fragment/src/main/java/org/forgerock/openidm/quartz/impl/RepoJobStoreUtils.java b/openidm-quartz-fragment/src/main/java/org/forgerock/openidm/quartz/impl/RepoJobStoreUtils.java
index 62b53bf29c..9e2966ba3b 100644
--- a/openidm-quartz-fragment/src/main/java/org/forgerock/openidm/quartz/impl/RepoJobStoreUtils.java
+++ b/openidm-quartz-fragment/src/main/java/org/forgerock/openidm/quartz/impl/RepoJobStoreUtils.java
@@ -2,6 +2,7 @@
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright (c) 2012 ForgeRock AS. All Rights Reserved
+* Portions Copyrighted 2026 3A Systems, LLC.
 *
 * The contents of this file are subject to the terms
 * of the Common Development and Distribution License
@@ -41,7 +42,6 @@ public class RepoJobStoreUtils {
      * 
      * @param object the object to serialize.
      * @return a string representation of the serialized object.
-     * @throws Exception
      */
     public static String serialize(Serializable object) throws JobPersistenceException {
         try {
@@ -63,7 +63,6 @@ public static String serialize(Serializable object) throws JobPersistenceExcepti
      * 
      * @param str the representation of the serialized object
      * @return the deserialized object
-     * @throws Exception
      */
     public static Object deserialize(String str) throws JobPersistenceException {
         try {
diff --git a/openidm-quartz-fragment/src/main/java/org/forgerock/openidm/quartz/impl/package-info.java b/openidm-quartz-fragment/src/main/java/org/forgerock/openidm/quartz/impl/package-info.java
index 1283680034..bf08f608e0 100644
--- a/openidm-quartz-fragment/src/main/java/org/forgerock/openidm/quartz/impl/package-info.java
+++ b/openidm-quartz-fragment/src/main/java/org/forgerock/openidm/quartz/impl/package-info.java
@@ -2,6 +2,7 @@
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright (c) 2012 ForgeRock AS. All Rights Reserved
+* Portions Copyrighted 2026 3A Systems, LLC.
 *
 * The contents of this file are subject to the terms
 * of the Common Development and Distribution License
@@ -24,7 +25,7 @@
 */
 
 /**
- * 
      Package org.forgerock.openidm.scheduler
      
+ * 
      Package org.forgerock.openidm.scheduler
      
  * 
  * This package contains a custom JobStore implementation that 
  * uses the OpenIDM Repository Service for persistence, a custom 
diff --git a/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/DB2SQLExceptionHandler.java b/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/DB2SQLExceptionHandler.java
index 3ff6969fac..3c5a481420 100644
--- a/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/DB2SQLExceptionHandler.java
+++ b/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/DB2SQLExceptionHandler.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright © 2011 ForgeRock AS. All rights reserved.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -32,9 +33,6 @@
  */
 public class DB2SQLExceptionHandler extends DefaultSQLExceptionHandler {
 
-    /**
-     * @InheritDoc
-     */
     @Override
     public boolean isRetryable(SQLException ex, Connection connection) {
         // Re-tryable DB2 error codes
diff --git a/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/DB2TableHandler.java b/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/DB2TableHandler.java
index 24c813f39d..38a20e16b4 100644
--- a/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/DB2TableHandler.java
+++ b/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/DB2TableHandler.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package org.forgerock.openidm.repo.jdbc.impl;
 
@@ -78,9 +79,6 @@ public boolean isRetryable(SQLException ex, Connection connection) {
     }
 
     // blatantly copied from OracleTableHandler...
-    /**
-     * @inheritDoc
-     */
     @Override
     public String renderQueryFilter(QueryFilter filter, Map replacementTokens, Map params) {
         final int offsetParam = Integer.parseInt((String)params.get(PAGED_RESULTS_OFFSET));
diff --git a/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/DefaultSQLExceptionHandler.java b/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/DefaultSQLExceptionHandler.java
index 9b6e098aba..e6eae1111b 100644
--- a/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/DefaultSQLExceptionHandler.java
+++ b/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/DefaultSQLExceptionHandler.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright © 2011 ForgeRock AS. All rights reserved.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -38,16 +39,10 @@
  */
 public class DefaultSQLExceptionHandler implements SQLExceptionHandler {
 
-    /**
-     * @InheritDoc
-     */
     public boolean isErrorType(SQLException ex, ErrorType errorType) {
         return XOpenErrorMapping.isErrorType(ex, errorType);
     }
 
-    /**
-     * @InheritDoc
-     */
     public boolean isRetryable(SQLException ex, Connection connection) {
         // These are known re-tryable for MySQL. Other DBs may need specific sql exception handler defnitions.
         if (isErrorType(ex, ErrorType.CONNECTION_FAILURE) || isErrorType(ex, ErrorType.DEADLOCK_OR_TIMEOUT)
diff --git a/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/GenericTableHandler.java b/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/GenericTableHandler.java
index e3416ffbb4..f847e7e313 100644
--- a/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/GenericTableHandler.java
+++ b/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/GenericTableHandler.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package org.forgerock.openidm.repo.jdbc.impl;
 
@@ -372,17 +373,11 @@ private int writeValueProperties(String fullId, long dbId, String localId, JsonV
         return batchingCount;
     }
 
-    /**
-     * @inheritDoc
-     */
     @Override
     public boolean isErrorType(SQLException ex, ErrorType errorType) {
         return sqlExceptionHandler.isErrorType(ex, errorType);
     }
 
-    /**
-     * @inheritDoc
-     */
     @Override
     public boolean isRetryable(SQLException ex, Connection connection) {
         return sqlExceptionHandler.isRetryable(ex, connection);
diff --git a/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/MSSQLExceptionHandler.java b/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/MSSQLExceptionHandler.java
index 49f3d22d2a..226db51a0f 100644
--- a/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/MSSQLExceptionHandler.java
+++ b/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/MSSQLExceptionHandler.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.openidm.repo.jdbc.impl;
 
@@ -42,9 +43,6 @@ public class MSSQLExceptionHandler extends DefaultSQLExceptionHandler {
     );
 
     
-    /**
-     * @inheritDoc
-     */
     @Override
     public boolean isRetryable(SQLException ex, Connection connection) {
         return super.isRetryable(ex, connection) || retryableErrors.contains(ex.getErrorCode());
diff --git a/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/MSSQLTableHandler.java b/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/MSSQLTableHandler.java
index c5d8a04563..d9223a751f 100644
--- a/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/MSSQLTableHandler.java
+++ b/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/MSSQLTableHandler.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2012-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openidm.repo.jdbc.impl;
@@ -152,9 +153,6 @@ public void update(String fullId, String type, String localId, String rev, Map filter, Map replacementTokens, Map params) {
         final int offsetParam = Integer.parseInt((String) params.get(PAGED_RESULTS_OFFSET));
diff --git a/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/MappedTableHandler.java b/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/MappedTableHandler.java
index 356f16ac95..c31bffc4ab 100644
--- a/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/MappedTableHandler.java
+++ b/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/MappedTableHandler.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openidm.repo.jdbc.impl;
@@ -485,9 +486,6 @@ public boolean queryIdExists(String queryId) {
     }
 
     // TODO: make common to generic and explicit handlers
-    /**
-     * @inheritDoc
-     */
     public boolean isErrorType(SQLException ex, ErrorType errorType) {
         return sqlExceptionHandler.isErrorType(ex, errorType);
     }
diff --git a/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/MySQLExceptionHandler.java b/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/MySQLExceptionHandler.java
index d0bf2ee1b3..38b8ab82f9 100644
--- a/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/MySQLExceptionHandler.java
+++ b/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/MySQLExceptionHandler.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright © 2011 ForgeRock AS. All rights reserved.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -33,9 +34,6 @@
  */
 public class MySQLExceptionHandler extends DefaultSQLExceptionHandler {
 
-    /**
-     * @InheritDoc
-     */
     public boolean isErrorType(SQLException ex, ErrorType errorType) {
         boolean result = XOpenErrorMapping.isErrorType(ex, errorType);
 
diff --git a/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/OracleTableHandler.java b/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/OracleTableHandler.java
index b3d677ed36..dac839f192 100755
--- a/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/OracleTableHandler.java
+++ b/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/OracleTableHandler.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright © 2012-2015 ForgeRock AS. All rights reserved.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -121,9 +122,6 @@ protected Map initializeQueryMap() {
         return result;
     }
 
-    /**
-     * @inheritDoc
-     */
     @Override
     public String renderQueryFilter(QueryFilter filter, Map replacementTokens, Map params) {
         final int offsetParam = Integer.parseInt((String)params.get(PAGED_RESULTS_OFFSET));
diff --git a/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/PostgreSQLTableHandler.java b/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/PostgreSQLTableHandler.java
index 1a31db184e..5cdc05d494 100644
--- a/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/PostgreSQLTableHandler.java
+++ b/openidm-repo-jdbc/src/main/java/org/forgerock/openidm/repo/jdbc/impl/PostgreSQLTableHandler.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright © 2012-2015 ForgeRock AS. All rights reserved.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -120,8 +121,6 @@ public StringSQLRenderer visitPresentFilter(Map objects, JsonPoi
 
     /**
      * Construct a table handler for Postgres using Postgres-specific json-handling
-     *
-     * {@inheritDoc}
      */
     public PostgreSQLTableHandler(JsonValue tableConfig, String dbSchemaName, JsonValue queriesConfig, JsonValue commandsConfig,
             int maxBatchSize, SQLExceptionHandler sqlExceptionHandler) {
diff --git a/openidm-repo-orientdb/src/main/java/org/forgerock/openidm/repo/orientdb/impl/OrientDBRepoService.java b/openidm-repo-orientdb/src/main/java/org/forgerock/openidm/repo/orientdb/impl/OrientDBRepoService.java
index 55f3680f76..0f008e4946 100644
--- a/openidm-repo-orientdb/src/main/java/org/forgerock/openidm/repo/orientdb/impl/OrientDBRepoService.java
+++ b/openidm-repo-orientdb/src/main/java/org/forgerock/openidm/repo/orientdb/impl/OrientDBRepoService.java
@@ -517,14 +517,6 @@ public Object command(ActionRequest request) throws ResourceException {
      *            the parameters of the query to perform.
      * @return the query results, which includes meta-data and the result
      *         records in JSON object structure format.
-     * @throws NotFoundException
-     *             if the specified object could not be found.
-     * @throws BadRequestException
-     *             if the specified params contain invalid arguments, e.g. a
-     *             query id that is not configured, a query expression that is
-     *             invalid, or missing query substitution tokens.
-     * @throws ForbiddenException
-     *             if access to the object or specified query is forbidden.
      */
     @Override
     public Promise handleQuery(final Context context, final QueryRequest request,
diff --git a/openidm-repo-orientdb/src/main/java/org/forgerock/openidm/repo/orientdb/metadata/ConfigMeta.java b/openidm-repo-orientdb/src/main/java/org/forgerock/openidm/repo/orientdb/metadata/ConfigMeta.java
index 112a3209c3..847ba2a89c 100644
--- a/openidm-repo-orientdb/src/main/java/org/forgerock/openidm/repo/orientdb/metadata/ConfigMeta.java
+++ b/openidm-repo-orientdb/src/main/java/org/forgerock/openidm/repo/orientdb/metadata/ConfigMeta.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright 2011-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -49,9 +50,6 @@ public ConfigMeta() {
         propertiesToEncrypt = Collections.unmodifiableList(props);
     }
 
-    /**
-     * @inheritDoc
-     */
     public List getPropertiesToEncrypt(String pidOrFactory, String instanceAlias,
             JsonValue config) {
         if (OrientDBRepoService.PID.equals(pidOrFactory)) {
@@ -60,9 +58,6 @@ public List getPropertiesToEncrypt(String pidOrFactory, String inst
         return null;
     }
 
-    /**
-     * @inheritDoc
-     */
     @Override
     public void setCallback(MetaDataProviderCallback callback) {
     }
diff --git a/openidm-repo/src/main/java/org/forgerock/openidm/repo/QueryConstants.java b/openidm-repo/src/main/java/org/forgerock/openidm/repo/QueryConstants.java
index 978220ab37..eacde7c074 100644
--- a/openidm-repo/src/main/java/org/forgerock/openidm/repo/QueryConstants.java
+++ b/openidm-repo/src/main/java/org/forgerock/openidm/repo/QueryConstants.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright 2011-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -41,7 +42,7 @@ private QueryConstants() {}
      *
      * The alternative is to specify a query identifier for a pre-configured query. 
      * 
-     * The query can contain tokens in the form of ${} which will 
+     * The query can contain tokens in the form of {@code ${}} which will
      * get substituted from the param map passed to the query.
      * 
      * When both an expression and ID are present, the query expression takes precedent
@@ -56,7 +57,7 @@ private QueryConstants() {}
      * 
      * The alternative is to specify a query expression for an in-line query.
      *
-     * The configured query can contain tokens in the form of ${}
+     * The configured query can contain tokens in the form of {@code ${}}
      * which will get substituted from the param map passed to the query.
      * 
      * When both an expression and ID are present, the query expression takes precedent
@@ -82,7 +83,7 @@ private QueryConstants() {}
     /**
      * Query output key.
      * 
-     * Key for record results in JSON object model format, value format List>
+     * Key for record results in JSON object model format, value format {@code List>}
      */
     public final static String QUERY_RESULT = "result";    
     
diff --git a/openidm-repo/src/main/java/org/forgerock/openidm/repo/RepoBootService.java b/openidm-repo/src/main/java/org/forgerock/openidm/repo/RepoBootService.java
index 8546d1481f..2a436bc88d 100644
--- a/openidm-repo/src/main/java/org/forgerock/openidm/repo/RepoBootService.java
+++ b/openidm-repo/src/main/java/org/forgerock/openidm/repo/RepoBootService.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright © 2011-2013 ForgeRock AS. All rights reserved.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -69,10 +70,10 @@ public interface RepoBootService {
 
     /**
      * Updates a resource in the repository
-     * 
      
+     * 
      
      * This implementation requires MVCC and hence enforces that clients state
      * what revision they expect to be updating
-     * 
      
+     * 
      
      * If successful, this method updates metadata properties within the passed
      * object, including: a new {@code _rev} value for the revised object's
      * version
diff --git a/openidm-repo/src/main/java/org/forgerock/openidm/repo/RepositoryService.java b/openidm-repo/src/main/java/org/forgerock/openidm/repo/RepositoryService.java
index 97ddd3a34f..ed134d13af 100644
--- a/openidm-repo/src/main/java/org/forgerock/openidm/repo/RepositoryService.java
+++ b/openidm-repo/src/main/java/org/forgerock/openidm/repo/RepositoryService.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright © 2011 ForgeRock AS. All rights reserved.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -68,10 +69,10 @@ public interface RepositoryService {
     
     /**
      * Updates a resource in the repository
-     * 
      
+     * 
      
      * This implementation requires MVCC and hence enforces that clients state
      * what revision they expect to be updating
-     * 
      
+     * 
      
      * If successful, this method updates metadata properties within the passed
      * object, including: a new {@code _rev} value for the revised object's
      * version
diff --git a/openidm-repo/src/main/java/org/forgerock/openidm/repo/util/AbstractSQLQueryFilterVisitor.java b/openidm-repo/src/main/java/org/forgerock/openidm/repo/util/AbstractSQLQueryFilterVisitor.java
index 8e5512748e..76775c767e 100644
--- a/openidm-repo/src/main/java/org/forgerock/openidm/repo/util/AbstractSQLQueryFilterVisitor.java
+++ b/openidm-repo/src/main/java/org/forgerock/openidm/repo/util/AbstractSQLQueryFilterVisitor.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright 2015 ForgeRock AS. All rights reserved.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -61,6 +62,7 @@
  *     function AND behaves
  *     
    • @{link #visitOrFilter(Object, List<QueryFilter>, Object)} to dictate how the composite
  *     function OR behaves
      • 
+ * 
    
  *
  * @param  the subclass of SQLRenderer the visitor returns
  * @param 
     the parameter type passed in the visit methods
@@ -71,18 +73,18 @@ public abstract class AbstractSQLQueryFilterVisitor, P>
      * A templating method that will generate the actual value assertion.
      * 
    
      * Example:
-     * 
    
+     * 
          *     ?_queryFilter=email+eq+"someone@example.com"
-     * 
    
+     * 
      * is an QueryFilter stating the value assertion "email" equals "someone@example.com".  The correct SQL for that
      * may vary depending on database variant and schema definition.  This method will be invoked as
-     * 
    
+     * 
          *     return visitValueAssertion(parameters, "=", JsonPointer(/email), "someone@example.com");
-     * 
    
+     * 
      * A possible implementation for the above example may be
-     * 
    
+     * 
          *     return getDatabaseColumnFor("email") + "=" + ":email";
-     * 
    
+     * 
      * The parameters argument is implementation-dependent as a way to store placeholder mapping throughout the query-filter visiting.
      *
      * @param parameters storage of parameter-substitutions for the value of the assertion
diff --git a/openidm-repo/src/main/java/org/forgerock/openidm/repo/util/StringSQLQueryFilterVisitor.java b/openidm-repo/src/main/java/org/forgerock/openidm/repo/util/StringSQLQueryFilterVisitor.java
index 541bdc050e..03064e2a91 100644
--- a/openidm-repo/src/main/java/org/forgerock/openidm/repo/util/StringSQLQueryFilterVisitor.java
+++ b/openidm-repo/src/main/java/org/forgerock/openidm/repo/util/StringSQLQueryFilterVisitor.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright 2014-2015 ForgeRock AS. All rights reserved.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -70,18 +71,18 @@ public abstract class StringSQLQueryFilterVisitor
     extends AbstractSQLQueryFil
      * A templating method that will generate the actual value assertion.
      * 
    
      * Example:
-     * 
    
+     * 
          *     ?_queryFilter=email+eq+"someone@example.com"
-     * 
    
+     * 
      * is an QueryFilter stating the value assertion "email" equals "someone@example.com".  The correct SQL for that
      * may vary depending on database variant and schema definition.  This method will be invoked as
-     * 
    
+     * 
          *     return visitValueAssertion(parameters, "=", JsonPointer(/email), "someone@example.com");
-     * 
    
+     * 
      * A possible implementation for the above example may be
-     * 
    
+     * 
          *     return getDatabaseColumnFor("email") + "=" + ":email";
-     * 
    
+     * 
      * The parameters argument is implementation-dependent as a way to store placeholder mapping throughout the query-filter visiting.
      *
      * @param parameters storage of parameter-substitutions for the value of the assertion
diff --git a/openidm-router/src/main/java/org/forgerock/openidm/router/IDMConnectionFactory.java b/openidm-router/src/main/java/org/forgerock/openidm/router/IDMConnectionFactory.java
index 56ae994d95..45f78753f2 100644
--- a/openidm-router/src/main/java/org/forgerock/openidm/router/IDMConnectionFactory.java
+++ b/openidm-router/src/main/java/org/forgerock/openidm/router/IDMConnectionFactory.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openidm.router;
@@ -27,7 +28,7 @@
  */
 public interface IDMConnectionFactory extends ConnectionFactory {
     /**
-     * Returns a  connection to the JSON resource provider associated
+     * Returns a external connection to the JSON resource provider associated
      * with this connection factory. The connection returned by this method
      * can be used immediately.
      *
diff --git a/openidm-router/src/main/java/org/forgerock/openidm/router/RouteEvent.java b/openidm-router/src/main/java/org/forgerock/openidm/router/RouteEvent.java
index ec8500b68c..35b0541a5c 100644
--- a/openidm-router/src/main/java/org/forgerock/openidm/router/RouteEvent.java
+++ b/openidm-router/src/main/java/org/forgerock/openidm/router/RouteEvent.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -97,7 +98,6 @@ public RouteMatcher getRouteMatcher() {
 
     /**
      * Returns a {@code Router} where a change had occurred in.
-     * 
    
      *
      * @return {@code Router} that had the change.
      */
diff --git a/openidm-router/src/main/java/org/forgerock/openidm/router/RouteListener.java b/openidm-router/src/main/java/org/forgerock/openidm/router/RouteListener.java
index faae95aa53..aac31d81de 100644
--- a/openidm-router/src/main/java/org/forgerock/openidm/router/RouteListener.java
+++ b/openidm-router/src/main/java/org/forgerock/openidm/router/RouteListener.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright 2013-2015 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -29,11 +30,11 @@
 import java.util.EventListener;
 
 /**
- * @ThreadSafe
+ * This interface is thread-safe.
  */
 public interface RouteListener extends EventListener {
     /**
-     * Receives notification that a {@link org.forgerock.http.routing.RouteMatcher} has had a lifecycle change.
+     * Receives notification that a {@code org.forgerock.http.routing.RouteMatcher} has had a lifecycle change.
      *
      * @param event The {@code ServiceEvent} object.
      */
diff --git a/openidm-router/src/main/java/org/forgerock/openidm/router/metadata/ConfigMeta.java b/openidm-router/src/main/java/org/forgerock/openidm/router/metadata/ConfigMeta.java
index 1761373240..efd1884bae 100644
--- a/openidm-router/src/main/java/org/forgerock/openidm/router/metadata/ConfigMeta.java
+++ b/openidm-router/src/main/java/org/forgerock/openidm/router/metadata/ConfigMeta.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright 2014-2015 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -46,9 +47,6 @@ public class ConfigMeta implements MetaDataProvider {
      */
     final static Logger logger = LoggerFactory.getLogger(ConfigMeta.class);
 
-    /**
-     * @inheritDoc
-     */
     public List getPropertiesToEncrypt(String pidOrFactory, String instanceAlias, JsonValue config)
             throws WaitForMetaData, NotConfiguration {
         if (JsonResourceRouterService.PID.equalsIgnoreCase(pidOrFactory)) {
@@ -58,9 +56,6 @@ public List getPropertiesToEncrypt(String pidOrFactory, String inst
         return null;
     }
 
-    /**
-     * @inheritDoc
-     */
     @Override
     public void setCallback(MetaDataProviderCallback callback) {
         // This instance won't be updated
diff --git a/openidm-router/src/main/java/org/forgerock/openidm/router/package-info.java b/openidm-router/src/main/java/org/forgerock/openidm/router/package-info.java
index 387a1c5014..2e9c400226 100644
--- a/openidm-router/src/main/java/org/forgerock/openidm/router/package-info.java
+++ b/openidm-router/src/main/java/org/forgerock/openidm/router/package-info.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -24,7 +25,7 @@
 
 /**
  * OpenIDM router classes
- * 
    
+ * 
    
  * This package contains the core routing implementation of OpenIDM.
  */
 package org.forgerock.openidm.router;
diff --git a/openidm-script/src/main/java/org/forgerock/openidm/script/ScriptedRequestHandler.java b/openidm-script/src/main/java/org/forgerock/openidm/script/ScriptedRequestHandler.java
index cf6d9fab58..3635cb99e8 100644
--- a/openidm-script/src/main/java/org/forgerock/openidm/script/ScriptedRequestHandler.java
+++ b/openidm-script/src/main/java/org/forgerock/openidm/script/ScriptedRequestHandler.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openidm.script;
@@ -98,8 +99,7 @@ private ScriptEntry getScriptEntry() {
 
     /**
      * Eventually set the script value.
-     * 
    
-     * 
+     *
      * @param newScriptEntry
      * @throws NullPointerException
      *             when the {@code newScriptEntry} is null.
diff --git a/openidm-script/src/main/java/org/forgerock/openidm/script/impl/metadata/ConfigMeta.java b/openidm-script/src/main/java/org/forgerock/openidm/script/impl/metadata/ConfigMeta.java
index 9a059e50c0..d65bdce732 100644
--- a/openidm-script/src/main/java/org/forgerock/openidm/script/impl/metadata/ConfigMeta.java
+++ b/openidm-script/src/main/java/org/forgerock/openidm/script/impl/metadata/ConfigMeta.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.forgerock.openidm.script.impl.metadata;
@@ -48,9 +50,6 @@ public class ConfigMeta implements MetaDataProvider {
      */
     final static Logger logger = LoggerFactory.getLogger(ConfigMeta.class);
 
-    /**
-     * @inheritDoc
-     */
     public List getPropertiesToEncrypt(String pidOrFactory, String instanceAlias,
             JsonValue config) throws WaitForMetaData, NotConfiguration {
         if (ScriptRegistryService.PID.equalsIgnoreCase(pidOrFactory)) {
@@ -60,9 +59,6 @@ public List getPropertiesToEncrypt(String pidOrFactory, String inst
         return null;
     }
 
-    /**
-     * @inheritDoc
-     */
     @Override
     public void setCallback(MetaDataProviderCallback callback) {
         // This newBuilder won't be updated
diff --git a/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/ServletRegistration.java b/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/ServletRegistration.java
index 22cd0fff89..261181ccbf 100644
--- a/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/ServletRegistration.java
+++ b/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/ServletRegistration.java
@@ -12,7 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2013-2015 ForgeRock AS.
- * Portions copyright 2025 3A Systems LLC.
+ * Portions copyright 2025-2026 3A Systems LLC.
  */
 
 package org.forgerock.openidm.servletregistration;
@@ -83,7 +83,6 @@ public interface ServletRegistration {
      * @param initparams initialization arguments for the servlet or
      *        null if there are none. This argument is used by the
      *        servlet's ServletConfig object.
-     * @throws Exception if a problem occurs registering a servlet filter
      */
     @SuppressWarnings("rawtypes")
     void registerServlet(String alias, Servlet servlet, Dictionary initparams) throws ServletException, NamespaceException;
diff --git a/openidm-shell/src/main/java/org/forgerock/openidm/shell/CustomCommandScope.java b/openidm-shell/src/main/java/org/forgerock/openidm/shell/CustomCommandScope.java
index 9aa66a7a1e..1ffb655145 100644
--- a/openidm-shell/src/main/java/org/forgerock/openidm/shell/CustomCommandScope.java
+++ b/openidm-shell/src/main/java/org/forgerock/openidm/shell/CustomCommandScope.java
@@ -2,6 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 2011-2013 ForgeRock AS. All Rights Reserved
+ * Portions Copyrighted 2026 3A Systems, LLC.
  *
  * The contents of this file are subject to the terms
  * of the Common Development and Distribution License
@@ -48,7 +49,7 @@ public abstract class CustomCommandScope {
 
     /**
      * Get the {@link org.apache.felix.service.command.CommandProcessor#COMMAND_FUNCTION} value.
-     * 
    
+     * 
    
      * TODO add description
      *
      * @return retrun a new map where the key is the command name and the value is the description.
@@ -57,7 +58,7 @@ public abstract class CustomCommandScope {
 
     /**
      * Get the {@link org.apache.felix.service.command.CommandProcessor#COMMAND_SCOPE} value.
-     * 
    
+     * 
    
      * TODO add description
      *
      * @return the scope value
diff --git a/openidm-shell/src/main/java/org/forgerock/openidm/shell/felixgogo/MetaVar.java b/openidm-shell/src/main/java/org/forgerock/openidm/shell/felixgogo/MetaVar.java
index 2b1a41958e..86f6df4292 100644
--- a/openidm-shell/src/main/java/org/forgerock/openidm/shell/felixgogo/MetaVar.java
+++ b/openidm-shell/src/main/java/org/forgerock/openidm/shell/felixgogo/MetaVar.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package org.forgerock.openidm.shell.felixgogo;
 
@@ -27,8 +28,8 @@
  * Example:
  *
  * 
    - *     @Parameter(names = {"--user"})
- *     @MetaVar("USERNAME")
+ *     {@literal @}Parameter(names = {"--user"})
+ *     {@literal @}MetaVar("USERNAME")
  *     final String username
  * 
    
  *
diff --git a/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/BlockingPublisher.java b/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/BlockingPublisher.java
index cc9e6e314b..09bbd2fa9b 100644
--- a/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/BlockingPublisher.java
+++ b/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/BlockingPublisher.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright © 2012-2014 ForgeRock AS. All rights reserved.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openidm.smartevent.core;
@@ -74,9 +75,6 @@ public static PluggablePublisher getInstance() {
         return INSTANCE;
     }
 
-    /**
-     * @inheritDoc
-     */
     public final EventEntry start(Name eventName, Object payload, Object context) {
         EventEntryImpl eventEntry = new EventEntryImpl();
         eventEntry.eventName = eventName;
@@ -88,15 +86,9 @@ public final EventEntry start(Name eventName, Object payload, Object context) {
         return eventEntry;
     }
 
-    /**
-     * @inheritDoc
-     */
     public final void setResult(Object result, EventEntry entry) {
     }
 
-    /**
-     * @inheritDoc
-     */
     public final void end(Name eventName, EventEntry entry) {
         try {
             queue.put(entry);
diff --git a/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/DisabledEventEntry.java b/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/DisabledEventEntry.java
index ebda238c99..880d1b821a 100644
--- a/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/DisabledEventEntry.java
+++ b/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/DisabledEventEntry.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright © 2012 ForgeRock AS. All rights reserved.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openidm.smartevent.core;
@@ -29,21 +30,12 @@ public class DisabledEventEntry implements EventEntry {
 
     Name eventName;
 
-    /**
-     * @inheritDoc
-     */
     public final void start() {
     }
 
-    /**
-     * @inheritDoc
-     */
     public final void end() {
     }
 
-    /**
-     * @inheritDoc
-     */
     public final void setResult(Object result) {
     }
 
diff --git a/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/DisabledPublisher.java b/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/DisabledPublisher.java
index 5f0eb2483f..60ec10957d 100644
--- a/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/DisabledPublisher.java
+++ b/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/DisabledPublisher.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright © 2012 ForgeRock AS. All rights reserved.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openidm.smartevent.core;
@@ -33,22 +34,13 @@ public static PluggablePublisher getInstance() {
         return INSTANCE;
     }
 
-    /**
-     * @inheritDoc
-     */
     public final EventEntry start(Name eventName, Object payload, Object context) {
         return ENTRY;
     }
 
-    /**
-     * @inheritDoc
-     */
     public final void setResult(Object result, EventEntry delegate) {
     }
 
-    /**
-     * @inheritDoc
-     */
     public final void end(Name eventName, EventEntry callingEntry) {
     }
 }
diff --git a/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/DisruptorReferringEventEntry.java b/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/DisruptorReferringEventEntry.java
index aa3fe7e935..c0ff8843b3 100644
--- a/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/DisruptorReferringEventEntry.java
+++ b/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/DisruptorReferringEventEntry.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright © 2012 ForgeRock AS. All rights reserved.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openidm.smartevent.core;
@@ -46,9 +47,6 @@ public DisruptorReferringEventEntry newInstance() {
                 }
             };
 
-    /**
-     * @inheritDoc
-     */
     public final void end() {
         // Disabled when using batched end time
         // The low latency batching framework will assign the time
diff --git a/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/DisruptorReferringPublisher.java b/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/DisruptorReferringPublisher.java
index 034732e9a2..ec780d954c 100644
--- a/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/DisruptorReferringPublisher.java
+++ b/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/DisruptorReferringPublisher.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright © 2012 ForgeRock AS. All rights reserved.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openidm.smartevent.core;
@@ -77,9 +78,6 @@ public static PluggablePublisher getInstance() {
         return INSTANCE;
     }
 
-    /**
-     * @inheritDoc
-     */
     public final EventEntry start(Name eventName, Object payload, Object context) {
         // For start event, do not hold a place in the ringbuffer (yet)
         // to avoid limiting long running measurements
@@ -95,15 +93,9 @@ public final EventEntry start(Name eventName, Object payload, Object context) {
         return eventEntry;
     }
 
-    /**
-     * @inheritDoc
-     */
     public final void setResult(Object result, EventEntry delegate) {
     }
 
-    /**
-     * @inheritDoc
-     */
     public final void end(Name eventName, EventEntry delegate) {
         sequence = ringBuffer.next();
         final DisruptorReferringEventEntry eventEntry = ringBuffer.claimAndGetPreallocated(sequence);
diff --git a/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/DisruptorShortEventEntry.java b/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/DisruptorShortEventEntry.java
index b94cfce005..8d012269c6 100644
--- a/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/DisruptorShortEventEntry.java
+++ b/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/DisruptorShortEventEntry.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright © 2012 ForgeRock AS. All rights reserved.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openidm.smartevent.core;
@@ -54,25 +55,16 @@ public DisruptorShortEventEntry newInstance() {
                 }
             };
 
-    /**
-     * @inheritDoc
-     */
     final void start() {
         startTime = System.nanoTime();
         endTime = 0;
     }
 
-    /**
-     * @inheritDoc
-     */
     public final void end() {
         // User called this end() method directly, delegate the event publishing
         publisher.end(eventName, this);
     }
 
-    /**
-     * @inheritDoc
-     */
     public final void setResult(Object result) {
         this.result = result;
     }
diff --git a/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/DisruptorShortPublisher.java b/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/DisruptorShortPublisher.java
index 3f0729c248..cfcbe870ea 100644
--- a/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/DisruptorShortPublisher.java
+++ b/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/DisruptorShortPublisher.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright © 2012 ForgeRock AS. All rights reserved.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openidm.smartevent.core;
@@ -70,9 +71,6 @@ public static PluggablePublisher getInstance() {
         return INSTANCE;
     }
 
-    /**
-     * @inheritDoc
-     */
     public final EventEntry start(Name eventName, Object payload, Object context) {
         sequence = ringBuffer.next();
         final DisruptorShortEventEntry eventEntry = ringBuffer.claimAndGetPreallocated(sequence);
@@ -87,15 +85,9 @@ public final EventEntry start(Name eventName, Object payload, Object context) {
         return eventEntry;
     }
 
-    /**
-     * @inheritDoc
-     */
     public final void setResult(Object result, EventEntry delegate) {
     }
 
-    /**
-     * @inheritDoc
-     */
     public final void end(Name eventName, EventEntry callingEntry) {
         // This end() gets called indirectly after the EventEntry end() gets
         // invoked by the user
diff --git a/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/EventEntryImpl.java b/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/EventEntryImpl.java
index 1df09acd79..cfeb050bd1 100644
--- a/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/EventEntryImpl.java
+++ b/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/EventEntryImpl.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright © 2012 ForgeRock AS. All rights reserved.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openidm.smartevent.core;
@@ -39,9 +40,6 @@ public class EventEntryImpl implements EventEntry {
 
     PluggablePublisher publisher;
 
-    /**
-     * @inheritDoc
-     */
     final void start() {
         // TODO: provide option for millis
         // startTime = System.currentTimeMillis();
@@ -49,18 +47,12 @@ final void start() {
         endTime = 0;
     }
 
-    /**
-     * @inheritDoc
-     */
     public final void end() {
         // User called this end() method directly, delegate the event publishing
         endTime = System.nanoTime();
         publisher.end(eventName, this);
     }
 
-    /**
-     * @inheritDoc
-     */
     public final void setResult(Object result) {
         this.publisherResultSet = true;
         if (eventName.getResultHistoryEnabled()) {
diff --git a/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/PluggablePublisher.java b/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/PluggablePublisher.java
index 4fde7babae..93fee9a54f 100644
--- a/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/PluggablePublisher.java
+++ b/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/PluggablePublisher.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright © 2012 ForgeRock AS. All rights reserved.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openidm.smartevent.core;
@@ -28,7 +29,7 @@ public interface PluggablePublisher {
     /**
      * Pluggable implementation of the start event handling, used internally
      * 
-     * @see org.forgerock.smartevent.Publisher
+     * @see org.forgerock.openidm.smartevent.Publisher
      */
     EventEntry start(Name eventName, Object payload, Object context);
 
@@ -37,7 +38,7 @@ public interface PluggablePublisher {
      * Invoked indirectly as part of the
      * org.forgerock.smartevent.EventEntry.setResult() processing
      * 
-     * @see org.forgerock.smartevent.Publisher
+     * @see org.forgerock.openidm.smartevent.Publisher
      */
     void setResult(Object result, EventEntry callingEntry);
 
@@ -46,7 +47,7 @@ public interface PluggablePublisher {
      * Invoked indirectly as part of the
      * org.forgerock.smartevent.EventEntry.end() processing
      * 
-     * @see org.forgerock.smartevent.Publisher
+     * @see org.forgerock.openidm.smartevent.Publisher
      */
     void end(Name eventName, EventEntry callingEntry);
 }
diff --git a/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/StatisticsHandler.java b/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/StatisticsHandler.java
index 50ddc9d18a..dc321a2631 100644
--- a/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/StatisticsHandler.java
+++ b/openidm-smartevent/src/main/java/org/forgerock/openidm/smartevent/core/StatisticsHandler.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright © 2012 ForgeRock AS. All rights reserved.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openidm.smartevent.core;
@@ -126,9 +127,6 @@ public void run() {
         }
     }
 
-    /**
-     * @inheritDoc
-     */
     public Map getTotals() {
         Map stats = new TreeMap<>();
         for (Map.Entry entry : map.entrySet()) {
@@ -137,9 +135,6 @@ public Map getTotals() {
         return stats;
     }
 
-    /**
-     * @inheritDoc
-     */
     public Map getRecent() {
         // TODO: consider adding history for not yet end()-ed events
         // Present history ordered by start time, with latest start time first
@@ -163,18 +158,12 @@ public Map getRecent() {
         return recent;
     }
 
-    /**
-     * @inheritDoc
-     */
     public void resetAllStatistics() {
         for (MonitoringInfo entry : map.values()) {
             entry.reset();
         }
     }
 
-    /**
-     * @inheritDoc
-     */
     public void resetStatistics(String eventName) {
         MonitoringInfo entry = map.get(eventName);
         if (entry != null) {
@@ -186,9 +175,6 @@ public void resetStatistics(String eventName) {
     }
 
     // TODO: move out of statistics
-    /**
-     * @inheritDoc
-     */
     public void setEventsEnabled(String eventName, boolean enabled) {
         Name entry = Name.get(eventName);
         if (entry != null) {
@@ -200,9 +186,6 @@ public void setEventsEnabled(String eventName, boolean enabled) {
     }
 
     // TODO: move out of statistics
-    /**
-     * @inheritDoc
-     */
     public Map getEventsEnabledMap() {
         Map enabledMap = new TreeMap();
         for (Map.Entry entry : Name.getAllNames().entrySet()) {
@@ -212,9 +195,6 @@ public Map getEventsEnabledMap() {
     }
 
     // TODO: move out of statistics
-    /**
-     * @inheritDoc
-     */
     public void setResultHistoryEnabled(String eventName, boolean enabled) {
         Name entry = Name.get(eventName);
         if (entry != null) {
@@ -226,9 +206,6 @@ public void setResultHistoryEnabled(String eventName, boolean enabled) {
     }
 
     // TODO: move out of statistics
-    /**
-     * @inheritDoc
-     */
     public Map getResultHistoryEnabledMap() {
         Map enabledMap = new TreeMap();
         for (Map.Entry entry : Name.getAllNames().entrySet()) {
diff --git a/openidm-system/src/main/java/org/forgerock/openidm/core/IdentityServer.java b/openidm-system/src/main/java/org/forgerock/openidm/core/IdentityServer.java
index b62989bc0b..81f067d0ed 100644
--- a/openidm-system/src/main/java/org/forgerock/openidm/core/IdentityServer.java
+++ b/openidm-system/src/main/java/org/forgerock/openidm/core/IdentityServer.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openidm.core;
@@ -108,7 +109,7 @@ public static IdentityServer getInstance() {
     /**
      * Initialise the singleton {@link IdentityServer} instance with the
      * provided {@link PropertyAccessor} instance.
-     * 
    
+     * 
    
      * This or the {@link #initInstance(IdentityServer)} method can be called
      * only once and then it throws {@link IllegalStateException} if it's called
      * more then once.
@@ -132,7 +133,7 @@ public static IdentityServer initInstance(PropertyAccessor properties) {
     /**
      * Initialise the singleton {@link IdentityServer} instance with the
      * provided {@link IdentityServer} instance.
-     * 
    
+     * 
    
      * This or the {@link #initInstance(PropertyAccessor)} method can be called
      * only once and then it throws {@link IllegalStateException} if it's called
      * more then once.
diff --git a/openidm-system/src/main/java/org/forgerock/openidm/core/PropertyUtil.java b/openidm-system/src/main/java/org/forgerock/openidm/core/PropertyUtil.java
index 933e82279f..fb4d9dd065 100644
--- a/openidm-system/src/main/java/org/forgerock/openidm/core/PropertyUtil.java
+++ b/openidm-system/src/main/java/org/forgerock/openidm/core/PropertyUtil.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openidm.core;
@@ -95,7 +96,7 @@ public JsonValue apply(JsonValue value) throws JsonValueException {
                     });
 
     /**
-     * Tests if the passed in value contains the delimited property, ie &{property} or ${property}
+     * Tests if the passed in value contains the delimited property, ie &{property} or ${property}
      * @param value the value to test
      * @param property the property to look for in the passed value.
      * @return true if the passed value contains the delimited property.
@@ -119,7 +120,7 @@ public static boolean containsProperty(String value) {
      * 
    
      * This method performs property variable substitution on the specified
      * value. If the specified value contains the syntax
-     * &{<prop-name>}, where <prop-name> refers to
+     * &{<prop-name>}, where <prop-name> refers to
      * either a configuration property or a system property, then the
      * corresponding property value is substituted for the variable placeholder.
      * Multiple variable placeholders may exist in the specified value as well
diff --git a/openidm-system/src/main/java/org/forgerock/openidm/core/ServerConstants.java b/openidm-system/src/main/java/org/forgerock/openidm/core/ServerConstants.java
index e5a1904b26..9fce86882e 100644
--- a/openidm-system/src/main/java/org/forgerock/openidm/core/ServerConstants.java
+++ b/openidm-system/src/main/java/org/forgerock/openidm/core/ServerConstants.java
@@ -31,7 +31,7 @@
 /**
  * This class defines a set of constants that may be referenced throughout the
  * Identity Server source.
- * 
    
+ * 
    
  * Based on OpenDJ ServerConstants
  */
 public final class ServerConstants {
diff --git a/openidm-util/src/main/java/org/forgerock/openidm/osgi/OsgiName.java b/openidm-util/src/main/java/org/forgerock/openidm/osgi/OsgiName.java
index f84f1eb1c7..1508fc01ec 100644
--- a/openidm-util/src/main/java/org/forgerock/openidm/osgi/OsgiName.java
+++ b/openidm-util/src/main/java/org/forgerock/openidm/osgi/OsgiName.java
@@ -15,6 +15,8 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ *
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package org.forgerock.openidm.osgi;
 
@@ -34,7 +36,7 @@
  * Based on apache aries org/apache/aries/jndi/url/OsgiName.java apache aries
  * org/apache/aries/jndi/url/OsgiNameParser.java
  *
- * 
    
+ * 
    
  * component 0: osgi:framework, osgi:service, openidm:services, osgi:servicelist
  * component 1: interface component 2: filter
  *
@@ -154,7 +156,7 @@ static Enumeration split(String name) {
 
     /**
      * Parse the String representation of a OSGi Object name.
-     * 
    
+     * 
    
      * Example:
      * {@code osgi:service/javax.sql.DataSource/(osgi.jndi.service.name=jdbc/openidm)}
      *
diff --git a/openidm-util/src/main/java/org/forgerock/openidm/patch/PatchValueTransformer.java b/openidm-util/src/main/java/org/forgerock/openidm/patch/PatchValueTransformer.java
index f985c636be..4dd92e08b4 100644
--- a/openidm-util/src/main/java/org/forgerock/openidm/patch/PatchValueTransformer.java
+++ b/openidm-util/src/main/java/org/forgerock/openidm/patch/PatchValueTransformer.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.openidm.patch;
@@ -33,7 +34,6 @@ public interface PatchValueTransformer {
      * @param subject The patch subject document.  Subject is unused by default, made available
      *               for use by custom transforms.
      * @return JsonValue to be used for a given patch operation
-     * @return subject on patch null or empty
      * @throws BadRequestException on null subject, null scriptConfig
      * @throws ResourceException on script execution error
      */
diff --git a/openidm-util/src/main/java/org/forgerock/openidm/util/FileUtil.java b/openidm-util/src/main/java/org/forgerock/openidm/util/FileUtil.java
index 0b78adfe0b..ad08d420d6 100644
--- a/openidm-util/src/main/java/org/forgerock/openidm/util/FileUtil.java
+++ b/openidm-util/src/main/java/org/forgerock/openidm/util/FileUtil.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.openidm.util;
@@ -33,7 +34,7 @@ private FileUtil() {
     }
 
     /**
-     * Read small < 5Mb text files to String.
+     * Read small < 5Mb text files to String.
      *
      * @param file
      *            source file
diff --git a/openidm-util/src/main/java/org/forgerock/openidm/util/ResourceUtil.java b/openidm-util/src/main/java/org/forgerock/openidm/util/ResourceUtil.java
index cce3191afd..c332f48cb4 100644
--- a/openidm-util/src/main/java/org/forgerock/openidm/util/ResourceUtil.java
+++ b/openidm-util/src/main/java/org/forgerock/openidm/util/ResourceUtil.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.forgerock.openidm.util;
@@ -63,7 +65,6 @@ private ResourceUtil() {
 
     /**
      * Retrieve the {@code UriTemplateVariables} from the context.
-     * 
    
      *
      * @param context
      *
diff --git a/openidm-util/src/main/java/org/forgerock/openidm/util/Script.java b/openidm-util/src/main/java/org/forgerock/openidm/util/Script.java
index b73b9f3460..7d4bdb8433 100644
--- a/openidm-util/src/main/java/org/forgerock/openidm/util/Script.java
+++ b/openidm-util/src/main/java/org/forgerock/openidm/util/Script.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Portions copyright 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 
 package org.forgerock.openidm.util;
@@ -25,7 +26,7 @@
 import org.forgerock.services.context.Context;
 
 /**
- * This class wraps a {@link ScriptEntry} object representing a script stored in the {@link ScriptRegistry} and 
+ * This class wraps a {@link ScriptEntry} object representing a script stored in the {@link org.forgerock.script.ScriptRegistry} and
  * provides a method for executing the script with a given {@link Context} and scope variables. 
  */
 public class Script {
diff --git a/openidm-util/src/main/java/org/forgerock/openidm/util/Scripts.java b/openidm-util/src/main/java/org/forgerock/openidm/util/Scripts.java
index b0f7c9c894..921b956f35 100644
--- a/openidm-util/src/main/java/org/forgerock/openidm/util/Scripts.java
+++ b/openidm-util/src/main/java/org/forgerock/openidm/util/Scripts.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Portions copyright 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package org.forgerock.openidm.util;
 
@@ -44,11 +45,11 @@ public static void init(ScriptRegistry registry) {
     }
 
     /**
-     * Returns a new {@link Script} object representing a {@link ScriptEntry} from the {@link ScriptRegistry} service 
+     * Returns a new {@link Script} object representing a {@link org.forgerock.script.ScriptEntry} from the {@link ScriptRegistry} service
      * based on the passed in script configuration.  Returns null if the passed is script configuration is null.
      * 
      * @param config a script configuration.
-     * @return a {@link Script} object representing a {@link ScriptEntry} from the {@link ScriptRegistry} service.
+     * @return a {@link Script} object representing a {@link org.forgerock.script.ScriptEntry} from the {@link ScriptRegistry} service.
      * @throws JsonValueException
      */
     public static Script newScript(JsonValue config) throws JsonValueException {
diff --git a/openidm-workflow-activiti/src/main/java/org/forgerock/openidm/workflow/activiti/impl/SharedIdentityService.java b/openidm-workflow-activiti/src/main/java/org/forgerock/openidm/workflow/activiti/impl/SharedIdentityService.java
index 69bbbfb45d..bdac831610 100644
--- a/openidm-workflow-activiti/src/main/java/org/forgerock/openidm/workflow/activiti/impl/SharedIdentityService.java
+++ b/openidm-workflow-activiti/src/main/java/org/forgerock/openidm/workflow/activiti/impl/SharedIdentityService.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package org.forgerock.openidm.workflow.activiti.impl;
 
@@ -282,7 +283,7 @@ public void setUserPicture(String userId, Picture picture) {
      * Retrieves the picture for a given user.
      *
      * @throws org.activiti.engine.ActivitiException if the user doesn't exist.
-     * @returns null if the user doesn't have a picture.
+     * @return null if the user doesn't have a picture.
      */
     public Picture getUserPicture(String userId) {
         return null;
diff --git a/openidm-workflow-activiti/src/main/java/org/forgerock/openidm/workflow/activiti/metadata/ConfigMeta.java b/openidm-workflow-activiti/src/main/java/org/forgerock/openidm/workflow/activiti/metadata/ConfigMeta.java
index 89edd5fb57..f6611ddc7e 100644
--- a/openidm-workflow-activiti/src/main/java/org/forgerock/openidm/workflow/activiti/metadata/ConfigMeta.java
+++ b/openidm-workflow-activiti/src/main/java/org/forgerock/openidm/workflow/activiti/metadata/ConfigMeta.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2011-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC.
  */
 package org.forgerock.openidm.workflow.activiti.metadata;
 
@@ -47,9 +48,6 @@ public ConfigMeta() {
         propertiesToEncrypt.put(ActivitiServiceImpl.PID, props);
     }
 
-    /**
-     * @inheritDoc
-     */
     public List getPropertiesToEncrypt(String pidOrFactory, String instanceAlias, JsonValue config) {
         if (propertiesToEncrypt.containsKey(pidOrFactory)) {
             return propertiesToEncrypt.get(pidOrFactory);
@@ -57,9 +55,6 @@ public List getPropertiesToEncrypt(String pidOrFactory, String inst
         return null;
     }
 
-    /**
-     * @inheritDoc
-     */
     @Override
     public void setCallback(MetaDataProviderCallback callback) {
         this.callback = callback;
diff --git a/pom.xml b/pom.xml
index bda3658571..8559028524 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,6 +113,9 @@
         17
         17
 
+        
+        all,-missing
+
 
         
         3.5.16
@@ -750,9 +753,24 @@
             
                 org.apache.maven.plugins
                 maven-javadoc-plugin
+                3.12.0
                 
-                    none
+                    ${doclint}
                     true
+                    true
+                    
+                    
+                        
+                            com.google.j2objc
+                            j2objc-annotations
+                            3.0.0
+                        
+                    
                 
                 
                     

    Default type name to Java class mapping
    any{@link Object}
    JAVA_TYPE_BIGDECIMAL{@link BigDecimal}
    JAVA_TYPE_BIGINTEGER{@link BigInteger}
    JAVA_TYPE_PRIMITIVE_BOOLEAN{@link boolean}
    JAVA_TYPE_PRIMITIVE_BOOLEAN{@code boolean}
    boolean{@link Boolean}
    JAVA_TYPE_BYTE_ARRAY{@link byte[]}
    JAVA_TYPE_CHAR{@link char}
    JAVA_TYPE_BYTE_ARRAY{@code byte[]}
    JAVA_TYPE_CHAR{@code char}
    JAVA_TYPE_CHARACTER{@link Character}
    JAVA_TYPE_DATE{@link String}
    JAVA_TYPE_PRIMITIVE_DOUBLE{@link double}
    JAVA_TYPE_PRIMITIVE_DOUBLE{@code double}
    JAVA_TYPE_DOUBLE{@link Double}
    JAVA_TYPE_FILE{@link File}
    JAVA_TYPE_PRIMITIVE_FLOAT{@link float}
    JAVA_TYPE_PRIMITIVE_FLOAT{@code float}
    JAVA_TYPE_FLOAT{@link Float}
    JAVA_TYPE_GUARDEDBYTEARRAY{@link GuardedByteArray}
    JAVA_TYPE_GUARDEDSTRING{@link GuardedString}
    JAVA_TYPE_INT{@link int}
    JAVA_TYPE_INT{@code int}
    integer{@link Integer}
    array{@link List}
    JAVA_TYPE_PRIMITIVE_LONG{@link long}
    JAVA_TYPE_PRIMITIVE_LONG{@code long}
    JAVA_TYPE_LONG{@link Long}
    JAVA_TYPE_NAME{@link Name}
    null{@code null}