Merge branch 'master' into rl-OKTA-789927

Author: arvindkrishnakumar-okta

.circleci/config.yml

@@ -11,38 +11,38 @@ aliases:
     - run: ./mvnw clean install -Pci
 
 jobs:
-  
-  jdk8:
-    docker:
-      - image: cimg/openjdk:8.0.322
-    environment:
-        JVM_OPTS: -Xmx3200m
-    steps: *build_steps
-  
-  jdk11:
-    docker:
-      - image: cimg/openjdk:11.0.13
-    environment:
-        JVM_OPTS: -Xmx3200m
-    steps: *build_steps
-          
+
   jdk17:
     docker:
-      - image: cimg/openjdk:17.0.4
+      - image: cimg/openjdk:17.0.11
     environment:
         JVM_OPTS: -Xmx3200m
     steps: *build_steps
 
+  snyk-scan:
+    docker:
+      - image: cimg/openjdk:17.0.11
+    steps:
+      - checkout
+      - run: ./mvnw clean install -Pci -Dlicense.skip=true -Dmaven.test.skip.exec=true
+      - general-platform-helpers/step-load-dependencies
+      - general-platform-helpers/step-run-snyk-monitor:
+          scan-all-projects: false
+          skip-unresolved: false
+          run-on-non-main: true
+          additional-arguments: "--maven-aggregate-project"
+
 workflows:
-  build_and_test:
+   "Circle CI Tests":
     jobs:
-      - jdk8
-      - jdk11
       - jdk17
-  # See OKTA-624788
-  semgrep:
-    jobs:
       - general-platform-helpers/job-semgrep-scan:
           name: "Scan with Semgrep"
           context:
             - static-analysis
+      - snyk-scan:
+          name: execute-snyk
+          requires:
+            - jdk17
+          context:
+            - static-analysis

.mvn/wrapper/maven-wrapper.jar

@@ -1,17 +1,23 @@
 #
 # Copyright 2020-Present Okta, Inc.
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+wrapperVersion=3.3.2
+distributionType=bin
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar

.mvn/wrapper/maven-wrapper.properties

@@ -50,7 +50,7 @@ If you run into problems using the SDK, you can
 
 ### Prerequisites
 
-- [JDK 8][jdk-8] or [JDK 11][jdk-11]
+- [JDK 17][jdk-17] or later
 - [Apache Maven][apache-maven] 3.6.x or later
 
 To use this SDK, you will need to include the following dependencies:
@@ -324,8 +324,7 @@ We are happy to accept contributions and PRs! Please see the [contribution guide
 [github-issues]: https://github.com/okta/okta-idx-java/issues
 [github-releases]: https://github.com/okta/okta-idx-java/releases
 [okta-library-versioning]: https://developer.okta.com/code/library-versions
-[jdk-8]: https://www.oracle.com/java/technologies/javase/javase-jdk8-downloads.html
-[jdk-11]: https://www.oracle.com/java/technologies/javase-jdk11-downloads.html
+[jdk-17]: https://www.oracle.com/java/technologies/downloads/#java17
 [java-samples]: https://github.com/okta/okta-idx-java/tree/master/samples
 [apache-maven]: https://maven.apache.org/download.cgi
 [okta-identity-engine]: https://developer.okta.com/docs/guides/oie-intro/

.travis.yml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.okta.idx.sdk</groupId>
         <artifactId>okta-idx-java-root</artifactId>
-        <version>3.0.8-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>okta-idx-java-api</artifactId>

README.md

@@ -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 is = resource.getInputStream()) {
+            scanner = new Scanner(is, StandardCharsets.UTF_8.name());
+        }
         return parse(scanner);
     }
 

api/pom.xml

@@ -46,15 +46,16 @@ public YAMLPropertiesSource(Resource resource) {
     @SuppressWarnings("unchecked")
     public Map<String, String> getProperties() {
         try {
-            InputStream in = resource.getInputStream();
-            // check to see if file exists
-            if (in != null) { // if we have a yaml file.
-                if (Classes.isAvailable("org.yaml.snakeyaml.Yaml")) {
-                    Yaml yaml = new Yaml(new SafeConstructor(new LoaderOptions()));
-                    Map config = yaml.load(in);
-                    return getFlattenedMap(config);
-                } else {
-                    log.warn("YAML not found in classpath, add 'org.yaml.snakeyaml' to support YAML configuration");
+            try (InputStream in = resource.getInputStream()) {
+                // check to see if file exists
+                if (in != null) { // if we have a yaml file.
+                    if (Classes.isAvailable("org.yaml.snakeyaml.Yaml")) {
+                        Yaml yaml = new Yaml(new SafeConstructor(new LoaderOptions()));
+                        Map config = yaml.load(in);
+                        return getFlattenedMap(config);
+                    } else {
+                        log.warn("YAML not found in classpath, add 'org.yaml.snakeyaml' to support YAML configuration");
+                    }
                 }
             }
         } catch (IOException e) {

api/src/main/java/com/okta/idx/sdk/api/config/DefaultPropertiesParser.java

@@ -50,7 +50,7 @@ public String toString() {
     static Map<String, AuthenticatorType> reverseLookupMap = new HashMap<>();
 
     static {
-        AuthenticatorType[] values = AuthenticatorType.values();
+        AuthenticatorType[] values = values();
 
         for (AuthenticatorType val : values) {
             reverseLookupMap.put(val.getValue(), val);

api/src/main/java/com/okta/idx/sdk/api/config/YAMLPropertiesSource.java

@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.okta.idx.sdk</groupId>
         <artifactId>okta-idx-java-root</artifactId>
-        <version>3.0.8-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>okta-idx-java-coverage</artifactId>