Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
Matt Thomson committed Jul 8, 2015
2 parents aa3125b + e76e825 commit 9df1be3
Show file tree
Hide file tree
Showing 17 changed files with 33 additions and 26 deletions.
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ With Maven:
<dependency>
<groupId>com.gocardless</groupId>
<artifactId>gocardless-pro</artifactId>
<version>0.5.0</version>
<version>0.5.1</version>
</dependency>
```

With Gradle:

```
compile 'com.gocardless:gocardless-pro:0.5.0'
compile 'com.gocardless:gocardless-pro:0.5.1'
```

## Initializing the client
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apply plugin: 'signing'

sourceCompatibility = 1.7
group = ' com.gocardless'
version = '0.5.0'
version = '0.5.1'

repositories {
mavenCentral()
Expand Down
21 changes: 14 additions & 7 deletions src/main/java/com/gocardless/http/HttpClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,18 @@
* Users of this library should not need to access this class directly.
*/
public class HttpClient {
private static final String USER_AGENT = String.format("gocardless-pro/0.5.0 %s/%s %s/%s",
replaceSpaces(System.getProperty("os.name")),
replaceSpaces(System.getProperty("os.version")),
replaceSpaces(System.getProperty("java.vm.name")),
replaceSpaces(System.getProperty("java.version")));
/**
* See http://tools.ietf.org/html/rfc7230#section-3.2.6.
*/
private static final String DISALLOWED_USER_AGENT_CHARACTERS =
"[^\\w!#$%&'\\*\\+\\-\\.\\^`\\|~]";
private static final String USER_AGENT = String.format(
"gocardless-pro/0.5.1 java/%s %s/%s %s/%s",
cleanUserAgentToken(System.getProperty("java.vm.specification.version")),
cleanUserAgentToken(System.getProperty("java.vm.name")),
cleanUserAgentToken(System.getProperty("java.version")),
cleanUserAgentToken(System.getProperty("os.name")),
cleanUserAgentToken(System.getProperty("os.version")));
private static final RequestBody EMPTY_BODY = RequestBody.create(null, new byte[0]);
private static final MediaType MEDIA_TYPE = MediaType.parse("application/json");
private static final Map<String, String> HEADERS;
Expand Down Expand Up @@ -120,8 +127,8 @@ private GoCardlessException handleErrorResponse(Response response) {
}
}

