From 409f4c3237ec33860b0cf3c3804ee5e9d3911cf0 Mon Sep 17 00:00:00 2001 From: chanel Date: Fri, 21 May 2021 09:53:52 -0700 Subject: [PATCH 1/3] specify charset utf-8 for decompression interceptor input stream reader --- ipp-v3-java-data/pom.xml | 2 +- ipp-v3-java-devkit/pom.xml | 4 ++-- .../com/intuit/ipp/interceptors/DecompressionInterceptor.java | 3 ++- ipp-v3-java-devkit/src/main/resources/ippdevkit.properties | 2 +- ipp-v3-java-devkit/src/test/resources/ippdevkit.properties | 2 +- oauth2-platform-api/pom.xml | 2 +- oauth2-platform-api/src/main/resources/oauthclient.properties | 2 +- oauth2-platform-api/src/test/resources/oauthclient.properties | 2 +- payments-api/pom.xml | 2 +- payments-api/src/main/resources/payment.properties | 2 +- payments-api/src/test/resources/payment.properties | 2 +- pom.xml | 2 +- 12 files changed, 14 insertions(+), 13 deletions(-) diff --git a/ipp-v3-java-data/pom.xml b/ipp-v3-java-data/pom.xml index 6f450c4e..a3a2a74b 100755 --- a/ipp-v3-java-data/pom.xml +++ b/ipp-v3-java-data/pom.xml @@ -4,7 +4,7 @@ com.intuit.quickbooks-online ipp-v3-java-devkit-pom - 6.1.2 + 6.1.2-digits ipp-v3-java-data diff --git a/ipp-v3-java-devkit/pom.xml b/ipp-v3-java-devkit/pom.xml index b251317e..2929deba 100755 --- a/ipp-v3-java-devkit/pom.xml +++ b/ipp-v3-java-devkit/pom.xml @@ -4,7 +4,7 @@ ipp-v3-java-devkit-pom com.intuit.quickbooks-online - 6.1.2 + 6.1.2-digits ipp-v3-java-devkit @@ -22,7 +22,7 @@ com.intuit.quickbooks-online ipp-v3-java-data - 6.1.2 + 6.1.2-digits cglib diff --git a/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/DecompressionInterceptor.java b/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/DecompressionInterceptor.java index ab577fed..76ad24c2 100755 --- a/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/DecompressionInterceptor.java +++ b/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/DecompressionInterceptor.java @@ -26,6 +26,7 @@ import com.intuit.ipp.exception.FMSException; import com.intuit.ipp.util.Logger; import com.intuit.ipp.util.StringUtils; +import java.nio.charset.StandardCharsets; /** * Interceptor to decompress the HTTP response @@ -82,7 +83,7 @@ public void execute(IntuitMessage intuitMessage) throws FMSException { String readLine = null; StringBuilder responseBody = new StringBuilder(); try { - br = new BufferedReader(new InputStreamReader(responseElements.getResponseContent())); + br = new BufferedReader(new InputStreamReader(responseElements.getResponseContent(), StandardCharsets.UTF_8)); //get the response body received from socket connection while (((readLine = br.readLine()) != null)) { diff --git a/ipp-v3-java-devkit/src/main/resources/ippdevkit.properties b/ipp-v3-java-devkit/src/main/resources/ippdevkit.properties index ea8363cf..3d912a40 100755 --- a/ipp-v3-java-devkit/src/main/resources/ippdevkit.properties +++ b/ipp-v3-java-devkit/src/main/resources/ippdevkit.properties @@ -2,7 +2,7 @@ ## Devkit Version # This version has to be updated according to the pom version -version = 6.1.2 +version = 6.1.2-digits # This is to have the request source to be sent to IDS request header request.source = V3JavaSDK diff --git a/ipp-v3-java-devkit/src/test/resources/ippdevkit.properties b/ipp-v3-java-devkit/src/test/resources/ippdevkit.properties index cd23f04e..0ca5af1d 100755 --- a/ipp-v3-java-devkit/src/test/resources/ippdevkit.properties +++ b/ipp-v3-java-devkit/src/test/resources/ippdevkit.properties @@ -1,7 +1,7 @@ ### IPP Dev Kit helper properties ## Devkit version -version = 6.1.2 +version = 6.1.2-digits # This is to have the request source to be sent to IDS request header request.source = V3JavaSDK diff --git a/oauth2-platform-api/pom.xml b/oauth2-platform-api/pom.xml index 86d75684..9c989d88 100644 --- a/oauth2-platform-api/pom.xml +++ b/oauth2-platform-api/pom.xml @@ -20,7 +20,7 @@ ipp-v3-java-devkit-pom com.intuit.quickbooks-online - 6.1.2 + 6.1.2-digits oauth2-platform-api Quickbooks API Helper for OAuth2 diff --git a/oauth2-platform-api/src/main/resources/oauthclient.properties b/oauth2-platform-api/src/main/resources/oauthclient.properties index 247434c8..4993abbb 100644 --- a/oauth2-platform-api/src/main/resources/oauthclient.properties +++ b/oauth2-platform-api/src/main/resources/oauthclient.properties @@ -34,7 +34,7 @@ EMAIL=email INTUIT_NAME=intuit_name #Version -version = 6.1.2 +version = 6.1.2-digits #MIGRATION SERVICE URL OAUTH_MIGRATION_URL_PRODUCTION=https://developer.api.intuit.com/v2/oauth2/tokens/migrate diff --git a/oauth2-platform-api/src/test/resources/oauthclient.properties b/oauth2-platform-api/src/test/resources/oauthclient.properties index 247434c8..4993abbb 100644 --- a/oauth2-platform-api/src/test/resources/oauthclient.properties +++ b/oauth2-platform-api/src/test/resources/oauthclient.properties @@ -34,7 +34,7 @@ EMAIL=email INTUIT_NAME=intuit_name #Version -version = 6.1.2 +version = 6.1.2-digits #MIGRATION SERVICE URL OAUTH_MIGRATION_URL_PRODUCTION=https://developer.api.intuit.com/v2/oauth2/tokens/migrate diff --git a/payments-api/pom.xml b/payments-api/pom.xml index 81e3c8a6..c2495663 100644 --- a/payments-api/pom.xml +++ b/payments-api/pom.xml @@ -19,7 +19,7 @@ ipp-v3-java-devkit-pom com.intuit.quickbooks-online - 6.1.2 + 6.1.2-digits payments-api Payments API SDK diff --git a/payments-api/src/main/resources/payment.properties b/payments-api/src/main/resources/payment.properties index dc4ec40f..3f059df7 100644 --- a/payments-api/src/main/resources/payment.properties +++ b/payments-api/src/main/resources/payment.properties @@ -18,7 +18,7 @@ PAYMENTS_BASE_URL_PRODUCTION=https://api.intuit.com/quickbooks/v4/payments/ PAYMENTS_BASE_URL_SANDBOX=https://sandbox.api.intuit.com/quickbooks/v4/payments/ #Version -version = 6.1.2 +version = 6.1.2-digits #TLS Version TLS_VERSION=TLSv1.2 \ No newline at end of file diff --git a/payments-api/src/test/resources/payment.properties b/payments-api/src/test/resources/payment.properties index dc4ec40f..3f059df7 100644 --- a/payments-api/src/test/resources/payment.properties +++ b/payments-api/src/test/resources/payment.properties @@ -18,7 +18,7 @@ PAYMENTS_BASE_URL_PRODUCTION=https://api.intuit.com/quickbooks/v4/payments/ PAYMENTS_BASE_URL_SANDBOX=https://sandbox.api.intuit.com/quickbooks/v4/payments/ #Version -version = 6.1.2 +version = 6.1.2-digits #TLS Version TLS_VERSION=TLSv1.2 \ No newline at end of file diff --git a/pom.xml b/pom.xml index e78960dc..96bd7e2b 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.intuit.quickbooks-online ipp-v3-java-devkit-pom - 6.1.2 + 6.1.2-digits pom IPP V3 Java DevKit https://github.com/intuit/QuickBooks-V3-Java-SDK From e6fb6e0b7c5422c492ff57bbc96245f193bc0091 Mon Sep 17 00:00:00 2001 From: chanel Date: Fri, 28 May 2021 12:12:16 -0700 Subject: [PATCH 2/3] Revert "specify charset utf-8 for decompression interceptor input stream reader" This reverts commit 409f4c3237ec33860b0cf3c3804ee5e9d3911cf0. --- ipp-v3-java-data/pom.xml | 2 +- ipp-v3-java-devkit/pom.xml | 4 ++-- .../com/intuit/ipp/interceptors/DecompressionInterceptor.java | 3 +-- ipp-v3-java-devkit/src/main/resources/ippdevkit.properties | 2 +- ipp-v3-java-devkit/src/test/resources/ippdevkit.properties | 2 +- oauth2-platform-api/pom.xml | 2 +- oauth2-platform-api/src/main/resources/oauthclient.properties | 2 +- oauth2-platform-api/src/test/resources/oauthclient.properties | 2 +- payments-api/pom.xml | 2 +- payments-api/src/main/resources/payment.properties | 2 +- payments-api/src/test/resources/payment.properties | 2 +- pom.xml | 2 +- 12 files changed, 13 insertions(+), 14 deletions(-) diff --git a/ipp-v3-java-data/pom.xml b/ipp-v3-java-data/pom.xml index a3a2a74b..6f450c4e 100755 --- a/ipp-v3-java-data/pom.xml +++ b/ipp-v3-java-data/pom.xml @@ -4,7 +4,7 @@ com.intuit.quickbooks-online ipp-v3-java-devkit-pom - 6.1.2-digits + 6.1.2 ipp-v3-java-data diff --git a/ipp-v3-java-devkit/pom.xml b/ipp-v3-java-devkit/pom.xml index 2929deba..b251317e 100755 --- a/ipp-v3-java-devkit/pom.xml +++ b/ipp-v3-java-devkit/pom.xml @@ -4,7 +4,7 @@ ipp-v3-java-devkit-pom com.intuit.quickbooks-online - 6.1.2-digits + 6.1.2 ipp-v3-java-devkit @@ -22,7 +22,7 @@ com.intuit.quickbooks-online ipp-v3-java-data - 6.1.2-digits + 6.1.2 cglib diff --git a/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/DecompressionInterceptor.java b/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/DecompressionInterceptor.java index 76ad24c2..ab577fed 100755 --- a/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/DecompressionInterceptor.java +++ b/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/DecompressionInterceptor.java @@ -26,7 +26,6 @@ import com.intuit.ipp.exception.FMSException; import com.intuit.ipp.util.Logger; import com.intuit.ipp.util.StringUtils; -import java.nio.charset.StandardCharsets; /** * Interceptor to decompress the HTTP response @@ -83,7 +82,7 @@ public void execute(IntuitMessage intuitMessage) throws FMSException { String readLine = null; StringBuilder responseBody = new StringBuilder(); try { - br = new BufferedReader(new InputStreamReader(responseElements.getResponseContent(), StandardCharsets.UTF_8)); + br = new BufferedReader(new InputStreamReader(responseElements.getResponseContent())); //get the response body received from socket connection while (((readLine = br.readLine()) != null)) { diff --git a/ipp-v3-java-devkit/src/main/resources/ippdevkit.properties b/ipp-v3-java-devkit/src/main/resources/ippdevkit.properties index 3d912a40..ea8363cf 100755 --- a/ipp-v3-java-devkit/src/main/resources/ippdevkit.properties +++ b/ipp-v3-java-devkit/src/main/resources/ippdevkit.properties @@ -2,7 +2,7 @@ ## Devkit Version # This version has to be updated according to the pom version -version = 6.1.2-digits +version = 6.1.2 # This is to have the request source to be sent to IDS request header request.source = V3JavaSDK diff --git a/ipp-v3-java-devkit/src/test/resources/ippdevkit.properties b/ipp-v3-java-devkit/src/test/resources/ippdevkit.properties index 0ca5af1d..cd23f04e 100755 --- a/ipp-v3-java-devkit/src/test/resources/ippdevkit.properties +++ b/ipp-v3-java-devkit/src/test/resources/ippdevkit.properties @@ -1,7 +1,7 @@ ### IPP Dev Kit helper properties ## Devkit version -version = 6.1.2-digits +version = 6.1.2 # This is to have the request source to be sent to IDS request header request.source = V3JavaSDK diff --git a/oauth2-platform-api/pom.xml b/oauth2-platform-api/pom.xml index 9c989d88..86d75684 100644 --- a/oauth2-platform-api/pom.xml +++ b/oauth2-platform-api/pom.xml @@ -20,7 +20,7 @@ ipp-v3-java-devkit-pom com.intuit.quickbooks-online - 6.1.2-digits + 6.1.2 oauth2-platform-api Quickbooks API Helper for OAuth2 diff --git a/oauth2-platform-api/src/main/resources/oauthclient.properties b/oauth2-platform-api/src/main/resources/oauthclient.properties index 4993abbb..247434c8 100644 --- a/oauth2-platform-api/src/main/resources/oauthclient.properties +++ b/oauth2-platform-api/src/main/resources/oauthclient.properties @@ -34,7 +34,7 @@ EMAIL=email INTUIT_NAME=intuit_name #Version -version = 6.1.2-digits +version = 6.1.2 #MIGRATION SERVICE URL OAUTH_MIGRATION_URL_PRODUCTION=https://developer.api.intuit.com/v2/oauth2/tokens/migrate diff --git a/oauth2-platform-api/src/test/resources/oauthclient.properties b/oauth2-platform-api/src/test/resources/oauthclient.properties index 4993abbb..247434c8 100644 --- a/oauth2-platform-api/src/test/resources/oauthclient.properties +++ b/oauth2-platform-api/src/test/resources/oauthclient.properties @@ -34,7 +34,7 @@ EMAIL=email INTUIT_NAME=intuit_name #Version -version = 6.1.2-digits +version = 6.1.2 #MIGRATION SERVICE URL OAUTH_MIGRATION_URL_PRODUCTION=https://developer.api.intuit.com/v2/oauth2/tokens/migrate diff --git a/payments-api/pom.xml b/payments-api/pom.xml index c2495663..81e3c8a6 100644 --- a/payments-api/pom.xml +++ b/payments-api/pom.xml @@ -19,7 +19,7 @@ ipp-v3-java-devkit-pom com.intuit.quickbooks-online - 6.1.2-digits + 6.1.2 payments-api Payments API SDK diff --git a/payments-api/src/main/resources/payment.properties b/payments-api/src/main/resources/payment.properties index 3f059df7..dc4ec40f 100644 --- a/payments-api/src/main/resources/payment.properties +++ b/payments-api/src/main/resources/payment.properties @@ -18,7 +18,7 @@ PAYMENTS_BASE_URL_PRODUCTION=https://api.intuit.com/quickbooks/v4/payments/ PAYMENTS_BASE_URL_SANDBOX=https://sandbox.api.intuit.com/quickbooks/v4/payments/ #Version -version = 6.1.2-digits +version = 6.1.2 #TLS Version TLS_VERSION=TLSv1.2 \ No newline at end of file diff --git a/payments-api/src/test/resources/payment.properties b/payments-api/src/test/resources/payment.properties index 3f059df7..dc4ec40f 100644 --- a/payments-api/src/test/resources/payment.properties +++ b/payments-api/src/test/resources/payment.properties @@ -18,7 +18,7 @@ PAYMENTS_BASE_URL_PRODUCTION=https://api.intuit.com/quickbooks/v4/payments/ PAYMENTS_BASE_URL_SANDBOX=https://sandbox.api.intuit.com/quickbooks/v4/payments/ #Version -version = 6.1.2-digits +version = 6.1.2 #TLS Version TLS_VERSION=TLSv1.2 \ No newline at end of file diff --git a/pom.xml b/pom.xml index 96bd7e2b..e78960dc 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.intuit.quickbooks-online ipp-v3-java-devkit-pom - 6.1.2-digits + 6.1.2 pom IPP V3 Java DevKit https://github.com/intuit/QuickBooks-V3-Java-SDK From a4b498eebed913b7638adcf3f7de9f690f7795db Mon Sep 17 00:00:00 2001 From: chanel Date: Fri, 28 May 2021 12:14:19 -0700 Subject: [PATCH 3/3] specify utf-8 for input stream reader --- .../com/intuit/ipp/interceptors/DecompressionInterceptor.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/DecompressionInterceptor.java b/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/DecompressionInterceptor.java index ab577fed..76ad24c2 100755 --- a/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/DecompressionInterceptor.java +++ b/ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/DecompressionInterceptor.java @@ -26,6 +26,7 @@ import com.intuit.ipp.exception.FMSException; import com.intuit.ipp.util.Logger; import com.intuit.ipp.util.StringUtils; +import java.nio.charset.StandardCharsets; /** * Interceptor to decompress the HTTP response @@ -82,7 +83,7 @@ public void execute(IntuitMessage intuitMessage) throws FMSException { String readLine = null; StringBuilder responseBody = new StringBuilder(); try { - br = new BufferedReader(new InputStreamReader(responseElements.getResponseContent())); + br = new BufferedReader(new InputStreamReader(responseElements.getResponseContent(), StandardCharsets.UTF_8)); //get the response body received from socket connection while (((readLine = br.readLine()) != null)) {