Upgrade to comply with OAuth2.0

pom.xml

@@ -5,15 +5,15 @@
 
   <groupId>br.com.userede.erede</groupId>
   <artifactId>erede</artifactId>
-  <version>1.2.1</version>
+  <version>1.3.0</version>
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>11</source>
-          <target>11</target>
+          <source>15</source>
+          <target>15</target>
         </configuration>
       </plugin>
     </plugins>
@@ -37,12 +37,12 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
-      <version>4.5.13</version>
+      <version>4.5.14</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.9.0</version>
+      <version>2.12.1</version>
     </dependency>
   </dependencies>
 </project>

src/main/java/br/com/userede/erede/AccessTokenResponse.java

@@ -0,0 +1,41 @@
+package br.com.userede.erede;
+
+public class AccessTokenResponse {
+
+    private String access_token;
+    private String token_type;
+    private Long expires_in;
+    private String scope;
+
+    public String getAccessToken() {
+        return access_token;
+    }
+
+    public String getTokenType() {
+        return token_type;
+    }
+
+    public Long getExpiresIn() {
+        return expires_in;
+    }
+
+    public String getScope() {
+        return scope;
+    }
+
+    public void setAccessToken(String access_token) {
+        this.access_token = access_token;
+    }
+
+    public void setTokenType(String token_type) {
+        this.token_type = token_type;
+    }
+
+    public void setExpiresIn(Long expires_in) {
+        this.expires_in = expires_in;
+    }
+
+    public void setScope(String scope) {
+        this.scope = scope;
+    }
+}

src/main/java/br/com/userede/erede/Environment.java

