Resolve deprecations and recommendations (#172)

* Resolve Java deprecated API usage * Resolve fields can be final code style issue * Resolve unnecessary cast to string * Resolve unnecessary semicolon code style issue * Remove obsolete exception redundant declaration * Remove redundant throw exception * Unused imports * Resolve Method identical to super method * Remove explicit type * Missing description * Resolve memory recommendations => static class * Naming conventions * Performance enhancement * Variable already assigned to same value * Null pointer exceptions protection * Simplify assertion * Redundant arguments * Replace stringBuilder with string * Inefficient string conversion * Unused imports * Unnecessary cast * Avoid unnecessary config using best practices * Fix publish script
omise · May 21, 2024 · 4311725 · 4311725
1 parent d08ca37
commit 4311725
Show file tree

Hide file tree

Showing 55 changed files with 136 additions and 425 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -29,7 +29,7 @@ jobs:
         run: ./gradlew test
 
       - name: Publish package
-        run: ./gradlew uploadArchives
+        run: ./gradlew publish
         env:
           PGP_SIGNING_KEY: ${{ secrets.PGP_SIGNING_KEY }}
           PGP_SIGNING_PASSWORD: ${{ secrets.PGP_SIGNING_PASSWORD }}

diff --git a/build.gradle b/build.gradle
@@ -31,14 +31,9 @@ buildscript {
     }
 }
 
