Replaced httpclient with Okhttp. (bunq/sdk_java#25) #73

OGKevin · 2018-02-02T16:26:23Z

This PR closes/fixes the following issues:

Closes Clean dependencies #25
- Tested

OGKevin

Some minor changes required.

OGKevin · 2018-02-02T17:01:43Z

src/main/java/com/bunq/sdk/http/ApiClient.java


      return createBunqResponseRaw(response);
-    } catch (IOException | URISyntaxException exception) {
-      throw new UncaughtExceptionError(exception);
+    } catch (IOException e) {


OGKevin · 2018-02-02T17:01:43Z

src/main/java/com/bunq/sdk/http/ApiClient.java

-    } catch (IOException | URISyntaxException exception) {
-      throw new UncaughtExceptionError(exception);
+    } catch (IOException e) {
+      throw new UncaughtExceptionError(e);


OGKevin · 2018-02-02T17:01:43Z

src/main/java/com/bunq/sdk/http/ApiClient.java

  }

  private static void assertResponseSuccess(int responseCode, byte[] responseBodyBytes, String responseId) {
-    if (responseCode != HttpStatus.SC_OK) {
+    if (responseCode != 200) {


OGKevin · 2018-02-02T17:01:43Z

src/main/java/com/bunq/sdk/http/BunqRequestBody.java

+    return new BunqRequestBody(contentType, content.length, 0, content);
+  }
+
+  @Override public MediaType contentType() {


@Override on its own line.

OGKevin · 2018-02-02T17:01:43Z

src/main/java/com/bunq/sdk/http/BunqRequestBody.java

+    return contentType;
+  }
+
+  @Override public long contentLength() {


OGKevin · 2018-02-02T17:01:43Z

src/main/java/com/bunq/sdk/http/BunqRequestBody.java

+    return byteCount;
+  }
+
+  @Override public void writeTo(BufferedSink sink) throws IOException {


OGKevin · 2018-02-02T17:01:43Z

src/main/java/com/bunq/sdk/http/HttpMethod.java

+      case "PUT":
+        return HttpMethod.PUT;
+      default:
+        throw new BunqException(String.format("The method \"%s\" is unexpected", methodString));


OGKevin · 2018-02-02T17:01:43Z

src/main/java/com/bunq/sdk/json/PaginationAdapter.java

+//      List<NameValuePair> params = URLEncodedUtils.parse(uri, Charset.defaultCharset());
+//
+//      for (NameValuePair param : params) {
+//        if (responseParam.equals(param.getName())) {


U whut mate ?

OGKevin · 2018-02-02T17:29:13Z

@patrickdw1991 please 👀

patrickdw1991 · 2018-02-02T20:55:16Z

src/main/java/com/bunq/sdk/context/ApiContext.java

    return environmentType.getBaseUri();
  }

+  public String getApiVersoin() {


patrickdw1991 · 2018-02-02T20:56:15Z

src/main/java/com/bunq/sdk/context/ApiEnvironmentType.java

-    } catch (URISyntaxException exception) {
-      throw new UncaughtExceptionError(exception);
-    }
+  String getBaseUri() {


Intended to be default access instead of private public or protected?

Yea, so that it can only be accessed publicly via ApiContext.

patrickdw1991 · 2018-02-02T20:56:34Z

src/main/java/com/bunq/sdk/context/ApiEnvironmentType.java

+    return this.baseUri;
+  }
+
+  String getApiVersion() {


Same as above.

patrickdw1991 · 2018-02-02T20:57:45Z

src/main/java/com/bunq/sdk/http/ApiClient.java

+   * Time out constants.
+   */
+  private static final int TIMEOUT_SECONDS = 30;
+  public static final int OK_STATUS_CODE = 200;


Maybe instead of checking for only 200 just check for the full 200 range, like according to http spec 201 can be CREATED, we don't really use it in our backend but think it would be better to do so.

patrickdw1991 · 2018-02-02T20:58:42Z

src/main/java/com/bunq/sdk/http/ApiClient.java

-    } catch (NoSuchAlgorithmException | KeyManagementException | MalformedURLException exception) {
-      throw new UncaughtExceptionError(exception);
-    }
+  private OkHttpClient buildOkHttpClient() {


Normally you put a docblock above all methods right?

Also for a lot of other methods ;)

doe het dan

patrickdw1991 · 2018-02-02T21:04:53Z

src/main/java/com/bunq/sdk/http/ApiClient.java

@@ -344,14 +376,15 @@ public BunqResponseRaw get(String uri, Map<String, String> params,
   * @return The raw response of the PUT request.
   */
  public BunqResponseRaw put(String uri, byte[] requestBodyBytes,
-      Map<String, String> customHeaders) {
+                             Map<String, String> customHeaders) {


patrickdw1991 · 2018-02-02T21:06:12Z

src/main/java/com/bunq/sdk/http/BunqRequestBuilder.java

+
+  @Override
+  public BunqRequestBuilder method(String method, RequestBody body) {
+    RequestBody bodyToPassTpSuper;


patrickdw1991 · 2018-02-02T21:07:17Z

src/main/java/com/bunq/sdk/http/HttpMethod.java

+import com.bunq.sdk.exception.BunqException;
+
+public enum HttpMethod {
+  GET("GET"), POST("POST"), PUT("PUT"), DELETE("DELETE");


Nicer to just put it on separate lines

patrickdw1991 · 2018-02-02T21:08:14Z

src/main/java/com/bunq/sdk/json/PaginationAdapter.java

    if (responseJson.has(responseField) && !responseJson.get(responseField).isJsonNull()) {
-      URI uri = new URI(responseJson.get(responseField).getAsString());
-      List<NameValuePair> params = URLEncodedUtils.parse(uri, Charset.defaultCharset());
+      HttpUrl url = HttpUrl.parse(EXAMPLE_URL + responseJson.get(responseField).getAsString());


Maybe add a comment here why you do this :)

patrickdw1991 · 2018-02-02T21:08:54Z

src/main/java/com/bunq/sdk/security/SecurityUtils.java

-      HttpResponse httpEntity, PublicKey keyPublicServer) {
-    byte[] responseBytes = getResponseBytes(responseCode, responseBodyBytes,
-        httpEntity.getAllHeaders());
+                                               Response response, PublicKey keyPublicServer) {


patrickdw1991 · 2018-02-02T21:10:52Z

Might be a good idea to also add the gradle checkstyle check in here as a simple check on code quality works great for our android code :)

OGKevin · 2018-02-04T08:19:14Z

@patrickdw1991 yours again, please 👀

patrickdw1991 · 2018-02-05T10:18:46Z

src/main/java/com/bunq/sdk/http/ApiClient.java

@@ -316,8 +316,8 @@ private static String getResponseId(Response response) {

  /**
   */
-  private static void assertResponseSuccess(int responseCode, byte[] responseBodyBytes, String responseId) {
-    if (Pattern.matches(OK_STATUS_CODE_RANGE, responseId)) {
+  private static void assertResponseSuccess(Integer responseCode, byte[] responseBodyBytes, String responseId) {


Is it possible here that the response code is null? (we had the situation before when the request doesn't reach the server (timeouts))

patrickdw1991 · 2018-02-05T11:13:11Z

@OGKevin GoGoGo

andrederoos · 2018-02-15T17:23:05Z

src/main/java/com/bunq/sdk/http/ApiClient.java

-    } catch (NoSuchAlgorithmException | KeyManagementException | MalformedURLException exception) {
-      throw new UncaughtExceptionError(exception);
-    }
+  private OkHttpClient buildOkHttpClient() {


doe het dan

Replaced httpclient with Okhttp. (#25)

00cc743

OGKevin added this to the 0.12.5 milestone Feb 2, 2018

OGKevin self-assigned this Feb 2, 2018

Added 30 seconds time out to requests. (#25)

2d0d89f

bunq deleted a comment Feb 2, 2018

Removed all unused imports and reformatted code. (#25)

362ad29

bunq deleted a comment Feb 2, 2018

OGKevin commented Feb 2, 2018

View reviewed changes

Addressed styling issues and general code clean up. (#25)

3bd78cf

bunq deleted a comment Feb 2, 2018

OGKevin requested a review from patrickdw1991 February 2, 2018 17:28

OGKevin assigned patrickdw1991 Feb 2, 2018

OGKevin added the Can be merged label Feb 2, 2018

patrickdw1991 requested changes Feb 2, 2018

View reviewed changes

OGKevin force-pushed the bunq/sdk_java#25-use-okhttp branch from 78261b2 to e3442ce Compare February 2, 2018 22:53

Fixed some styling issues. (#25)

fb26ecb

OGKevin force-pushed the bunq/sdk_java#25-use-okhttp branch from e3442ce to fb26ecb Compare February 2, 2018 22:54

bunq deleted a comment Feb 2, 2018

OGKevin added 3 commits February 4, 2018 09:06

Fixed method formatting. (#25)

1dcdc43

Added missing doc blocks on methods. (#25)

01577e0

Fixed broken tests. (#25)

2235a4a

bunq deleted a comment Feb 4, 2018

patrickdw1991 reviewed Feb 5, 2018

View reviewed changes

Added case to catch a null response code. (#25)

0393ba5

patrickdw1991 previously approved these changes Feb 5, 2018

View reviewed changes

bunq deleted a comment Feb 5, 2018

OGKevin assigned andrederoos and unassigned patrickdw1991 Feb 5, 2018

OGKevin requested a review from andrederoos February 5, 2018 11:16

andrederoos requested changes Feb 15, 2018

View reviewed changes

OGKevin dismissed patrickdw1991’s stale review via ae9faf0 February 15, 2018 17:24

andrederoos previously approved these changes Feb 15, 2018

View reviewed changes

OGKevin dismissed andrederoos’s stale review via ddd991a February 15, 2018 17:26

OGKevin force-pushed the bunq/sdk_java#25-use-okhttp branch from 41651e8 to ddd991a Compare February 15, 2018 17:26

bunq deleted a comment Feb 15, 2018

Missed a doc block. (#25)

609b35e

OGKevin force-pushed the bunq/sdk_java#25-use-okhttp branch from ddd991a to 609b35e Compare February 15, 2018 17:41

OGKevin merged commit a64caab into develop Feb 15, 2018

OGKevin deleted the bunq/sdk_java#25-use-okhttp branch February 15, 2018 17:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Replaced httpclient with Okhttp. (bunq/sdk_java#25) #73

Replaced httpclient with Okhttp. (bunq/sdk_java#25) #73

OGKevin commented Feb 2, 2018 •

edited

Loading

OGKevin left a comment

OGKevin Feb 2, 2018

OGKevin Feb 2, 2018

OGKevin Feb 2, 2018

OGKevin Feb 2, 2018

OGKevin Feb 2, 2018

OGKevin Feb 2, 2018

OGKevin Feb 2, 2018

OGKevin Feb 2, 2018

OGKevin commented Feb 2, 2018 •

edited

Loading

patrickdw1991 Feb 2, 2018

patrickdw1991 Feb 2, 2018

OGKevin Feb 2, 2018

patrickdw1991 Feb 2, 2018

OGKevin Feb 2, 2018

patrickdw1991 Feb 2, 2018

patrickdw1991 Feb 2, 2018

patrickdw1991 Feb 2, 2018

andrederoos Feb 15, 2018

patrickdw1991 Feb 2, 2018

patrickdw1991 Feb 2, 2018

patrickdw1991 Feb 2, 2018

patrickdw1991 Feb 2, 2018

patrickdw1991 Feb 2, 2018

patrickdw1991 commented Feb 2, 2018

OGKevin commented Feb 4, 2018

patrickdw1991 Feb 5, 2018

patrickdw1991 commented Feb 5, 2018

andrederoos Feb 15, 2018

Replaced httpclient with Okhttp. (bunq/sdk_java#25) #73

Replaced httpclient with Okhttp. (bunq/sdk_java#25) #73

Conversation

OGKevin commented Feb 2, 2018 • edited Loading

This PR closes/fixes the following issues:

OGKevin left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

OGKevin commented Feb 2, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

patrickdw1991 commented Feb 2, 2018

OGKevin commented Feb 4, 2018

Choose a reason for hiding this comment

patrickdw1991 commented Feb 5, 2018

Choose a reason for hiding this comment

OGKevin commented Feb 2, 2018 •

edited

Loading

OGKevin commented Feb 2, 2018 •

edited

Loading