Remove compile dependency on openapi-generator

- Replace usage of commons-lang's StringUtils in RetryUtil (add unit test)
okta · Jun 26, 2023 · 6d8e825 · 6d8e825
1 parent f162c3d
commit 6d8e825
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 41 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -137,34 +137,6 @@
             <artifactId>handlebars-jackson2</artifactId>
             <version>${com.github.jknack.handlebars.version}</version>
         </dependency>
-
-        <dependency>
-            <groupId>org.openapitools</groupId>
-            <artifactId>openapi-generator</artifactId>
-            <version>${openapi-generator.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>commons-cli</groupId>
-                    <artifactId>commons-cli</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.commons</groupId>
-                    <artifactId>commons-text</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.github.jknack</groupId>
-                    <artifactId>handlebars</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.httpcomponents</groupId>
-                    <artifactId>httpclient</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/impl/pom.xml b/impl/pom.xml
@@ -39,17 +39,6 @@
             <groupId>com.okta.sdk</groupId>
             <artifactId>okta-sdk-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.openapitools</groupId>
-            <artifactId>openapi-generator</artifactId>
-            <version>6.4.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.httpcomponents</groupId>
-                    <artifactId>httpclient</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>

diff --git a/impl/src/main/java/com/okta/sdk/impl/retry/RetryUtil.java b/impl/src/main/java/com/okta/sdk/impl/retry/RetryUtil.java
@@ -15,10 +15,10 @@
  */
 package com.okta.sdk.impl.retry;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.ProtocolException;
+import org.apache.hc.core5.util.TextUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -76,6 +76,6 @@ static Date dateFromHeader(HttpResponse response) {
 
     static long getRateLimitResetValue(HttpResponse response) {
         Header header = response.getFirstHeader("x-rate-limit-reset");
-        return header != null && StringUtils.isNotBlank(header.getValue()) ? Long.parseLong(header.getValue()) : -1L;
+        return header != null && !TextUtils.isBlank(header.getValue()) ? Long.parseLong(header.getValue()) : -1L;
     }
 }