build(pom) Update Vert.x to 3.4.0
MODIFY
gateway/engine/vertx-polling/src/main/java/io/apiman/gateway/engine/vertx/polling/fetchers/auth/Authenticator.java
gateway/engine/vertx-polling/src/main/java/io/apiman/gateway/engine/vertx/polling/fetchers/auth/Authenticator.java
package io.apiman.gateway.engine.vertx.polling.fetchers.auth;
-import io.vertx.core.AsyncResultHandler;
+import io.vertx.core.AsyncResult;
+import io.vertx.core.Handler;
import io.vertx.core.MultiMap;
import io.vertx.core.Vertx;
@@ -40,5 +41,5 @@ public interface Authenticator {
* @param resultHandler invoked with result of the authentication.
* @return fluent
*/
- Authenticator authenticate(Vertx vertx, Map<String, String> config, MultiMap headerMap, AsyncResultHandler<Void> resultHandler);
+ Authenticator authenticate(Vertx vertx, Map<String, String> config, MultiMap headerMap, Handler<AsyncResult<Void>> resultHandler);
}
\ No newline at end of file

MODIFY
gateway/engine/vertx-polling/src/main/java/io/apiman/gateway/engine/vertx/polling/fetchers/auth/BasicAuth.java
gateway/engine/vertx-polling/src/main/java/io/apiman/gateway/engine/vertx/polling/fetchers/auth/BasicAuth.java
package io.apiman.gateway.engine.vertx.polling.fetchers.auth;
import io.apiman.common.util.Basic;
-import io.vertx.core.AsyncResultHandler;
+import io.vertx.core.AsyncResult;
import io.vertx.core.Future;
+import io.vertx.core.Handler;
import io.vertx.core.MultiMap;
import io.vertx.core.Vertx;
@@ -39,7 +40,7 @@ public final class BasicAuth implements Authenticator {
}
@Override
- public Authenticator authenticate(Vertx vertx, Map<String, String> config, MultiMap headerMap, AsyncResultHandler<Void> resultHandler) {
+ public Authenticator authenticate(Vertx vertx, Map<String, String> config, MultiMap headerMap, Handler<AsyncResult<Void>> resultHandler) {
headerMap.set("Authorization", Basic.encode(config.get("username"), config.get("password")));
resultHandler.handle(Future.succeededFuture());
return this;

MODIFY
gateway/engine/vertx-polling/src/main/java/io/apiman/gateway/engine/vertx/polling/fetchers/auth/KeycloakOAuth2Client.java
gateway/engine/vertx-polling/src/main/java/io/apiman/gateway/engine/vertx/polling/fetchers/auth/KeycloakOAuth2Client.java
package io.apiman.gateway.engine.vertx.polling.fetchers.auth;
-import io.vertx.core.AsyncResultHandler;
+import io.vertx.core.AsyncResult;
import io.vertx.core.Future;
+import io.vertx.core.Handler;
import io.vertx.core.MultiMap;
import io.vertx.core.Vertx;
import io.vertx.core.json.JsonObject;
@@ -48,7 +49,7 @@ public class KeycloakOAuth2Client extends AbstractOAuth2Base implements Authenti
}
@Override
- public Authenticator authenticate(Vertx vertx, Map<String, String> config, MultiMap headerMap, AsyncResultHandler<Void> resultHandler) {
+ public Authenticator authenticate(Vertx vertx, Map<String, String> config, MultiMap headerMap, Handler<AsyncResult<Void>> resultHandler) {
OAuth2FlowType flowType = getFlowType(config.get("flowType"));
JsonObject params = new JsonObject();

MODIFY
gateway/engine/vertx-polling/src/main/java/io/apiman/gateway/engine/vertx/polling/fetchers/auth/NoneAuth.java
gateway/engine/vertx-polling/src/main/java/io/apiman/gateway/engine/vertx/polling/fetchers/auth/NoneAuth.java
package io.apiman.gateway.engine.vertx.polling.fetchers.auth;
-import io.vertx.core.AsyncResultHandler;
+import io.vertx.core.AsyncResult;
import io.vertx.core.Future;
+import io.vertx.core.Handler;
import io.vertx.core.MultiMap;
import io.vertx.core.Vertx;
@@ -34,7 +35,7 @@ public class NoneAuth implements Authenticator {
}
@Override
- public Authenticator authenticate(Vertx vertx, Map<String, String> config, MultiMap headerMap, AsyncResultHandler<Void> resultHandler) {
+ public Authenticator authenticate(Vertx vertx, Map<String, String> config, MultiMap headerMap, Handler<AsyncResult<Void>> resultHandler) {
resultHandler.handle(Future.succeededFuture());
return this;
}

MODIFY
gateway/engine/vertx-polling/src/main/java/io/apiman/gateway/engine/vertx/polling/fetchers/auth/OAuth2Client.java
gateway/engine/vertx-polling/src/main/java/io/apiman/gateway/engine/vertx/polling/fetchers/auth/OAuth2Client.java
package io.apiman.gateway.engine.vertx.polling.fetchers.auth;
-import io.vertx.core.AsyncResultHandler;
+import io.vertx.core.AsyncResult;
import io.vertx.core.Future;
+import io.vertx.core.Handler;
import io.vertx.core.MultiMap;
import io.vertx.core.Vertx;
import io.vertx.core.json.JsonObject;
@@ -52,7 +53,7 @@ public class OAuth2Client extends AbstractOAuth2Base implements Authenticator {
}
@Override
- public Authenticator authenticate(Vertx vertx, Map<String, String> config, MultiMap headerMap, AsyncResultHandler<Void> resultHandler) {
+ public Authenticator authenticate(Vertx vertx, Map<String, String> config, MultiMap headerMap, Handler<AsyncResult<Void>> resultHandler) {
OAuth2ClientOptions credentials = new OAuth2ClientOptions(mapToJson(config));
if (config.get("oauthUri") != null) {
credentials.setSite(config.get("oauthUri"));

MODIFY
pom.xml
pom.xml
<version.io.netty>4.1.8.Final</version.io.netty>
<version.io.swagger>1.5.7</version.io.swagger>
<version.xmlunit>1.6</version.xmlunit>
- <version.io.vertx>3.4.0.Beta1</version.io.vertx>
+ <version.io.vertx>3.4.0</version.io.vertx>
<version.net.openhft>0.6</version.net.openhft>
<version.com.ibm.icu4j>57.1</version.com.ibm.icu4j>
<version.com.hazelcast>3.6.4</version.com.hazelcast>

build(pom) Update Vert.x to 3.4.0