Java SDK Refresh - v25.0.0

.circleci/config.yml

@@ -96,7 +96,6 @@ jobs:
       # Run the wrapper, do not change anything here
       - run:
           name: Run Reversing Labs Wrapper Scanner
-          no_output_timeout: 45m
           command: |
             echo "Scanning " ${CIRCLE_WORKING_DIRECTORY/#\~/$HOME}/api
             rl-wrapper \

.mvn/jvm.config

@@ -0,0 +1,2 @@
+-Xmx2g
+-DmaxYamlCodePoints=10000000

.mvn/maven.config

@@ -0,0 +1 @@
+-Dsnakeyaml.codepoint.limit=10000000

api/pom.xml

@@ -21,7 +21,8 @@
     <parent>
         <groupId>com.okta.sdk</groupId>
         <artifactId>okta-sdk-root</artifactId>
-        <version>24.0.2-SNAPSHOT</version>
+        <version>25.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>okta-sdk-api</artifactId>
@@ -36,12 +37,13 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <swagger-annotations.version>1.6.8</swagger-annotations.version>
-        <openapi-generator.version>7.11.0</openapi-generator.version>
+        <openapi-generator.version>7.15.0</openapi-generator.version>
         <jackson-databind-nullable.version>0.2.6</jackson-databind-nullable.version>
         <jakarta-annotation.version>2.1.1</jakarta-annotation.version>
         <jsr305.version>3.0.2</jsr305.version>
         <junit.version>4.13.2</junit.version>
         <com.github.jknack.handlebars.version>4.4.0</com.github.jknack.handlebars.version>
+        <junit-version>5.10.2</junit-version>
     </properties>
 
     <dependencies>
@@ -129,10 +131,42 @@
             <artifactId>handlebars-jackson2</artifactId>
             <version>4.3.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${junit-version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>3.2.0</version>
+                <configuration>
+                    <filesets>
+                        <fileset>
+                            <directory>${project.build.directory}/generated-sources/openapi</directory>
+                            <followSymlinks>false</followSymlinks>
+                        </fileset>
+                    </filesets>
+                    <failOnError>false</failOnError>
+                    <retryOnError>true</retryOnError>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <groupId>net.revelc.code.formatter</groupId>
                 <artifactId>formatter-maven-plugin</artifactId>
@@ -170,6 +204,12 @@
                             </exclusion>
                         </exclusions>
                     </dependency>
+                    <!-- Override SnakeYAML to use 1.x which has configurable codepoint limit -->
+                    <dependency>
+                        <groupId>org.yaml</groupId>
+                        <artifactId>snakeyaml</artifactId>
+                        <version>1.33</version>
+                    </dependency>
                 </dependencies>
                 <executions>
                     <execution>
@@ -238,14 +278,41 @@
                     </tags>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>prepare-agent</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>report</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>9</source>
+                    <target>9</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
     <profiles>
         <profile>
             <id>ci</id>
             <build>
-                <plugins>
+        <plugins>
                     <plugin>
                         <groupId>com.github.siom79.japicmp</groupId>
                         <artifactId>japicmp-maven-plugin</artifactId>

api/src/main/java/com/okta/sdk/resource/application/OIDCApplicationBuilder.java

@@ -17,7 +17,6 @@
 
 import com.okta.commons.lang.Classes;
 import com.okta.sdk.resource.model.OAuthEndpointAuthenticationMethod;
-import com.okta.sdk.resource.model.OAuthGrantType;
 import com.okta.sdk.resource.model.OAuthResponseType;
 import com.okta.sdk.resource.model.OpenIdConnectApplicationConsentMethod;
 import com.okta.sdk.resource.model.OpenIdConnectApplicationType;
@@ -36,9 +35,9 @@ static OIDCApplicationBuilder instance() {
 
     OIDCApplicationBuilder setConsentMethod(OpenIdConnectApplicationConsentMethod consentMethod);
 
-    OIDCApplicationBuilder setGrantTypes(List<OAuthGrantType> grantTypes);
+    OIDCApplicationBuilder setGrantTypes(List<com.okta.sdk.resource.model.GrantType> grantTypes);
 
-    OIDCApplicationBuilder addGrantTypes(OAuthGrantType grantType);
+    OIDCApplicationBuilder addGrantTypes(com.okta.sdk.resource.model.GrantType grantType);
 
     OIDCApplicationBuilder setLogoUri(String logoUri);
 
@@ -68,7 +67,7 @@ static OIDCApplicationBuilder instance() {
 
     OIDCApplicationBuilder setTokenEndpointAuthMethod(OAuthEndpointAuthenticationMethod tokenEndpointAuthMethod);
 
-    OIDCApplicationBuilder setJwks(List<com.okta.sdk.resource.model.SchemasJsonWebKey> jsonWebKeyList);
+    OIDCApplicationBuilder setJwks(List<com.okta.sdk.resource.model.ListJwk200ResponseInner> schemasJsonWebKeys);
 
     OIDCApplicationBuilder setImplicitAssignment(Boolean isImplicitAssignment);
 

api/src/main/resources/custom_templates/ApiClient.mustache

@@ -796,6 +796,13 @@ protected List<ServerConfiguration> servers = new ArrayList<ServerConfiguration>
                                         if (contentTypes.length == 0 || contentTypes[0].equals("*/*")) {
                                         return "application/json";
                                         }
+                                        // Prioritize multipart/form-data for file uploads
+                                        for (String contentType : contentTypes) {
+                                        if (contentType.contains("multipart/form-data")) {
+                                        return contentType;
+                                        }
+                                        }
+                                        // Then check for JSON
                                         for (String contentType : contentTypes) {
                                         if (isJsonMime(contentType)) {
                                         return contentType;

api/src/test/java/com/okta/sdk/helper/ApiExceptionHelperTest.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright 2017-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
+ *
+ *     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.
+ */
+package com.okta.sdk.helper;
+
+import com.okta.sdk.resource.client.ApiException;
+import com.okta.sdk.resource.model.Error;
+import org.testng.annotations.Test;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.*;
+
+public class ApiExceptionHelperTest {
+
+    @Test
+    public void testGetErrorWithNullResponseBody() {
+        ApiException apiException = mock(ApiException.class);
+        when(apiException.getResponseBody()).thenReturn(null);
+
+        Error error = ApiExceptionHelper.getError(apiException);
+
+        assertNull(error, "Error should be null when response body is null");
+    }
+
+
+    @Test
+    public void testGetErrorWithInvalidJsonResponseBody() {
+        ApiException apiException = mock(ApiException.class);
+        String invalidJson = "This is not valid JSON";
+        when(apiException.getResponseBody()).thenReturn(invalidJson);
+
+        Error error = ApiExceptionHelper.getError(apiException);
+
+        assertNull(error, "Error should be null for invalid JSON");
+    }
+
+
+
+    @Test
+    public void testGetErrorWithEmptyJsonObject() {
+        ApiException apiException = mock(ApiException.class);
+        String emptyJson = "{}";
+        when(apiException.getResponseBody()).thenReturn(emptyJson);
+
+        Error error = ApiExceptionHelper.getError(apiException);
+
+        assertNotNull(error, "Error should not be null for empty JSON object");
+        assertNull(error.getErrorCode());
+        assertNull(error.getErrorSummary());
+    }
+}

api/src/test/java/com/okta/sdk/helper/HelperConstantsTest.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright 2017-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
+ *
+ *     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.
+ */
+package com.okta.sdk.helper;
+
+import org.testng.annotations.Test;
+
+import java.util.StringJoiner;
+
+import static org.testng.Assert.*;
+
+public class HelperConstantsTest {
+
+    @Test
+    public void testQueryStringJoiner() {
+        // Test the behavior of the QUERY_STRING_JOINER
+        StringJoiner joiner = HelperConstants.QUERY_STRING_JOINER;
+
+        // Add some test values and verify the joined result
+        StringJoiner testJoiner = new StringJoiner("&");
+        testJoiner.add("param1=value1");
+        testJoiner.add("param2=value2");
+
+        // Create a new joiner with the same delimiter to compare behavior
+        StringJoiner constantJoiner = HelperConstants.QUERY_STRING_JOINER;
+        constantJoiner.add("param1=value1");
+        constantJoiner.add("param2=value2");
+
+        assertEquals(constantJoiner.toString(), testJoiner.toString());
+        assertEquals(constantJoiner.toString(), "param1=value1&param2=value2");
+    }
+
+    @Test
+    public void testAuthNames() {
+        // Verify the AUTH_NAMES array content
+        String[] authNames = HelperConstants.AUTH_NAMES;
+
+        assertEquals(authNames.length, 2, "AUTH_NAMES should contain exactly 2 elements");
+        assertEquals(authNames[0], "apiToken", "First auth name should be 'apiToken'");
+        assertEquals(authNames[1], "oauth2", "Second auth name should be 'oauth2'");
+    }
+
+    @Test
+    public void testMediaType() {
+        // Verify the MEDIA_TYPE array content
+        String[] mediaType = HelperConstants.MEDIA_TYPE;
+
+        assertEquals(mediaType.length, 1, "MEDIA_TYPE should contain exactly 1 element");
+        assertEquals(mediaType[0], "application/json",
+            "Media type value should match MediaType.APPLICATION_JSON_VALUE");
+    }
+}