Take bouncycastle version from commons

openidm-audit/src/test/java/org/forgerock/openidm/audit/impl/RouterAuditEventHandlerTest.java

@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC
  */
 
 package org.forgerock.openidm.audit.impl;
@@ -25,7 +26,6 @@
 import static org.forgerock.json.resource.ResourceResponse.FIELD_CONTENT_REVISION;
 import static org.forgerock.openidm.audit.impl.RouterAuditEventHandler.EVENT_ID;
 import static org.forgerock.util.query.QueryFilter.*;
-import static org.forgerock.util.test.assertj.AssertJPromiseAssert.assertThat;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -46,6 +46,7 @@
 import org.forgerock.services.context.RootContext;
 import org.forgerock.util.promise.Promise;
 import org.forgerock.util.query.QueryFilter;
+import org.forgerock.util.test.assertj.AssertJPromiseAssert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
@@ -81,15 +82,15 @@ public void testReadEntry() throws Exception {
         ));
         Promise<ResourceResponse, ResourceException> createPromise =
                 routerAuditEventHandler.publishEvent(new RootContext(), ACCESS, content);
-        assertThat(createPromise).succeeded();
+        AssertJPromiseAssert.assertThat(createPromise).succeeded();
         ResourceResponse createResponse = createPromise.getOrThrow();
 
         // when
         Promise<ResourceResponse, ResourceException> promise =
                 routerAuditEventHandler.readEvent(new RootContext(), ACCESS, TEST_ID);
 
         // then
-        assertThat(promise).succeeded();
+        AssertJPromiseAssert.assertThat(promise).succeeded();
         ResourceResponse readResponse = promise.getOrThrow();
         assertThat(readResponse.getId()).isEqualTo(TEST_ID);
         assertThat(readResponse.getContent().get(FIELD_CONTENT_ID).required().asString())
@@ -109,7 +110,7 @@ public void testQueryEntries() throws Exception {
         ));
         Promise<ResourceResponse, ResourceException> createPromise =
                 routerAuditEventHandler.publishEvent(new RootContext(), ACCESS, content);
-        assertThat(createPromise).succeeded();
+        AssertJPromiseAssert.assertThat(createPromise).succeeded();
         createPromise.getOrThrow();
 
         // when
@@ -130,7 +131,7 @@ public boolean handleResource(ResourceResponse resource) {
                             }
                         });
         // then
-        assertThat(promise).succeeded();
+        AssertJPromiseAssert.assertThat(promise).succeeded();
         promise.getOrThrow();
         assertThat(responses).hasSize(1);
         assertThat(responses.get(0).getId()).isEqualTo(TEST_ID);
@@ -151,7 +152,7 @@ public void testCreateEntry() throws Exception {
                 routerAuditEventHandler.publishEvent(new RootContext(), ACCESS, content);
 
         // then
-        assertThat(promise).succeeded();
+        AssertJPromiseAssert.assertThat(promise).succeeded();
         ResourceResponse resource = promise.getOrThrow();
         assertThat(resource).isNotNull();
         assertThat(resource.getContent().isEqualTo(content.put(FIELD_CONTENT_REVISION, "0"))).isTrue();
@@ -169,7 +170,7 @@ public boolean handleResource(ResourceResponse resource) {
                         return true;
                     }
                 });
-        assertThat(queryPromise).succeeded();
+        AssertJPromiseAssert.assertThat(queryPromise).succeeded();
         queryPromise.getOrThrow();
         assertThat(contentRecords).hasSize(1);
         JsonValue dbContent = contentRecords.get(0);

openidm-authnfilter/src/test/java/org/forgerock/openidm/auth/AuthenticationServiceTest.java

@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS
+ * Portions copyright 2026 3A Systems LLC
  */
 package org.forgerock.openidm.auth;
 
@@ -20,7 +21,6 @@
 import static org.forgerock.json.resource.Requests.newActionRequest;
 import static org.forgerock.json.resource.Requests.newReadRequest;
 import static org.forgerock.openidm.auth.AuthenticationService.Action;
