From 2e2e3e48ae5e314849bda4e35838062c5de0d4c3 Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <yannick.lecaillez@forgerock.com>
Date: Fri, 29 Apr 2016 12:40:45 +0000
Subject: [PATCH] Switch to commons-bom 20.0.0-SNAPSHOT (monorepo)
---
opendj-bom/pom.xml | 4 ++--
opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseWrapper.java | 28 ++++++++++++++++++++++++++++
2 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/opendj-bom/pom.xml b/opendj-bom/pom.xml
index fecfc78..0adde1d 100644
--- a/opendj-bom/pom.xml
+++ b/opendj-bom/pom.xml
@@ -44,8 +44,8 @@
<!-- ForgeRock BOM -->
<dependency>
<groupId>org.forgerock.commons</groupId>
- <artifactId>forgerock-bom</artifactId>
- <version>4.1.1</version>
+ <artifactId>commons-bom</artifactId>
+ <version>20.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseWrapper.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseWrapper.java
index 43eaead..8605871 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseWrapper.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseWrapper.java
@@ -141,6 +141,14 @@
}
@Override
+ // @Checkstyle:ignore
+ public <VOUT, EOUT extends Exception> Promise<VOUT, EOUT> then(Function<? super R, VOUT, EOUT> onResult,
+ Function<? super LdapException, VOUT, EOUT> onException,
+ Function<? super RuntimeException, VOUT, EOUT> onRuntimeException) {
+ return wrappedPromise.then(onResult, onException, onRuntimeException);
+ }
+
+ @Override
public LdapPromise<R> thenOnResultOrException(ResultHandler<? super R> onResult,
ExceptionHandler<? super LdapException> onException) {
wrappedPromise.thenOnResultOrException(onResult, onException);
@@ -169,11 +177,31 @@
@Override
// @Checkstyle:ignore
+ public <VOUT, EOUT extends Exception> Promise<VOUT, EOUT> thenAsync(AsyncFunction<? super R, VOUT, EOUT> onResult,
+ AsyncFunction<? super LdapException, VOUT, EOUT> onException,
+ AsyncFunction<? super RuntimeException, VOUT, EOUT> onRuntimeException) {
+ return wrappedPromise.thenAsync(onResult, onException, onRuntimeException);
+ }
+
+ @Override
+ // @Checkstyle:ignore
public <EOUT extends Exception> Promise<R, EOUT> thenCatch(Function<? super LdapException, R, EOUT> onException) {
return wrappedPromise.thenCatch(onException);
}
@Override
+ public Promise<R, LdapException> thenCatchRuntimeException(
+ Function<? super RuntimeException, R, LdapException> onRuntimeException) {
+ return wrappedPromise.thenCatchRuntimeException(onRuntimeException);
+ }
+
+ @Override
+ public Promise<R, LdapException> thenCatchRuntimeExceptionAsync(
+ AsyncFunction<? super RuntimeException, R, LdapException> onRuntimeException) {
+ return wrappedPromise.thenCatchRuntimeExceptionAsync(onRuntimeException);
+ }
+
+ @Override
public LdapPromise<R> thenFinally(Runnable onResultOrException) {
wrappedPromise.thenFinally(onResultOrException);
return this;
--
Gitblit v1.10.0