-task javadocJar(type: Jar) {
-    archiveClassifier = 'javadoc'
-    from javadoc
-}
-
-task sourcesJar(type: Jar) {
-    archiveClassifier = 'sources'
-    from sourceSets.main.allSource
+java {
+    withJavadocJar()
+    withSourcesJar()
 }
 
 distributions {
@@ -56,16 +51,21 @@ signing {
     sign configurations.archives
 }
 
-artifacts {
-    archives javadocJar, sourcesJar
+javadoc {
+    if(JavaVersion.current().isJava9Compatible()) {
+        options.addBooleanOption('html5', true)
+    }
 }
 
 // REF: https://docs.gradle.org/current/userguide/publishing_maven.html
 publishing {
     publications {
-        mavenJava(MavenPublication) {
-            artifactId = 'omise-java'
-
+        shadow(MavenPublication) {
+            publication ->
+                project.shadow.component(publication)
+                artifactId = 'omise-java'
+                artifact sourcesJar
+                artifact javadocJar
             pom {
                 name = 'Omise Java'
                 description = 'Java bindings for the Omise API'

diff --git a/src/main/java/co/omise/Client.java b/src/main/java/co/omise/Client.java
@@ -37,7 +37,7 @@
 public class Client {
 
     private final OkHttpClient httpClient;
-    private Requester requester;
+    private final Requester requester;
 
     /**
      * Creates a Client that sends the specified API version string in the header to access an earlier version

diff --git a/src/main/java/co/omise/Example.java b/src/main/java/co/omise/Example.java
@@ -176,7 +176,7 @@ void reverseCharge() throws IOException, OmiseException, ClientException {
                 new Charge.ReverseRequestBuilder("chrg_test_4xso2s8ivdej29pqnhz").build();
         Charge charge = client().sendRequest(reverseChargeRequest);
 
-        System.out.printf("charge reversal: %s", Boolean.toString(charge.isReversed()));
+        System.out.printf("charge reversal: %s", charge.isReversed());
     }
 
     void updateCharge() throws IOException, OmiseException, ClientException {

diff --git a/src/main/java/co/omise/Serializer.java b/src/main/java/co/omise/Serializer.java
@@ -68,8 +68,7 @@ private Serializer() {
 
                 .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
                 .configure(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_USING_DEFAULT_VALUE, true)
-                .configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false)
-                .configure(SerializationFeature.WRITE_NULL_MAP_VALUES, false); // TODO: Deprecate in vNext
+                .configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
     }
 
     /**
@@ -197,7 +196,7 @@ public <T extends OmiseObject> Map<String, Object> serializeToMap(T model) {
      * @return The string value for using as query parameters.
      */
     public <T extends Enum<T>> String serializeToQueryParams(T value) {
-        return (String) objectMapper.convertValue(value, String.class);
+        return objectMapper.convertValue(value, String.class);
     }
 
     /**

diff --git a/src/main/java/co/omise/models/Account.java b/src/main/java/co/omise/models/Account.java
@@ -146,11 +146,6 @@ public void setZeroInterestInstallments(boolean zeroInterestInstallments) {
 
     public static class GetRequestBuilder extends RequestBuilder<Account> {
 
-        @Override
-        protected String method() {
-            return GET;
-        }
-
         @Override
         protected HttpUrl path() {
             return buildUrl(Endpoint.API, "account");

diff --git a/src/main/java/co/omise/models/AuthorizationType.java b/src/main/java/co/omise/models/AuthorizationType.java
@@ -6,5 +6,5 @@ public enum AuthorizationType {
     @JsonProperty("pre_auth")
     PreAuth,
     @JsonProperty("final_auth")
-    FinalAuth;
+    FinalAuth
 }
diff --git a/src/main/java/co/omise/models/Balance.java b/src/main/java/co/omise/models/Balance.java
@@ -3,11 +3,7 @@
 import co.omise.Endpoint;
 import co.omise.requests.RequestBuilder;
 import co.omise.requests.ResponseType;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import okhttp3.HttpUrl;
-import okhttp3.RequestBody;
-
-import java.io.IOException;
 
 /**
  * Balance object
@@ -63,11 +59,6 @@ public void setTransferable(long transferable) {
 
     public static class GetRequestBuilder extends RequestBuilder<Balance> {
 
-        @Override
-        protected String method() {
-            return GET;
-        }
-
         @Override
         protected HttpUrl path() {
             return buildUrl(Endpoint.API, "balance");

diff --git a/src/main/java/co/omise/models/Capability.java b/src/main/java/co/omise/models/Capability.java
@@ -5,9 +5,7 @@
 import co.omise.requests.ResponseType;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import okhttp3.HttpUrl;
-import okhttp3.RequestBody;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -66,11 +64,6 @@ public void setZeroInterestInstallments(boolean zeroInterestInstallments) {
 
     public static class GetRequestBuilder extends RequestBuilder<Capability> {
 
-        @Override
-        protected String method() {
-            return GET;
-        }
-
         @Override
         protected HttpUrl path() {
             return buildUrl(Endpoint.API, "capability");

diff --git a/src/main/java/co/omise/models/Card.java b/src/main/java/co/omise/models/Card.java
@@ -302,8 +302,8 @@ public Create expiration(int month, int year) {
     }
 
     public static class DeleteRequestBuilder extends RequestBuilder<Card> {
-        private String customerId;
-        private String cardId;
+        private final String customerId;
+        private final String cardId;
         public DeleteRequestBuilder(String customerId, String cardId) {
             this.customerId = customerId;
             this.cardId = cardId;
@@ -326,18 +326,13 @@ protected ResponseType<Card> type() {
     }
 
     public static class GetRequestBuilder extends RequestBuilder<Card> {
-        private String customerId;
-        private String cardId;
+        private final String customerId;
+        private final String cardId;
         public GetRequestBuilder(String customerId, String cardId) {
             this.customerId = customerId;
             this.cardId = cardId;
         }
 
-        @Override
-        protected String method() {
-            return GET;
-        }
-
         @Override
         protected HttpUrl path() {
             return buildUrl(Endpoint.API, "customers", customerId, "cards", cardId);
@@ -350,8 +345,8 @@ protected ResponseType<Card> type() {
     }
 
     public static class UpdateRequestBuilder extends RequestBuilder<Card> {
-        private String customerId;
-        private String cardId;
+        private final String customerId;
+        private final String cardId;
 
         @JsonProperty
         private String city;
@@ -425,17 +420,12 @@ protected RequestBody payload() throws IOException {
     }
 
     public static class ListRequestBuilder extends RequestBuilder<ScopedList<Card>> {
-        private String customerId;
+        private final String customerId;
         private ScopedList.Options options;
         public ListRequestBuilder(String customerId) {
             this.customerId = customerId;
         }
 
-        @Override
-        protected String method() {
-            return GET;
-        }
-
         @Override
         protected HttpUrl path() {
             if (options == null) {

diff --git a/src/main/java/co/omise/models/Chain.java b/src/main/java/co/omise/models/Chain.java
@@ -3,12 +3,9 @@
 import co.omise.Endpoint;
 import co.omise.requests.RequestBuilder;
 import co.omise.requests.ResponseType;
-import com.fasterxml.jackson.annotation.JsonProperty;
+
 import com.fasterxml.jackson.core.type.TypeReference;
 import okhttp3.HttpUrl;
-import okhttp3.RequestBody;
-
-import java.io.IOException;
 
 /**
  * Chain object
@@ -56,11 +53,6 @@ public void setRevoked(boolean revoked) {
     public static class ListRequestBuilder extends RequestBuilder<ScopedList<Chain>> {
         private ScopedList.Options options;
 
-        @Override
-        protected String method() {
-            return GET;
-        }
-
         @Override
         protected HttpUrl path() {
             if (options == null) {
@@ -84,16 +76,11 @@ public ListRequestBuilder options(ScopedList.Options options) {
     }
 
     public static class GetRequestBuilder extends RequestBuilder<Chain> {
-        private String chainId;
+        private final String chainId;
         public GetRequestBuilder(String chainId) {
             this.chainId = chainId;
         }
 
-        @Override
-        protected String method() {
-            return GET;
-        }
-
         @Override
         protected HttpUrl path() {
             return buildUrl(Endpoint.API, "chains", chainId);
@@ -106,7 +93,7 @@ protected ResponseType<Chain> type() {
     }
 
     public static class RevokeRequestBuilder extends RequestBuilder<Chain> {
-        private String chainId;
+        private final String chainId;
         public RevokeRequestBuilder(String chainId) {
             this.chainId = chainId;
         }

diff --git a/src/main/java/co/omise/models/Charge.java b/src/main/java/co/omise/models/Charge.java
@@ -514,11 +514,6 @@ public void setMerchantAdvice(String merchantAdvice) {
     public static class ListRequestBuilder extends RequestBuilder<ScopedList<Charge>> {
         private ScopedList.Options options;
 
-        @Override
-        protected String method() {
-            return GET;
-        }
-
         @Override
         protected HttpUrl path() {
             if (options == null) {
@@ -689,17 +684,12 @@ public CreateRequestBuilder metadata(String key, Object value) {
     }
 
     public static class ListEventsRequestBuilder extends RequestBuilder<ScopedList<Event>> {
-        private String chargeId;
+        private final String chargeId;
         private ScopedList.Options options;
         public ListEventsRequestBuilder(String chargeId) {
             this.chargeId = chargeId;
         }
 
-        @Override
-        protected String method() {
-            return GET;
-        }
-
         @Override
         protected HttpUrl path() {
             if (options == null) {
@@ -725,11 +715,6 @@ public ListEventsRequestBuilder options(ScopedList.Options options) {
     public static class ListSchedulesRequestBuilder extends RequestBuilder<ScopedList<Schedule>> {
         private ScopedList.Options options;
 
-        @Override
-        protected String method() {
-            return GET;
-        }
-
         @Override
         protected HttpUrl path() {
             if (options == null) {
@@ -753,16 +738,11 @@ public ListSchedulesRequestBuilder options(ScopedList.Options options) {
     }
 
     public static class GetRequestBuilder extends RequestBuilder<Charge> {
-        private String chargeId;
+        private final String chargeId;
         public GetRequestBuilder(String chargeId) {
             this.chargeId = chargeId;
         }
 
-        @Override
-        protected String method() {
-            return GET;
-        }
-
         @Override
         protected HttpUrl path() {
             return buildUrl(Endpoint.API, "charges", chargeId);
@@ -775,7 +755,7 @@ protected ResponseType<Charge> type() {
     }
 
     public static class UpdateRequestBuilder extends RequestBuilder<Charge> {
-        private String chargeId;
+        private final String chargeId;
 
         @JsonProperty
         private String description;
@@ -828,7 +808,7 @@ public UpdateRequestBuilder metadata(String key, Object value) {
     }
 
     public static class CaptureRequestBuilder extends RequestBuilder<Charge> {
-        private String chargeId;
+        private final String chargeId;
 
         @JsonProperty("capture_amount")
         private long captureAmount;
@@ -864,7 +844,7 @@ protected RequestBody payload() throws IOException {
     }
 
     public static class ExpireRequestBuilder extends RequestBuilder<Charge> {
-        private String chargeId;
+        private final String chargeId;
         public ExpireRequestBuilder(String chargeId) {
             this.chargeId = chargeId;
         }
@@ -886,7 +866,7 @@ protected ResponseType<Charge> type() {
     }
 
     public static class MarkAsFailedRequestBuilder extends RequestBuilder<Charge> {
-        private String chargeId;
+        private final String chargeId;
         public MarkAsFailedRequestBuilder(String chargeId) {
             this.chargeId = chargeId;
         }
@@ -908,7 +888,7 @@ protected ResponseType<Charge> type() {
     }
 
     public static class MarkAsPaidRequestBuilder extends RequestBuilder<Charge> {
-        private String chargeId;
+        private final String chargeId;
         public MarkAsPaidRequestBuilder(String chargeId) {
             this.chargeId = chargeId;
         }
@@ -930,7 +910,7 @@ protected ResponseType<Charge> type() {
     }
 
     public static class ReverseRequestBuilder extends RequestBuilder<Charge> {
-        private String chargeId;
+        private final String chargeId;
         public ReverseRequestBuilder(String chargeId) {
             this.chargeId = chargeId;
         }

diff --git a/src/main/java/co/omise/models/ChargeStatus.java b/src/main/java/co/omise/models/ChargeStatus.java
@@ -14,5 +14,5 @@ public enum ChargeStatus {
     @JsonProperty("successful")
     Successful,
     @JsonProperty("unknown")
-    Unknown;
+    Unknown
 }