@@ -5,8 +5,8 @@
 public class Environment {
 
     private static final String PRODUCTION = "https://api.userede.com.br/erede";
-    private static final String SANDBOX = "https://api.userede.com.br/desenvolvedores";
-    private static final String VERSION = "v1";
+    private static final String SANDBOX = "https://sandbox-erede.useredecloud.com.br";
+    private static final String VERSION = "v2";
 
     @SerializedName("ip")
     private String ip;

src/main/java/br/com/userede/erede/HttpUtils.java

@@ -0,0 +1,36 @@
+package br.com.userede.erede;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.zip.GZIPInputStream;
+
+import org.apache.http.Header;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+
+public class HttpUtils {
+
+	public static String parseResponse(HttpResponse response) throws IOException {
+        HttpEntity responseEntity = response.getEntity();
+        InputStream responseEntityContent = responseEntity.getContent();
+
+        Header contentEncoding = response.getFirstHeader("Content-Encoding");
+
+        if (contentEncoding != null && contentEncoding.getValue().equalsIgnoreCase("gzip")) {
+            responseEntityContent = new GZIPInputStream(responseEntityContent);
+        }
+
+        BufferedReader responseReader = new BufferedReader(
+                new InputStreamReader(responseEntityContent));
+        StringBuilder responseBuilder = new StringBuilder();
+        String line;
+
+        while ((line = responseReader.readLine()) != null) {
+            responseBuilder.append(line);
+        }
+
+        return responseBuilder.toString();
+    }
+}

src/main/java/br/com/userede/erede/OAuthEnvironment.java

@@ -0,0 +1,28 @@
+package br.com.userede.erede;
+
+import com.google.gson.annotations.SerializedName;
+
+public class OAuthEnvironment {
+
+    private static final String PRODUCTION = "https://api.userede.com.br/redelabs/oauth2/token";
+    private static final String SANDBOX = "https://rl7-sandbox-api.useredecloud.com.br/oauth2/token";
+
+    @SerializedName("endpoint")
+    private String endpoint;
+
+    public OAuthEnvironment(String endpoint) {
+        this.endpoint = endpoint;
+    }
+
+    public static OAuthEnvironment production() {
+        return new OAuthEnvironment(OAuthEnvironment.PRODUCTION);
+    }
+
+    public static OAuthEnvironment sandbox() {
+        return new OAuthEnvironment(OAuthEnvironment.SANDBOX);
+    }
+
+    public String getEndpoint() {
+		return endpoint;
+	}
+}

src/main/java/br/com/userede/erede/OAuthRede.java

@@ -0,0 +1,17 @@
+package br.com.userede.erede;
+
+import br.com.userede.erede.service.OAuthService;
+
+public class OAuthRede {
+
+	private OAuthService oAuthService;
+
+	public OAuthRede(OAuthStore oAuthStore) {
+		this.oAuthService = new OAuthService(oAuthStore);
+	}
+
+	/**Returns a new access_token*/
+    public String generateAccessToken() {
+    	return oAuthService.generateAccessToken();
+    }
+}

src/main/java/br/com/userede/erede/OAuthStore.java

@@ -0,0 +1,47 @@
+package br.com.userede.erede;
+
+public class OAuthStore {
+
+    private OAuthEnvironment environment;
+    private String clientId; // OLD PV
+    private String clientSecret; // OLD CHAVE INTEGRACAO
+
+
+    public OAuthStore(String clientId, String clientSecret, OAuthEnvironment environment) {
+    	this.clientId = clientId;
+        this.clientSecret = clientSecret;
+        this.environment = environment;
+    }
+
+    /**Constructs production OAuthStore*/
+    public OAuthStore(String clientId, String clientSecret) {
+        this(clientId, clientSecret, OAuthEnvironment.production());
+    }
+
+    public OAuthEnvironment getEnvironment() {
+        return environment;
+    }
+
+    public OAuthStore setEnvironment(OAuthEnvironment environment) {
+        this.environment = environment;
+        return this;
+    }
+
+    /**Old PV**/
+    public String getClientId() {
+		return clientId;
+	}
+
+    public void setClientId(String clientId) {
+		this.clientId = clientId;
+	}
+
+    /**Old CHAVE INTEGRACAO**/
+    public String getClientSecret() {
+		return clientSecret;
+	}
+
+    public void setClientSecret(String clientSecret) {
+		this.clientSecret = clientSecret;
+	}
+}

src/main/java/br/com/userede/erede/Store.java

@@ -3,17 +3,17 @@
 public class Store {
 
     private Environment environment;
-    private String filiation;
-    private String token;
+    private String filiation; // clientId
+    private String accessToken; // temporary access_token
 
-    public Store(String filiation, String token, Environment environment) {
-        this.environment = environment;
-        this.filiation = filiation;
-        this.token = token;
+    public Store(String filiation, String accessToken, Environment environment) {
+    	this.filiation = filiation;
+    	this.accessToken = accessToken;
+		this.environment = environment;
     }
 
-    public Store(String filiation, String token) {
-        this(filiation, token, Environment.production());
+    public Store(String filiation, String accessToken) {
+        this(filiation, accessToken, Environment.production());
     }
 
     public Environment getEnvironment() {
@@ -33,13 +33,12 @@ public Store setFiliation(String filiation) {
         this.filiation = filiation;
         return this;
     }
-
-    public String getToken() {
-        return token;
-    }
-
-    public Store setToken(String token) {
-        this.token = token;
-        return this;
-    }
+
+    public String getAccessToken() {
+		return accessToken;
+	}
+
+    public void setAccessToken(String accessToken) {
+		this.accessToken = accessToken;
+	}
 }

src/main/java/br/com/userede/erede/eRede.java

@@ -1,15 +1,15 @@
 package br.com.userede.erede;
 
+import java.util.logging.Logger;
+
 import br.com.userede.erede.service.CancelTransactionService;
 import br.com.userede.erede.service.CaptureTransactionService;
 import br.com.userede.erede.service.CreateTransactionService;
 import br.com.userede.erede.service.GetTransactionService;
 
-import java.util.logging.Logger;
-
 public class eRede {
 
-    public static final String VERSION = "1.2.0";
+    public static final String VERSION = "1.3.0";
     public static final String ARTIFACT_ID = "br.com.userede.erede";
     public static final String USER_AGENT = "eRede/" + eRede.VERSION + " (Java; %s)";
 
@@ -27,7 +27,7 @@ public eRede(Store store, Logger logger) {
 
     public TransactionResponse authorize(Transaction transaction) {
         return create(transaction);
-    }
+    }   
 
     public TransactionResponse create(Transaction transaction) {
         CreateTransactionService createTransactionService = new CreateTransactionService(store,