-import static org.forgerock.util.test.assertj.AssertJPromiseAssert.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -47,6 +47,7 @@
 import org.forgerock.services.context.AttributesContext;
 import org.forgerock.services.context.RootContext;
 import org.forgerock.util.promise.Promise;
+import org.forgerock.util.test.assertj.AssertJPromiseAssert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
@@ -244,7 +245,7 @@ public void testLogoutAction() throws Exception {
         AttributesContext context = new AttributesContext(new RootContext());
         Promise<ActionResponse, ResourceException> promise =
                 authenticationService.actionInstance(context, newActionRequest("", Action.logout.name()));
-        assertThat(promise).succeeded();
+        AssertJPromiseAssert.assertThat(promise).succeeded();
         assertThat(promise.get().getJsonContent().get("success").asBoolean()).isTrue();
         assertThat(context.getAttributes()).containsEntry(JwtSessionModule.LOGOUT_SESSION_REQUEST_ATTRIBUTE_NAME, true);
     }

openidm-config/src/test/java/org/forgerock/openidm/config/manage/ConfigObjectServiceTest.java

@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC
  */
 package org.forgerock.openidm.config.manage;
 
@@ -23,7 +24,6 @@
 import static org.forgerock.json.resource.Requests.*;
 import static org.forgerock.json.resource.Responses.newResourceResponse;
 import static org.forgerock.openidm.config.manage.ConfigObjectService.asConfigQueryFilter;
-import static org.forgerock.util.test.assertj.AssertJPromiseAssert.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.*;
@@ -81,6 +81,7 @@
 import org.forgerock.services.context.TransactionIdContext;
 import org.forgerock.util.promise.Promise;
 import org.forgerock.util.query.QueryFilter;
+import org.forgerock.util.test.assertj.AssertJPromiseAssert;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.InvalidSyntaxException;
@@ -367,7 +368,7 @@ public void testPatchSendsClusterEvent() {
 
         // then
         verify(clusterManagementService, times(2)).sendEvent(any(ClusterEvent.class));
-        assertThat(results).isNotNull().succeeded();
+        AssertJPromiseAssert.assertThat(results).isNotNull().succeeded();
     }
 
 

openidm-core/src/test/java/org/forgerock/openidm/sync/impl/SynchronizationServiceTest.java

@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Portions copyright 2015-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC
  */
 
 package org.forgerock.openidm.sync.impl;
@@ -24,7 +25,6 @@
 import static org.forgerock.json.resource.Responses.newQueryResponse;
 import static org.forgerock.json.resource.Responses.newResourceResponse;
 import static org.forgerock.openidm.sync.impl.SynchronizationService.ACTION_PARAM_RESOURCE_NAME;
-import static org.forgerock.util.test.assertj.AssertJPromiseAssert.assertThat;
 import static org.forgerock.json.test.assertj.AssertJJsonValueAssert.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
@@ -53,6 +53,7 @@
 import org.forgerock.json.resource.Connection;
 import org.forgerock.json.resource.CreateRequest;
 import org.forgerock.util.promise.Promise;
+import org.forgerock.util.test.assertj.AssertJPromiseAssert;
 import org.mockito.ArgumentCaptor;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
