fixes

Author: leleuj

src/main/java/org/pac4j/framework/adapter/FrameworkAdapterImpl.java

@@ -0,0 +1,35 @@
+package org.pac4j.framework.adapter;
+
+import lombok.val;
+import org.pac4j.core.adapter.DefaultFrameworkAdapter;
+import org.pac4j.core.config.Config;
+import org.pac4j.core.exception.TechnicalException;
+import org.pac4j.core.util.CommonHelper;
+import org.pac4j.vertx.VertxFrameworkParameters;
+import org.pac4j.vertx.VertxWebContext;
+import org.pac4j.vertx.context.session.VertxSessionStore;
+import org.pac4j.vertx.http.VertxHttpActionAdapter;
+
+/**
+ * Specific config startup for Vert.x.
+ *
+ * @author Jerome LELEU
+ * @since 7.0.0
+ */
+public class FrameworkAdapterImpl extends DefaultFrameworkAdapter {
+
+    @Override
+    public void applyDefaultSettingsIfUndefined(final Config config) {
+        CommonHelper.assertNotNull("config", config);
+
+        config.setWebContextFactoryIfUndefined(fp -> new VertxWebContext( ((VertxFrameworkParameters)fp).routingContext() ));
+        config.setHttpActionAdapterIfUndefined(VertxHttpActionAdapter.INSTANCE);
+
+        super.applyDefaultSettingsIfUndefined(config);
+    }
+
+    @Override
+    public String toString() {
+        return "Vert.x";
+    }
+}

src/main/java/org/pac4j/vertx/VertxWebContext.java

@@ -35,13 +35,11 @@ public class VertxWebContext implements WebContext {
     private final JsonObject headers;
     private final JsonObject parameters;
     private final Map<String, String[]> mapParameters;
-    private final SessionStore sessionStore;
 
-    public VertxWebContext(final RoutingContext routingContext, final SessionStore sessionStore) {
+    public VertxWebContext(final RoutingContext routingContext) {
         final HttpServerRequest request = routingContext.request();
         this.routingContext = routingContext;
         this.method = request.method().toString();
-        this.sessionStore = sessionStore;
 
         this.fullUrl = request.absoluteURI();
         URI uri;

src/main/java/org/pac4j/vertx/handler/impl/CallbackHandler.java

@@ -3,6 +3,7 @@
 import io.vertx.core.Handler;
 import io.vertx.core.Vertx;
 import io.vertx.ext.web.RoutingContext;
+import lombok.val;
 import org.pac4j.core.config.Config;
 import org.pac4j.core.context.session.SessionStore;
 import org.pac4j.core.engine.CallbackLogic;
@@ -46,8 +47,7 @@ public CallbackHandler(final Vertx vertx,
 
     @Override
     public void handle(final RoutingContext rc) {
-        final CallbackLogic callbackLogic =
-                (config.getCallbackLogic() != null) ? config.getCallbackLogic() : DefaultCallbackLogic.INSTANCE;
+        val callbackLogic = config.getCallbackLogic();
 
         vertx.<Void>executeBlocking(() -> {
                             callbackLogic.perform(

src/main/java/org/pac4j/vertx/handler/impl/LogoutHandler.java

@@ -4,6 +4,7 @@
 import io.vertx.core.Vertx;
 import io.vertx.ext.web.RoutingContext;
 
+import lombok.val;
 import org.pac4j.core.config.Config;
 import org.pac4j.core.context.session.SessionStore;
 import org.pac4j.core.engine.DefaultLogoutLogic;
@@ -58,8 +59,7 @@ public LogoutHandler(final Vertx vertx,
 
     @Override
     public void handle(final RoutingContext rc) {
-        final LogoutLogic logoutLogic =
-                (config.getCallbackLogic() != null) ? config.getLogoutLogic() : DefaultLogoutLogic.INSTANCE;
+        val logoutLogic = config.getLogoutLogic();
 
         vertx.<Void>executeBlocking(() -> {
             logoutLogic.perform(

src/main/java/org/pac4j/vertx/handler/impl/SecurityHandler.java

@@ -4,6 +4,7 @@
 import io.vertx.ext.web.RoutingContext;
 import io.vertx.ext.web.handler.AuthenticationHandler;
 import io.vertx.ext.web.impl.UserContextInternal;
+import lombok.val;
 import org.pac4j.core.config.Config;
 import org.pac4j.core.context.WebContext;
 import org.pac4j.core.engine.*;
@@ -38,8 +39,7 @@ public SecurityHandler(final Vertx vertx,
 
     @Override
     public void handle(final RoutingContext ctx) {
-        final SecurityLogic securityLogic =
-                (config.getSecurityLogic() != null) ? config.getSecurityLogic() : DefaultSecurityLogic.INSTANCE;
+        val securityLogic = config.getSecurityLogic();
 
         final SecurityGrantedAccessAdapter granted = (context, store, profiles) -> {
             final Pac4jUser user = new Pac4jUser(profiles);