From 26f36d650d6c7a2a50efdffcb23ada287e088e7d Mon Sep 17 00:00:00 2001
From: Alexander Reelsen <alexander@reelsen.net>
Date: Thu, 20 Jul 2023 18:03:15 +0200
Subject: [PATCH] Take care of review comments

---
 .../java/org/pac4j/javalin/CallbackHandler.java    | 14 ++++----------
 src/main/java/org/pac4j/javalin/LogoutHandler.java | 14 ++++----------
 .../java/org/pac4j/javalin/SecurityHandler.java    | 12 +++---------
 3 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/src/main/java/org/pac4j/javalin/CallbackHandler.java b/src/main/java/org/pac4j/javalin/CallbackHandler.java
index 7139101..d3827f6 100644
--- a/src/main/java/org/pac4j/javalin/CallbackHandler.java
+++ b/src/main/java/org/pac4j/javalin/CallbackHandler.java
@@ -3,9 +3,8 @@
 import io.javalin.http.Context;
 import io.javalin.http.Handler;
 import org.jetbrains.annotations.NotNull;
+import org.pac4j.core.adapter.FrameworkAdapter;
 import org.pac4j.core.config.Config;
-import org.pac4j.core.engine.CallbackLogic;
-import org.pac4j.core.engine.DefaultCallbackLogic;
 import org.pac4j.jee.context.JEEFrameworkParameters;
 
 import static org.pac4j.core.util.CommonHelper.assertNotNull;
@@ -32,14 +31,9 @@ public CallbackHandler(Config config, String defaultUrl, Boolean renewSession) {
 
     @Override
     public void handle(@NotNull Context javalinCtx) {
-        final CallbackLogic callbackLogic;
-        if (config.getCallbackLogic() != null) {
-            callbackLogic = config.getCallbackLogic();
-        } else {
-            callbackLogic = DefaultCallbackLogic.INSTANCE;
-        }
-
-        callbackLogic.perform(
+        FrameworkAdapter.INSTANCE.applyDefaultSettingsIfUndefined(config);
+
+        config.getCallbackLogic().perform(
                 this.config,
                 this.defaultUrl,
                 this.renewSession,
diff --git a/src/main/java/org/pac4j/javalin/LogoutHandler.java b/src/main/java/org/pac4j/javalin/LogoutHandler.java
index c83e3d4..dcd1ec9 100644
--- a/src/main/java/org/pac4j/javalin/LogoutHandler.java
+++ b/src/main/java/org/pac4j/javalin/LogoutHandler.java
@@ -3,9 +3,8 @@
 import io.javalin.http.Context;
 import io.javalin.http.Handler;
 import org.jetbrains.annotations.NotNull;
+import org.pac4j.core.adapter.FrameworkAdapter;
 import org.pac4j.core.config.Config;
-import org.pac4j.core.engine.DefaultLogoutLogic;
-import org.pac4j.core.engine.LogoutLogic;
 import org.pac4j.jee.context.JEEFrameworkParameters;
 
 import static org.pac4j.core.util.CommonHelper.assertNotNull;
@@ -35,14 +34,9 @@ public LogoutHandler(Config config, String defaultUrl, String logoutUrlPattern)
 
     @Override
     public void handle(@NotNull Context javalinCtx) {
-        final LogoutLogic logoutLogic;
-        if (config.getLogoutLogic() == null) {
-            logoutLogic = DefaultLogoutLogic.INSTANCE;
-        } else {
-            logoutLogic = config.getLogoutLogic();
-        }
-
-        logoutLogic.perform(
+        FrameworkAdapter.INSTANCE.applyDefaultSettingsIfUndefined(config);
+
+        config.getLogoutLogic().perform(
             this.config,
             this.defaultUrl,
             this.logoutUrlPattern,
diff --git a/src/main/java/org/pac4j/javalin/SecurityHandler.java b/src/main/java/org/pac4j/javalin/SecurityHandler.java
index 8e8b722..b2a883d 100644
--- a/src/main/java/org/pac4j/javalin/SecurityHandler.java
+++ b/src/main/java/org/pac4j/javalin/SecurityHandler.java
@@ -4,9 +4,8 @@
 import io.javalin.http.Handler;
 import io.javalin.http.servlet.JavalinServletContext;
 import org.jetbrains.annotations.NotNull;
+import org.pac4j.core.adapter.FrameworkAdapter;
 import org.pac4j.core.config.Config;
-import org.pac4j.core.engine.DefaultSecurityLogic;
-import org.pac4j.core.engine.SecurityLogic;
 import org.pac4j.jee.context.JEEFrameworkParameters;
 
 import static org.pac4j.core.util.CommonHelper.assertNotNull;
@@ -37,14 +36,9 @@ public SecurityHandler(Config config, String clients, String authorizers, String
 
     @Override
     public void handle(@NotNull Context javalinCtx) {
-        final SecurityLogic securityLogic;
-        if (config.getSecurityLogic() == null) {
-            securityLogic = DefaultSecurityLogic.INSTANCE;
-        } else {
-            securityLogic = config.getSecurityLogic();
-        }
+        FrameworkAdapter.INSTANCE.applyDefaultSettingsIfUndefined(config);
 
-        Object result = securityLogic.perform(
+        Object result = config.getSecurityLogic().perform(
             this.config,
             (ctx, store, profiles) -> AUTH_GRANTED,
             this.clients,