@@ -155,7 +156,7 @@ public Promise<ResourceResponse, ResourceException> answer(InvocationOnMock invo
         Promise<ActionResponse, ResourceException> promise = synchronizationService.actionInstance(
                 mock(Context.class), actionRequest);
 
-        assertThat(promise).succeeded();
+        AssertJPromiseAssert.assertThat(promise).succeeded();
         JsonValue resource = promise.get().getJsonContent().get(0);
         assertThat(resource).stringAt("resourceName").isEqualTo("system/ldap/account/0123-456789ab-cdef");
         assertThat(resource).hasNull("content");

openidm-external-email/src/test/java/org/forgerock/openidm/external/email/impl/EmailServiceImplTest.java

@@ -12,13 +12,13 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC
  */
 package org.forgerock.openidm.external.email.impl;
 
 import static org.forgerock.json.JsonValue.field;
 import static org.forgerock.json.JsonValue.json;
 import static org.forgerock.json.JsonValue.object;
-import static org.forgerock.util.test.assertj.AssertJPromiseAssert.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doThrow;
@@ -38,6 +38,7 @@
 import org.forgerock.json.resource.Responses;
 import org.forgerock.json.resource.UpdateRequest;
 import org.forgerock.util.promise.Promise;
+import org.forgerock.util.test.assertj.AssertJPromiseAssert;
 import org.testng.annotations.Test;
 
 public class EmailServiceImplTest {
@@ -66,7 +67,7 @@ public void testSuccessfulActionInstance() throws Exception {
         ActionResponse expectedResponse = Responses.newActionResponse(JsonValue.json(object(
                 field(STATUS, OK)
         )));
-        assertThat(promise).succeeded().isInstanceOf(ActionResponse.class).isEqualTo(expectedResponse);
+        AssertJPromiseAssert.assertThat(promise).succeeded().isInstanceOf(ActionResponse.class).isEqualTo(expectedResponse);
     }
 
     @Test
@@ -86,7 +87,7 @@ public void testFailedActionInstance() throws Exception {
                 emailService.actionInstance(mock(Context.class), actionRequest);
 
         // then
-        assertThat(promise).failedWithException().isInstanceOf(BadRequestException.class);
+        AssertJPromiseAssert.assertThat(promise).failedWithException().isInstanceOf(BadRequestException.class);
     }
 
     @Test
@@ -99,7 +100,7 @@ public void testPatchInstanceForbidden() throws Exception {
                 emailService.patchInstance(mock(Context.class), mock(PatchRequest.class));
 
         // then
-        assertThat(promise).failedWithException().isInstanceOf(ForbiddenException.class);
+        AssertJPromiseAssert.assertThat(promise).failedWithException().isInstanceOf(ForbiddenException.class);
     }
 
     @Test
@@ -112,7 +113,7 @@ public void testReadInstanceForbidden() throws Exception {
                 emailService.readInstance(mock(Context.class), mock(ReadRequest.class));
 
         // then
-        assertThat(promise).failedWithException().isInstanceOf(ForbiddenException.class);
+        AssertJPromiseAssert.assertThat(promise).failedWithException().isInstanceOf(ForbiddenException.class);
     }
 
     @Test
@@ -125,6 +126,6 @@ public void testUpdateInstanceForbidden() throws Exception {
                 emailService.updateInstance(mock(Context.class), mock(UpdateRequest.class));
 
         // then
-        assertThat(promise).failedWithException().isInstanceOf(ForbiddenException.class);
+        AssertJPromiseAssert.assertThat(promise).failedWithException().isInstanceOf(ForbiddenException.class);
     }
 }

openidm-external-rest/src/test/java/org/forgerock/openidm/external/rest/RestServiceTest.java

@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC
  */
 
 package org.forgerock.openidm.external.rest;
@@ -23,7 +24,6 @@
 import static org.forgerock.json.resource.test.assertj.AssertJResourceExceptionAssert.assertThat;
 import static org.forgerock.openidm.external.rest.RestService.*;
 import static org.forgerock.util.promise.Promises.newResultPromise;
-import static org.forgerock.util.test.assertj.AssertJPromiseAssert.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -49,6 +49,7 @@
 import org.forgerock.services.context.Context;
 import org.forgerock.util.promise.NeverThrowsException;
 import org.forgerock.util.promise.Promise;
+import org.forgerock.util.test.assertj.AssertJPromiseAssert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
@@ -195,7 +196,7 @@ public void testCallAction(final ClientRequestParams clientRequestParams, final
 
         // then
         if (expectedCode != null) {
-            assertThat(result).failedWithException();
+            AssertJPromiseAssert.assertThat(result).failedWithException();
             try {
                 result.getOrThrow();
                 fail();

openidm-identity-provider/src/test/java/org/forgerock/openidm/idp/impl/IdentityProviderServiceTest.java

@@ -12,13 +12,13 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS
+ * Portions copyright 2026 3A Systems LLC
  */
 package org.forgerock.openidm.idp.impl;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.forgerock.json.JsonValue.*;
 import static org.forgerock.json.resource.Requests.newReadRequest;
-import static org.forgerock.util.test.assertj.AssertJPromiseAssert.assertThat;
 import static org.forgerock.json.test.assertj.AssertJJsonValueAssert.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -31,6 +31,7 @@
 import org.forgerock.openidm.idp.config.ProviderConfig;
 import org.forgerock.services.context.RootContext;
 import org.forgerock.util.promise.Promise;
+import org.forgerock.util.test.assertj.AssertJPromiseAssert;
 import org.testng.annotations.BeforeSuite;
 import org.testng.annotations.Test;
 
@@ -87,7 +88,7 @@ public void testReadInstance() throws Exception {
 
         final Promise<ResourceResponse, ResourceException> promise =
                 service.readInstance(new RootContext(), newReadRequest(""));
-        assertThat(promise).succeeded();
+        AssertJPromiseAssert.assertThat(promise).succeeded();
         final JsonValue response = promise.get().getContent();
 
         assertThat(response).hasArray("providers").hasSize(1);

openidm-maintenance/src/test/java/org/forgerock/openidm/maintenance/impl/MaintenanceFilterTest.java

@@ -12,14 +12,14 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC
  */
 package org.forgerock.openidm.maintenance.impl;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.forgerock.json.JsonValue.*;
 import static org.forgerock.json.resource.Requests.newCreateRequest;
 import static org.forgerock.json.resource.Requests.newReadRequest;
-import static org.forgerock.util.test.assertj.AssertJPromiseAssert.assertThat;
 
 import org.forgerock.json.JsonValue;
 import org.forgerock.json.resource.CreateRequest;
@@ -31,6 +31,7 @@
 import org.forgerock.services.context.Context;
 import org.forgerock.services.context.RootContext;
 import org.forgerock.util.promise.Promise;
+import org.forgerock.util.test.assertj.AssertJPromiseAssert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
@@ -93,10 +94,10 @@ public void testFitlerCreate(boolean maintenanceEnabled, String resourcePath, Co
         final CreateRequest request = newCreateRequest(resourcePath, object);
         final Promise<ResourceResponse, ResourceException> promise = filter.filterCreate(context, request, handler);
         if (passRequest) {
-            assertThat(promise).succeeded();
+            AssertJPromiseAssert.assertThat(promise).succeeded();
             assertThat(handler.getRequests()).containsExactly(request);
         } else {
-            assertThat(promise).failedWithException().isInstanceOf(ServiceUnavailableException.class);
+            AssertJPromiseAssert.assertThat(promise).failedWithException().isInstanceOf(ServiceUnavailableException.class);
             assertThat(handler.getRequests()).isEmpty();
         }
     }
@@ -127,7 +128,7 @@ public void testFilterRead(String resourcePath) throws Exception {
         // first create an object
         final CreateRequest create = newCreateRequest(resourcePath, "1", object);
         Promise<ResourceResponse, ResourceException> promise = filter.filterCreate(root, create, handler);
-        assertThat(promise).succeeded();
+        AssertJPromiseAssert.assertThat(promise).succeeded();
         assertThat(handler.getRequests()).containsExactly(create);
 
         handler.addResource(promise.get());
@@ -136,7 +137,7 @@ public void testFilterRead(String resourcePath) throws Exception {
         // perform the read
         final ReadRequest request = newReadRequest(resourcePath, "1");
         promise = filter.filterRead(root, request, handler);
-        assertThat(promise).succeeded();
+        AssertJPromiseAssert.assertThat(promise).succeeded();
         assertThat(handler.getRequests()).containsExactly(create, request);
     }
 }