From e11a28d5559e4c1e011b7435d4e0ee9666dd0288 Mon Sep 17 00:00:00 2001
From: Arvind Krishnakumar
 <61501885+arvindkrishnakumar-okta@users.noreply.github.com>
Date: Fri, 28 Jun 2024 09:53:29 -0500
Subject: [PATCH] Bump Java Parent to 32 and few misc dep upgrades (#1520)

* Bump Java Parent to 32 and few misc dep upgrades

* fixed pmd error
---
 .../java/com/okta/sdk/client/AuthorizationMode.java    |  2 +-
 .../src/main/java/quickstart/ReadmeSnippets.java       |  2 +-
 .../okta/sdk/impl/config/DefaultPropertiesParser.java  |  6 ++++--
 .../java/com/okta/sdk/impl/oauth2/DPoPInterceptor.java |  2 ++
 pom.xml                                                | 10 +++++-----
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/api/src/main/java/com/okta/sdk/client/AuthorizationMode.java b/api/src/main/java/com/okta/sdk/client/AuthorizationMode.java
index f4914778e53..a0adb5eef52 100644
--- a/api/src/main/java/com/okta/sdk/client/AuthorizationMode.java
+++ b/api/src/main/java/com/okta/sdk/client/AuthorizationMode.java
@@ -33,7 +33,7 @@ public enum AuthorizationMode {
     private static final Map<AuthenticationScheme, AuthorizationMode> lookup = new HashMap<>();
 
     static {
-        for (AuthorizationMode authorizationMode : AuthorizationMode.values()) {
+        for (AuthorizationMode authorizationMode : values()) {
             lookup.put(authorizationMode.getAuthenticationScheme(), authorizationMode);
         }
     }
diff --git a/examples/quickstart/src/main/java/quickstart/ReadmeSnippets.java b/examples/quickstart/src/main/java/quickstart/ReadmeSnippets.java
index 0a61c3db177..d2ee38e6e99 100644
--- a/examples/quickstart/src/main/java/quickstart/ReadmeSnippets.java
+++ b/examples/quickstart/src/main/java/quickstart/ReadmeSnippets.java
@@ -52,7 +52,7 @@ public class ReadmeSnippets {
     private static final Logger log = LoggerFactory.getLogger(ReadmeSnippets.class);
 
     private final ApiClient client = Clients.builder().build();
-    private final User user = null;
+    private static final User user = null;
 
     private void createClient() {
         ApiClient client = Clients.builder()
diff --git a/impl/src/main/java/com/okta/sdk/impl/config/DefaultPropertiesParser.java b/impl/src/main/java/com/okta/sdk/impl/config/DefaultPropertiesParser.java
index 8a01326fb9a..6c9d1a9797e 100644
--- a/impl/src/main/java/com/okta/sdk/impl/config/DefaultPropertiesParser.java
+++ b/impl/src/main/java/com/okta/sdk/impl/config/DefaultPropertiesParser.java
@@ -45,8 +45,10 @@ public Map<String, String> parse(String source) {
 
     @Override
     public Map<String, String> parse(Resource resource) throws IOException {
-        InputStream is = resource.getInputStream();
-        Scanner scanner = new Scanner(is, StandardCharsets.UTF_8.name());
+        Scanner scanner;
+        try (InputStream inputStream = resource.getInputStream()) {
+            scanner = new Scanner(inputStream, StandardCharsets.UTF_8.name());
+        }
         return parse(scanner);
     }
 
diff --git a/impl/src/main/java/com/okta/sdk/impl/oauth2/DPoPInterceptor.java b/impl/src/main/java/com/okta/sdk/impl/oauth2/DPoPInterceptor.java
index c3bdda93247..a42068eabea 100644
--- a/impl/src/main/java/com/okta/sdk/impl/oauth2/DPoPInterceptor.java
+++ b/impl/src/main/java/com/okta/sdk/impl/oauth2/DPoPInterceptor.java
@@ -159,6 +159,8 @@ private DPopHandshakeState handleHandshakeResponse(JsonNode errorField, Header n
                     this.nonceValidUntil = Instant.now().plusSeconds(NONCE_VALID_SECONDS);
                     return DPopHandshakeState.FIRST_USE_DPOP_NONCE;
                 }
+                default:
+                    return DPopHandshakeState.UNEXPECTED_STATE;
             }
         }
         return DPopHandshakeState.UNEXPECTED_STATE;
diff --git a/pom.xml b/pom.xml
index 823db02f72a..bbf28dc726f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.okta</groupId>
         <artifactId>okta-parent</artifactId>
-        <version>30</version>
+        <version>32</version>
     </parent>
 
     <groupId>com.okta.sdk</groupId>
@@ -34,13 +34,13 @@
     <inceptionYear>2017</inceptionYear>
 
     <properties>
-        <jackson.version>2.17.0</jackson.version>
+        <jackson.version>2.17.1</jackson.version>
         <snakeyaml.version>2.2</snakeyaml.version>
-        <bouncycastle.version>1.78</bouncycastle.version>
-        <jjwt.version>0.12.5</jjwt.version>
+        <bouncycastle.version>1.78.1</bouncycastle.version>
+        <jjwt.version>0.12.6</jjwt.version>
         <org.apache.httpcomponents.client5.version>5.3.1</org.apache.httpcomponents.client5.version>
         <okta.sdk.previousVersion>17.0.0</okta.sdk.previousVersion>
-        <okta.commons.version>1.3.5</okta.commons.version>
+        <okta.commons.version>1.3.6</okta.commons.version>
         <com.google.auto.service.version>1.1.1</com.google.auto.service.version>
         <github.slug>okta/okta-sdk-java</github.slug>
     </properties>