castle · sebastiansimson · Aug 28, 2023 · Aug 29, 2023
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,12 +1,16 @@
-version: 2 # use CircleCI 2.0
-jobs: # a collection of steps
-  build: # runs not using Workflows must have a `build` job as entry point
+# Java Maven CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-java/ for more details
+#
+version: 2
+jobs:
+  build:
+    docker:
+      # specify the version you desire here
+      - image: cimg/openjdk:17.0.8-browsers
 
     working_directory: ~/castle-java-example # directory where steps will run
 
-    docker: # run the steps with Docker
-      - image: circleci/openjdk:8-jdk-browsers # ...with this image as the primary container; this is where all `steps` will run
-
     steps: # a collection of executable commands
 
       - checkout # check out source code to working directory

diff --git a/logback.xml b/logback.xml
@@ -0,0 +1,16 @@
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+    <root level="debug">
+        <appender-ref ref="STDOUT" />
+    </root>
+    <root level="error">
+        <appender-ref ref="STDOUT" />
+    </root>
+    <root level="all">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
diff --git a/pom.xml b/pom.xml
@@ -4,30 +4,35 @@
     <groupId>io.castle.example</groupId>
     <artifactId>castle-example</artifactId>
     <packaging>war</packaging>
-    <version>1.4.0</version>
+    <version>1.6</version>
     <name>Castle Java JDK Example</name>
     <url>https://github.com/castle/castle-java-example</url>
     <dependencies>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.12</version>
+            <version>1.7.36</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.2.3</version>
+            <version>1.4.11</version>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>3.0.1</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>6.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.castle</groupId>
             <artifactId>castle-java</artifactId>
-            <version>1.4.0</version>
+            <version>2.3.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>32.1.2-jre</version>
         </dependency>
     </dependencies>
 
@@ -37,8 +42,12 @@
             <plugin>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
-                <version>9.4.6.v20170531</version>
+                <version>11.0.15</version>
             </plugin>
         </plugins>
     </build>
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+    </properties>
 </project>
diff --git a/src/main/java/io/castle/example/ChallengeServlet.java b/src/main/java/io/castle/example/ChallengeServlet.java
@@ -4,9 +4,9 @@
 import io.castle.client.api.CastleApi;
 import io.castle.example.model.TestUser;
 
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.*;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.*;
 import java.io.IOException;
 
 

diff --git a/src/main/java/io/castle/example/EmailChangeRequestServlet.java b/src/main/java/io/castle/example/EmailChangeRequestServlet.java
@@ -4,12 +4,12 @@
 import io.castle.client.api.CastleApi;
 import io.castle.example.model.TestUser;
 
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 import java.io.IOException;
 
 

diff --git a/src/main/java/io/castle/example/EmailChangeServlet.java b/src/main/java/io/castle/example/EmailChangeServlet.java
@@ -5,12 +5,12 @@
 import io.castle.example.model.TestUser;
 import io.castle.example.model.UserAuthenticationBackend;
 
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 import java.io.IOException;
 
 

diff --git a/src/main/java/io/castle/example/LoginServlet.java b/src/main/java/io/castle/example/LoginServlet.java
@@ -7,12 +7,12 @@
 import io.castle.example.model.TestUser;
 import io.castle.example.model.UserAuthenticationBackend;
 
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 
 import com.google.common.collect.ImmutableMap;
 

diff --git a/src/main/java/io/castle/example/LogoutServlet.java b/src/main/java/io/castle/example/LogoutServlet.java
@@ -4,12 +4,12 @@
 import io.castle.client.api.CastleApi;
 import io.castle.example.model.TestUser;
 
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 
 import com.google.common.collect.ImmutableMap;
 

diff --git a/src/main/java/io/castle/example/PasswordChangeServlet.java b/src/main/java/io/castle/example/PasswordChangeServlet.java
@@ -5,12 +5,12 @@
 import io.castle.example.model.TestUser;
 import io.castle.example.model.UserAuthenticationBackend;
 
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 import java.io.IOException;
 
 

diff --git a/src/main/java/io/castle/example/PasswordResetRequiredServlet.java b/src/main/java/io/castle/example/PasswordResetRequiredServlet.java
@@ -5,12 +5,12 @@
 import io.castle.example.model.TestUser;
 import io.castle.example.model.UserAuthenticationBackend;
 
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 
 import com.google.common.collect.ImmutableMap;
 

diff --git a/src/main/java/io/castle/example/PasswordResetServlet.java b/src/main/java/io/castle/example/PasswordResetServlet.java
@@ -5,12 +5,12 @@
 import io.castle.example.model.TestUser;
 import io.castle.example.model.UserAuthenticationBackend;
 
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 import java.io.IOException;
 
 

diff --git a/src/main/java/io/castle/example/SetupListener.java b/src/main/java/io/castle/example/SetupListener.java
@@ -1,10 +1,14 @@
 package io.castle.example;
 
 import io.castle.client.Castle;
+import io.castle.client.internal.backend.CastleBackendProvider;
+import io.castle.client.model.AuthenticateAction;
+import io.castle.client.model.AuthenticateFailoverStrategy;
 import io.castle.client.model.CastleSdkConfigurationException;
 
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+import java.util.Arrays;
 
 public class SetupListener implements ServletContextListener {
 
@@ -17,9 +21,22 @@ public class SetupListener implements ServletContextListener {
     public void contextInitialized(ServletContextEvent sce) {
         try {
             Castle castle = Castle.verifySdkConfigurationAndInitialize();
+
+            /*Castle castle = Castle.initialize(Castle.configurationBuilder()
+                    .apiSecret("abcd")
+                    .withAllowListHeaders("User-Agent", "Accept-Language", "Accept-Encoding")
+                    .withDenyListHeaders("Cookie")
+                    .withTimeout(500)
+                    .withBackendProvider(CastleBackendProvider.OKHTTP)
+                    .withAuthenticateFailoverStrategy(new AuthenticateFailoverStrategy(AuthenticateAction.ALLOW))
+                    .withApiBaseUrl("https://api.castle.io/")
+                    .withLogHttpRequests(true)
+                    .ipHeaders(Arrays.asList("X-Forwarded-For", "CF-Connecting-IP"))
+                    .build());*/
+
             Castle.setSingletonInstance(castle);
         } catch (CastleSdkConfigurationException e) {
-            //The sdk configuration is incorrect. We recommend to shutdown the application by throwing a runtime exception
+            //The sdk configuration is incorrect. We recommend to shut down the application by throwing a runtime exception
             throw new IllegalStateException("The Castle SDK configuration is not correct", e);
         }
     }

diff --git a/src/main/resources/castle_sdk.properties b/src/main/resources/castle_sdk.properties
@@ -3,3 +3,9 @@
 black_list=Cookie,Connection
 log_http=true
 # The rest of the setting will use default values, when there are some.
+app_id=566492732398746
+api_secret=dnpKLkR1Xjd4wjhPxBEqshzz9be9F8wg
+timeout=10000
+backend_provider=OKHTTP
+failover_strategy=CHALLENGE
+base_url=https://api.castle.io/v1/