Fix token refresh in oAuthAccessToken Build method

declarie requestUrl and httpget as private variables

initiailize in each build method with the correct "createParamters" method to set oauth params depending on if it's the first time you get a token or when refreshing a token.

bumped to version 1.0.4

Author: SidneyAllen

README.md

@@ -16,7 +16,7 @@ Add this dependency and repository to your POM.xml
     <dependency>
 	  <groupId>com.xero</groupId>
 	  <artifactId>xero-java-sdk</artifactId>
-	  <version>1.0.3</version>
+	  <version>1.0.4</version>
 	</dependency>
 
     <repositories>

pom.xml

@@ -4,7 +4,7 @@
 	<groupId>com.xero</groupId>
 	<artifactId>xero-java-sdk</artifactId>
 	<packaging>jar</packaging>
-	<version>1.0.3</version>
+	<version>1.0.4</version>
 	<name>Xero-Java SDK</name>
 	<url>http://maven.apache.org</url>
 	<dependencies>

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

@@ -114,7 +114,7 @@ public String getAccessTokenUrl() {
 
   @Override
   public String getUserAgent() {
-    return USER_AGENT + " " + CONSUMER_KEY + " [Xero-Java-1.0.3]";
+    return USER_AGENT + " " + CONSUMER_KEY + " [Xero-Java-1.0.4]";
   }
 
   @Override

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

@@ -35,6 +35,8 @@ public class OAuthAccessToken {
   private String tempTokenSecret;
   private int connectTimeout = 20;
   private int readTimeout = 20;
+  private GenericUrl requestUrl;
+  private HttpGet httpget;
 
   public OAuthAccessToken(Config config) {
     this(config, new ConfigBasedSignerFactory(config));
@@ -50,36 +52,46 @@ public OAuthAccessToken build(String verifier, String tempToken, String tempToke
     this.tempToken = tempToken;
     this.tempTokenSecret = tempTokenSecret;
     this.connectTimeout = config.getConnectTimeout() * 1000;
-	this.readTimeout = config.getReadTimeout() * 1000;
+    this.readTimeout = config.getReadTimeout() * 1000;
 
-    	httpclient = new XeroHttpContext(config).getHttpClient();
-	
+    httpclient = new XeroHttpContext(config).getHttpClient();
+
+    requestUrl = new GenericUrl(this.config.getAccessTokenUrl());
+    httpget = new HttpGet(this.config.getAccessTokenUrl());
+
+    this.createParameters().intercept(httpget,requestUrl);
+    
     return this;
   }
 
   public OAuthAccessToken build() throws IOException {
+    this.connectTimeout = config.getConnectTimeout() * 1000;
+    this.readTimeout = config.getReadTimeout() * 1000;
     httpclient = new XeroHttpContext(config).getHttpClient();
+
+    requestUrl = new GenericUrl(this.config.getAccessTokenUrl());
+    httpget = new HttpGet(this.config.getAccessTokenUrl());
+    
+    this.createRefreshParameters().intercept(httpget,requestUrl);
+
     return this;
   }
 
   public boolean execute() throws IOException {
-	  GenericUrl requestUrl = new GenericUrl(this.config.getAccessTokenUrl());
-
-	  HttpGet httpget = new HttpGet(this.config.getAccessTokenUrl());
-	  
-	  RequestConfig.Builder requestConfig = RequestConfig.custom()
-				.setConnectTimeout(connectTimeout)
-				.setConnectionRequestTimeout(readTimeout)
-				.setSocketTimeout(connectTimeout);
-		
-	  //Proxy Service Setup - unable to fully test as we don't have a proxy 
-	  // server to test against.
-	  if(!"".equals(config.getProxyHost()) && config.getProxyHost() != null) {
-		  int port = (int) (config.getProxyPort() == 80 && config.getProxyHttpsEnabled() ? 443 : config.getProxyPort());		
-		  HttpHost proxy = new HttpHost(config.getProxyHost(), port, config.getProxyHttpsEnabled() ? "https" : "http");
-		  requestConfig.setProxy(proxy);
-	  }
-	  this.createParameters().intercept(httpget,requestUrl);
+
+    RequestConfig.Builder requestConfig = RequestConfig.custom()
+        .setConnectTimeout(connectTimeout)
+        .setConnectionRequestTimeout(readTimeout)
+        .setSocketTimeout(connectTimeout);
+    
+    //Proxy Service Setup - unable to fully test as we don't have a proxy 
+    // server to test against.
+    if(!"".equals(config.getProxyHost()) && config.getProxyHost() != null) {
+      int port = (int) (config.getProxyPort() == 80 && config.getProxyHttpsEnabled() ? 443 : config.getProxyPort());    
+      HttpHost proxy = new HttpHost(config.getProxyHost(), port, config.getProxyHttpsEnabled() ? "https" : "http");
+      requestConfig.setProxy(proxy);
+    }
+
 	  httpget.setConfig(requestConfig.build());
 
 	  try {