Merge branch 'dev'

README.md

@@ -12,14 +12,14 @@ With Maven:
 <dependency>
     <groupId>com.gocardless</groupId>
     <artifactId>gocardless-pro</artifactId>
-    <version>1.12.0</version>
+    <version>1.12.1</version>
 </dependency>
 ```
 
 With Gradle:
 
 ```
-compile 'com.gocardless:gocardless-pro:1.12.0'
+compile 'com.gocardless:gocardless-pro:1.12.1'
 ```
 
 ## Initializing the client

build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'signing'
 
 sourceCompatibility = 1.7
 group = ' com.gocardless'
-version = '1.12.0'
+version = '1.12.1'
 
 repositories {
     mavenCentral()
@@ -15,14 +15,14 @@ configurations {
 }
 
 dependencies {
-    compile 'com.squareup.okhttp:okhttp:2.5.0'
+    compile 'com.squareup.okhttp:okhttp:2.6.0'
     compile 'com.google.code.gson:gson:2.4'
     compile 'com.google.guava:guava:18.0'
     compile 'org.slf4j:slf4j-api:1.7.13'
 
     testCompile 'junit:junit:4.12'
     testCompile 'org.assertj:assertj-core:2.2.0'
-    testCompile 'com.squareup.okhttp:mockwebserver:2.5.0'
+    testCompile 'com.squareup.okhttp:mockwebserver:2.6.0'
 
     testCompile 'co.freeside:betamax:1.1.2'
     testCompile 'org.codehaus.groovy:groovy-all:2.2.0'

src/main/java/com/gocardless/http/HttpClient.java

@@ -24,7 +24,7 @@ public class HttpClient {
     private static final String DISALLOWED_USER_AGENT_CHARACTERS =
             "[^\\w!#$%&'\\*\\+\\-\\.\\^`\\|~]";
     private static final String USER_AGENT = String.format(
-            "gocardless-pro/1.12.0 java/%s %s/%s %s/%s",
+            "gocardless-pro/1.12.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")),

src/main/java/com/gocardless/resources/Customer.java

