Skip to content

Replace IO layer to use Apache HC + trivial cleanups #390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 12, 2020
Merged

Replace IO layer to use Apache HC + trivial cleanups #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5702fc8
Switch to Apache HC + trivial cleanups
slisaasquatch May 9, 2020
7eef5b0
Shared XmlMapper
slisaasquatch May 9, 2020
c169f6f
Rearrange methods
slisaasquatch May 9, 2020
e8d3c3e
Restore cast
slisaasquatch May 9, 2020
790cf67
Update RecurlyClient.java
slisaasquatch May 9, 2020
98c1525
Fix query param formatting
slisaasquatch Jun 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@
<version>2.0.3</version>
</dependency>
<dependency>
<groupId>com.ning</groupId>
<artifactId>async-http-client</artifactId>
<version>1.9.8</version>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.12</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
Expand Down
26 changes: 12 additions & 14 deletions src/main/java/com/ning/billing/recurly/QueryParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,16 @@
*/
package com.ning.billing.recurly;

import com.ning.billing.recurly.model.Subscription;
import com.ning.billing.recurly.model.Transaction;
import com.google.common.base.Charsets;

import org.apache.http.NameValuePair;
import org.apache.http.client.utils.URLEncodedUtils;
import org.apache.http.message.BasicNameValuePair;
import org.joda.time.DateTime;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
Expand Down Expand Up @@ -152,18 +157,11 @@ public void setBillingStatus(final BillingStatus billingStatus) {

@Override
public String toString() {
StringBuilder sb = new StringBuilder();

for (Map.Entry<String,String> entry : params.entrySet()) {
if (sb.length() > 0) {
sb.append("&");
} else {
sb.append("?");
}

sb.append(String.format("%s=%s", entry.getKey(), entry.getValue()));
if (params.isEmpty()) return "";
final List<NameValuePair> pairList = new ArrayList<NameValuePair>(params.size());
for (Map.Entry<String, String> entry : params.entrySet()) {
pairList.add(new BasicNameValuePair(entry.getKey(), entry.getValue()));
}

return sb.toString();
return '?' + URLEncodedUtils.format(pairList, Charsets.UTF_8);
}
}
Loading