Revert back to 4.1.1

Google action with formatting messed up commit

Author: SidneyAllen

src/main/java/com/xero/api/ApiClient.java

@@ -17,111 +17,107 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
+
 public class ApiClient {
-  private final String basePath;
-  private final HttpRequestFactory httpRequestFactory;
-  private final ObjectMapper objectMapper;
-  private HttpTransport httpTransport = new NetHttpTransport();
-  private int connectionTimeout = 20000;
-  private int readTimeout = 20000;
-
-  private static final String defaultBasePath = "https://api.xero.com/api.xro/2.0";
-
-  // A reasonable default object mapper. Client can pass in a chosen ObjectMapper anyway, this is
-  // just for reasonable defaults.
-  private static ObjectMapper createDefaultObjectMapper() {
-    ObjectMapper objectMapper =
-        new ObjectMapper()
+    private final String basePath;
+    private final HttpRequestFactory httpRequestFactory;
+    private final ObjectMapper objectMapper;
+    private HttpTransport httpTransport = new NetHttpTransport();
+    private int connectionTimeout = 20000;
+    private int readTimeout = 20000;
+
+    private static final String defaultBasePath = "https://api.xero.com/api.xro/2.0";
+
+    // A reasonable default object mapper. Client can pass in a chosen ObjectMapper anyway, this is just for reasonable defaults.
+    private static ObjectMapper createDefaultObjectMapper() {
+        ObjectMapper objectMapper = new ObjectMapper()
             .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
             .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
             .setDateFormat(new RFC3339DateFormat())
             .setSerializationInclusion(Include.NON_EMPTY);
-    objectMapper.configure(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL, true);
-
-    ThreeTenModule module = new ThreeTenModule();
-    objectMapper.registerModule(module);
-    return objectMapper;
-  }
-
-  public ApiClient() {
-    this(null, null, null, null, null);
-  }
-
-  public ApiClient(
-      String basePath,
-      HttpTransport transport,
-      HttpRequestInitializer initializer,
-      ObjectMapper objectMapper,
-      HttpRequestFactory reqFactory) {
-    this.basePath =
-        basePath == null
-            ? defaultBasePath
-            : (basePath.endsWith("/") ? basePath.substring(0, basePath.length() - 1) : basePath);
-    if (transport != null) {
-      this.httpTransport = transport;
+        objectMapper.configure(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL, true);
+        
+        ThreeTenModule module = new ThreeTenModule();
+        objectMapper.registerModule(module);
+        return objectMapper;
+    }
+
+    public ApiClient() {
+        this(null, null, null, null,null);
+    }
+
+    public ApiClient(
+        String basePath,
+        HttpTransport transport,
+        HttpRequestInitializer initializer,
+        ObjectMapper objectMapper,
+        HttpRequestFactory reqFactory
+    ) {
+        this.basePath = basePath == null ? defaultBasePath : (
+            basePath.endsWith("/") ? basePath.substring(0, basePath.length() - 1) : basePath
+        );
+        if (transport != null) {
+            this.httpTransport = transport;
+        }
+        this.httpRequestFactory = (reqFactory != null ? reqFactory : (transport == null ? Utils.getDefaultTransport() : transport).createRequestFactory(initializer) );
+        this.objectMapper = (objectMapper == null ? createDefaultObjectMapper() : objectMapper);
+    }
+
+    public HttpRequestFactory getHttpRequestFactory() {
+        return httpRequestFactory;
+    }
+
+    public int getConnectionTimeout() {
+        return connectionTimeout;
+    }
+
+    public void setConnectionTimeout(int connectionTimeout) {
+        this.connectionTimeout = connectionTimeout;
+    }
+
+    public int getReadTimeout() {
+        return readTimeout;
+    }
+
+    public void setReadTimeout(int readTimeout) {
+        this.readTimeout = readTimeout;
+    }
+
+    public HttpTransport getHttpTransport() {
+        return httpTransport;
+    }
+
+    public void setHttpTransport(HttpTransport transport) {
+        this.httpTransport = transport;
     }
-    this.httpRequestFactory =
-        (reqFactory != null
-            ? reqFactory
-            : (transport == null ? Utils.getDefaultTransport() : transport)
-                .createRequestFactory(initializer));
-    this.objectMapper = (objectMapper == null ? createDefaultObjectMapper() : objectMapper);
-  }
-
-  public HttpRequestFactory getHttpRequestFactory() {
-    return httpRequestFactory;
-  }
-
-  public int getConnectionTimeout() {
-    return connectionTimeout;
-  }
-
-  public void setConnectionTimeout(int connectionTimeout) {
-    this.connectionTimeout = connectionTimeout;
-  }
-
-  public int getReadTimeout() {
-    return readTimeout;
-  }
-
-  public void setReadTimeout(int readTimeout) {
-    this.readTimeout = readTimeout;
-  }
-
-  public HttpTransport getHttpTransport() {
-    return httpTransport;
-  }
-
-  public void setHttpTransport(HttpTransport transport) {
-    this.httpTransport = transport;
-  }
-
-  public String getBasePath() {
-    return basePath;
-  }
-
-  public ObjectMapper getObjectMapper() {
-    return objectMapper;
-  }
-
-  public class JacksonJsonHttpContent extends AbstractHttpContent {
-    /* A POJO that can be serialized with a com.fasterxml Jackson ObjectMapper */
-    private final Object data;
-
-    public JacksonJsonHttpContent(Object data) {
-      super(Json.MEDIA_TYPE);
-      this.data = data;
+
+    public String getBasePath() {
+        return basePath;
     }
 
-    @Override
-    public void writeTo(OutputStream out) throws IOException {
-      objectMapper.writeValue(out, data);
+    public ObjectMapper getObjectMapper() {
+        return objectMapper;
     }
-  }
 
-  // Builder pattern to get API instances for this client.
+    public class JacksonJsonHttpContent extends AbstractHttpContent {
+        /* A POJO that can be serialized with a com.fasterxml Jackson ObjectMapper */
+        private final Object data;
+
+        public JacksonJsonHttpContent(Object data) {
+            super(Json.MEDIA_TYPE);
+            this.data = data;
+        }
 
-  public AccountingApi accountingApi() {
-    return new AccountingApi(this);
-  }
+        @Override
+        public void writeTo(OutputStream out) throws IOException {
+            objectMapper.writeValue(out, data);
+        }
+    }
+
+    // Builder pattern to get API instances for this client.
+    
+    public AccountingApi accountingApi() {
+        return new AccountingApi(this);
+    }
+    
 }

src/main/java/com/xero/api/RFC3339DateFormat.java

@@ -20,11 +20,12 @@
 
 public class RFC3339DateFormat extends ISO8601DateFormat {
 
-  // Same as ISO8601DateFormat but serializing milliseconds.
-  @Override
-  public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) {
-    String value = ISO8601Utils.format(date, true);
-    toAppendTo.append(value);
-    return toAppendTo;
-  }
-}
+    // Same as ISO8601DateFormat but serializing milliseconds.
+    @Override
+    public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) {
+        String value = ISO8601Utils.format(date, true);
+        toAppendTo.append(value);
+        return toAppendTo;
+    }
+
+}