private static String replaceSpaces(String s) {
return s.replaceAll(" ", "_");
private static String cleanUserAgentToken(String s) {
return s.replaceAll(DISALLOWED_USER_AGENT_CHARACTERS, "_");
}

@VisibleForTesting
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/betamax/tapes/cancel_a_mandate.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ interactions:
Content-Type: application/json; charset=utf-8
GoCardless-Version: '2014-11-03'
Host: api-sandbox.gocardless.com
User-Agent: gocardless-pro/0.0.1 Mac_OS_X/10.10.2 Java_HotSpot(TM)_64-Bit_Server_VM/1.8.0_40
User-Agent: gocardless-pro/0.0.1 java/1.8 Java_HotSpot_TM__64-Bit_Server_VM/1.8.0_45 Mac_OS_X/10.10.4
body: '{"data":{"metadata":{"foo":"bar"}}}'
response:
status: 200
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/betamax/tapes/create_a_payment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ interactions:
Content-Type: application/json; charset=utf-8
GoCardless-Version: '2014-11-03'
Host: api-sandbox.gocardless.com
User-Agent: gocardless-pro-client/0.0.1-SNAPSHOT Mac_OS_X/10.10.2 Java_HotSpot(TM)_64-Bit_Server_VM/1.8.0_40
User-Agent: gocardless-pro/0.0.1 java/1.8 Java_HotSpot_TM__64-Bit_Server_VM/1.8.0_45 Mac_OS_X/10.10.4
body: '{"payments":{"amount":2000,"currency":"GBP","links":{"mandate":"MD00001PEYCSQF"},"metadata":{"foo":"bar"}}}'
response:
status: 201
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/betamax/tapes/create_a_subscription.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ interactions:
Content-Type: application/json; charset=utf-8
GoCardless-Version: '2014-11-03'
Host: api-sandbox.gocardless.com
User-Agent: gocardless-pro/0.0.1 Mac_OS_X/10.10.2 Java_HotSpot(TM)_64-Bit_Server_VM/1.8.0_40
User-Agent: gocardless-pro/0.0.1 java/1.8 Java_HotSpot_TM__64-Bit_Server_VM/1.8.0_45 Mac_OS_X/10.10.4
body: '{"subscriptions":{"amount":1000,"currency":"GBP","interval_unit":"monthly","links":{"mandate":"MD00001PEYCSQF"}}}'
response:
status: 201
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/betamax/tapes/create_and_update_a_customer.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ interactions:
Content-Type: application/json; charset=utf-8
GoCardless-Version: '2014-11-03'
Host: api-sandbox.gocardless.com
User-Agent: okhttp/2.3.0
User-Agent: gocardless-pro/0.0.1 java/1.8 Java_HotSpot_TM__64-Bit_Server_VM/1.8.0_45 Mac_OS_X/10.10.4
body: '{"customers":{"address_line1":"27 Acer Road","address_line2":"Apt 2","city":"London","country_code":"GB","family_name":"Osborne","given_name":"Sharon","postal_code":"E8 3GX"}}'
response:
status: 201
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/betamax/tapes/disable_an_api_key.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ interactions:
Content-Length: '0'
GoCardless-Version: '2014-11-03'
Host: api-sandbox.gocardless.com
User-Agent: okhttp/2.3.0
User-Agent: gocardless-pro/0.0.1 java/1.8 Java_HotSpot_TM__64-Bit_Server_VM/1.8.0_45 Mac_OS_X/10.10.4
response:
status: 200
headers:
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/betamax/tapes/get_a_customer.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ interactions:
Connection: Keep-Alive
GoCardless-Version: '2014-11-03'
Host: api-sandbox.gocardless.com
User-Agent: gocardless-pro-client/0.0.1-SNAPSHOT Mac_OS_X/10.10.2 Java_HotSpot(TM)_64-Bit_Server_VM/1.8.0_40
User-Agent: gocardless-pro/0.0.1 java/1.8 Java_HotSpot_TM__64-Bit_Server_VM/1.8.0_45 Mac_OS_X/10.10.4
response:
status: 200
headers:
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/betamax/tapes/get_a_customer_wrapped.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ interactions:
Connection: Keep-Alive
GoCardless-Version: '2015-04-29'
Host: api-sandbox.gocardless.com
User-Agent: gocardless-pro/0.0.1 Mac_OS_X/10.10.3 Java_HotSpot(TM)_64-Bit_Server_VM/1.8.0_45
User-Agent: gocardless-pro/0.0.1 java/1.8 Java_HotSpot_TM__64-Bit_Server_VM/1.8.0_45 Mac_OS_X/10.10.4
response:
status: 200
headers:
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/betamax/tapes/get_customers_created_after.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ interactions:
Connection: Keep-Alive
GoCardless-Version: '2014-11-03'
Host: api-sandbox.gocardless.com
User-Agent: gocardless-pro-client/0.0.1-SNAPSHOT Mac_OS_X/10.10.2 Java_HotSpot(TM)_64-Bit_Server_VM/1.8.0_40
User-Agent: gocardless-pro/0.0.1 java/1.8 Java_HotSpot_TM__64-Bit_Server_VM/1.8.0_45 Mac_OS_X/10.10.4
response:
status: 200
headers:
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/betamax/tapes/iterate_through_mandates.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ interactions:
Connection: Keep-Alive
GoCardless-Version: '2014-11-03'
Host: api-sandbox.gocardless.com
User-Agent: gocardless-pro-client/0.0.1-SNAPSHOT Mac_OS_X/10.10.2 Java_HotSpot(TM)_64-Bit_Server_VM/1.8.0_40
User-Agent: gocardless-pro/0.0.1 java/1.8 Java_HotSpot_TM__64-Bit_Server_VM/1.8.0_45 Mac_OS_X/10.10.4
response:
status: 200
headers:
Expand Down Expand Up @@ -40,7 +40,7 @@ interactions:
Connection: Keep-Alive
GoCardless-Version: '2014-11-03'
Host: api-sandbox.gocardless.com
User-Agent: gocardless-pro-client/0.0.1-SNAPSHOT Mac_OS_X/10.10.2 Java_HotSpot(TM)_64-Bit_Server_VM/1.8.0_40
User-Agent: gocardless-pro/0.0.1 java/1.8 Java_HotSpot_TM__64-Bit_Server_VM/1.8.0_45 Mac_OS_X/10.10.4
response:
status: 200
headers:
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/betamax/tapes/list_customers.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ interactions:
Connection: Keep-Alive
GoCardless-Version: '2014-11-03'
Host: api-sandbox.gocardless.com
User-Agent: gocardless-pro-client/0.0.1-SNAPSHOT Mac_OS_X/10.10.2 Java_HotSpot(TM)_64-Bit_Server_VM/1.8.0_40
User-Agent: gocardless-pro/0.0.1 java/1.8 Java_HotSpot_TM__64-Bit_Server_VM/1.8.0_45 Mac_OS_X/10.10.4
response:
status: 200
headers:
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/betamax/tapes/list_enabled_creditor_bank_accounts.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ interactions:
Connection: Keep-Alive
GoCardless-Version: '2015-04-29'
Host: api-sandbox.gocardless.com
User-Agent: gocardless-pro/0.0.1 Mac_OS_X/10.10.3 Java_HotSpot(TM)_64-Bit_Server_VM/1.8.0_45
User-Agent: gocardless-pro/0.0.1 java/1.8 Java_HotSpot_TM__64-Bit_Server_VM/1.8.0_45 Mac_OS_X/10.10.4
response:
status: 200
headers:
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/betamax/tapes/list_mandates_by_customer_and_status.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ interactions:
Connection: Keep-Alive
GoCardless-Version: '2014-11-03'
Host: api-sandbox.gocardless.com
User-Agent: gocardless-pro-client/0.0.1-SNAPSHOT Mac_OS_X/10.10.2 Java_HotSpot(TM)_64-Bit_Server_VM/1.8.0_40
User-Agent: gocardless-pro/0.0.1 java/1.8 Java_HotSpot_TM__64-Bit_Server_VM/1.8.0_45 Mac_OS_X/10.10.4
response:
status: 200
headers:
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/betamax/tapes/list_mandates_for_a_customer.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ interactions:
Connection: Keep-Alive
GoCardless-Version: '2014-11-03'
Host: api-sandbox.gocardless.com
User-Agent: gocardless-pro-client/0.0.1-SNAPSHOT Mac_OS_X/10.10.2 Java_HotSpot(TM)_64-Bit_Server_VM/1.8.0_40
User-Agent: gocardless-pro/0.0.1 java/1.8 Java_HotSpot_TM__64-Bit_Server_VM/1.8.0_45 Mac_OS_X/10.10.4
response:
status: 200
headers:
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/betamax/tapes/page_through_mandates.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ interactions:
Connection: Keep-Alive
GoCardless-Version: '2014-11-03'
Host: api-sandbox.gocardless.com
User-Agent: gocardless-pro-client/0.0.1-SNAPSHOT Mac_OS_X/10.10.2 Java_HotSpot(TM)_64-Bit_Server_VM/1.8.0_40
User-Agent: gocardless-pro/0.0.1 java/1.8 Java_HotSpot_TM__64-Bit_Server_VM/1.8.0_45 Mac_OS_X/10.10.4
response:
status: 200
headers:
Expand Down Expand Up @@ -40,7 +40,7 @@ interactions:
Connection: Keep-Alive
GoCardless-Version: '2014-11-03'
Host: api-sandbox.gocardless.com
User-Agent: gocardless-pro-client/0.0.1-SNAPSHOT Mac_OS_X/10.10.2 Java_HotSpot(TM)_64-Bit_Server_VM/1.8.0_40
User-Agent: gocardless-pro/0.0.1 java/1.8 Java_HotSpot_TM__64-Bit_Server_VM/1.8.0_45 Mac_OS_X/10.10.4
response:
status: 200
headers:
Expand Down

0 comments on commit 9df1be3

Please sign in to comment.