@@ -117,7 +117,7 @@ public String getId() {
      * [ISO 639-1](http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) code. Used as the language for
      * notification emails sent by GoCardless if your organisation does not send its own (see [compliance
      * requirements](#appendix-compliance-requirements)). Currently only "en", "fr", "de", "pt", "es",
-     * "it", "nl" are supported. If this is not provided, the language will be chosen based on the
+     * "it", "nl", "sv" are supported. If this is not provided, the language will be chosen based on the
      * `country_code` (if supplied) or default to "en".
      */
     public String getLanguage() {

src/main/java/com/gocardless/resources/RedirectFlow.java

@@ -8,21 +8,21 @@
  * Redirect flows enable you to use GoCardless Pro's [hosted payment
  * pages](https://pay-sandbox.gocardless.com/AL000000AKFPFF) to set up mandates with your customers.
  * These pages are fully compliant and have been translated into Dutch, French, German, Italian,
- * Portuguese and Spanish.
+ * Portuguese, Spanish and Swedish.
  * 
  * The overall flow is:
  * 
- * 1. You [create](#create-a-redirect-flow) a
- * redirect flow for your customer, and redirect them to the returned redirect url, e.g.
- * `https://pay.gocardless.com/flow/RE123`.
+ * 1. You
+ * [create](#create-a-redirect-flow) a redirect flow for your customer, and redirect them to the
+ * returned redirect url, e.g. `https://pay.gocardless.com/flow/RE123`.
  * 
- * 2. Your customer supplies their name, email,
- * address, and bank account details, and submits the form. This securely stores their details, and
- * redirects them back to your `success_redirect_url` with `redirect_flow_id=RE123` in the
- * querystring.
+ * 2. Your customer
+ * supplies their name, email, address, and bank account details, and submits the form. This securely
+ * stores their details, and redirects them back to your `success_redirect_url` with
+ * `redirect_flow_id=RE123` in the querystring.
  * 
- * 3. You [complete](#complete-a-redirect-flow) the redirect flow, which creates a
- * [customer](#core-endpoints-customers), [customer bank
+ * 3. You [complete](#complete-a-redirect-flow) the
+ * redirect flow, which creates a [customer](#core-endpoints-customers), [customer bank
  * account](#core-endpoints-customer-bank-accounts), and [mandate](#core-endpoints-mandates), and
  * returns the ID of the mandate. You may wish to create a
  * [subscription](#core-endpoints-subscriptions) or [payment](#core-endpoints-payments) at this

src/main/java/com/gocardless/services/CustomerService.java

@@ -163,7 +163,7 @@ public CustomerCreateRequest withGivenName(String givenName) {
          * [ISO 639-1](http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) code. Used as the language for
          * notification emails sent by GoCardless if your organisation does not send its own (see [compliance
          * requirements](#appendix-compliance-requirements)). Currently only "en", "fr", "de", "pt", "es",
-         * "it", "nl" are supported. If this is not provided, the language will be chosen based on the
+         * "it", "nl", "sv" are supported. If this is not provided, the language will be chosen based on the
          * `country_code` (if supplied) or default to "en".
          */
         public CustomerCreateRequest withLanguage(String language) {
@@ -549,7 +549,7 @@ public CustomerUpdateRequest withGivenName(String givenName) {
          * [ISO 639-1](http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) code. Used as the language for
          * notification emails sent by GoCardless if your organisation does not send its own (see [compliance
          * requirements](#appendix-compliance-requirements)). Currently only "en", "fr", "de", "pt", "es",
-         * "it", "nl" are supported. If this is not provided, the language will be chosen based on the
+         * "it", "nl", "sv" are supported. If this is not provided, the language will be chosen based on the
          * `country_code` (if supplied) or default to "en".
          */
         public CustomerUpdateRequest withLanguage(String language) {

src/main/java/com/gocardless/services/MandatePdfService.java

@@ -31,7 +31,7 @@ public MandatePdfService(HttpClient httpClient) {
      * To generate a PDF mandate in a foreign language, set
      * your `Accept-Language` header to the relevant [ISO
      * 639-1](http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes#Partial_ISO_639_table) language code.
-     * Supported languages are Dutch, English, French, German, Italian, Portuguese and Spanish.
+     * Supported languages are Dutch, English, French, German, Italian, Portuguese, Spanish and Swedish.
      */
     public MandatePdfCreateRequest create() {
         return new MandatePdfCreateRequest(httpClient);
@@ -49,7 +49,7 @@ public MandatePdfCreateRequest create() {
      * To generate a PDF mandate in a foreign language, set
      * your `Accept-Language` header to the relevant [ISO
      * 639-1](http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes#Partial_ISO_639_table) language code.
-     * Supported languages are Dutch, English, French, German, Italian, Portuguese and Spanish.
+     * Supported languages are Dutch, English, French, German, Italian, Portuguese, Spanish and Swedish.
      */
     public static final class MandatePdfCreateRequest extends PostRequest<MandatePdf> {
         private String accountHolderName;

src/main/java/com/gocardless/services/RedirectFlowService.java

@@ -14,21 +14,21 @@
  * Redirect flows enable you to use GoCardless Pro's [hosted payment
  * pages](https://pay-sandbox.gocardless.com/AL000000AKFPFF) to set up mandates with your customers.
  * These pages are fully compliant and have been translated into Dutch, French, German, Italian,
- * Portuguese and Spanish.
+ * Portuguese, Spanish and Swedish.
  * 
  * The overall flow is:
  * 
- * 1. You [create](#create-a-redirect-flow) a
- * redirect flow for your customer, and redirect them to the returned redirect url, e.g.
- * `https://pay.gocardless.com/flow/RE123`.
+ * 1. You
+ * [create](#create-a-redirect-flow) a redirect flow for your customer, and redirect them to the
+ * returned redirect url, e.g. `https://pay.gocardless.com/flow/RE123`.
  * 
- * 2. Your customer supplies their name, email,
- * address, and bank account details, and submits the form. This securely stores their details, and
- * redirects them back to your `success_redirect_url` with `redirect_flow_id=RE123` in the
- * querystring.
+ * 2. Your customer
+ * supplies their name, email, address, and bank account details, and submits the form. This securely
+ * stores their details, and redirects them back to your `success_redirect_url` with
+ * `redirect_flow_id=RE123` in the querystring.
  * 
- * 3. You [complete](#complete-a-redirect-flow) the redirect flow, which creates a
- * [customer](#core-endpoints-customers), [customer bank
+ * 3. You [complete](#complete-a-redirect-flow) the
+ * redirect flow, which creates a [customer](#core-endpoints-customers), [customer bank
  * account](#core-endpoints-customer-bank-accounts), and [mandate](#core-endpoints-mandates), and
  * returns the ID of the mandate. You may wish to create a
  * [subscription](#core-endpoints-subscriptions) or [payment](#core-endpoints-payments) at this