Feature/solution type

.gitignore

@@ -4,6 +4,8 @@ local.properties
 .settings/
 .project
 .classpath
+.idea/
+*.iml
 
 # Maven
 

api30.sdk/pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>br.cielo.cieloecommerce</groupId>
   <artifactId>api30.sdk</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>0.0.8-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>api30.sdk</name>
@@ -32,4 +32,14 @@
   		<version>4.5.2</version>
   	</dependency>
   </dependencies>
+  <distributionManagement>
+    <snapshotRepository>
+      <id>nexus-snapshots</id>
+      <url>https://repos.evoluservices.com/repository/maven-snapshots/</url>
+    </snapshotRepository>
+    <repository>
+      <id>nexus-releases</id>
+      <url>https://repos.evoluservices.com/repository/maven-releases/</url>
+    </repository>
+  </distributionManagement>
 </project>

api30.sdk/src/main/java/cieloecommerce/sdk/ecommerce/CieloEcommerce.java

@@ -2,7 +2,7 @@
 
 import cieloecommerce.sdk.Merchant;
 import cieloecommerce.sdk.ecommerce.request.*;
-import org.apache.http.client.HttpClient;
+import org.apache.http.impl.client.CloseableHttpClient;
 
 import java.io.IOException;
 
@@ -12,7 +12,7 @@
 public class CieloEcommerce {
 	private final Merchant merchant;
 	private final Environment environment;
-	private HttpClient httpClient;
+	private CloseableHttpClient httpClient;
 
 	/**
 	 * Create an instance of CieloEcommerce choosing the environment where the
@@ -39,7 +39,7 @@ public CieloEcommerce(Merchant merchant) {
 		this(merchant, Environment.PRODUCTION);
 	}
 
-	public void setHttpClient(HttpClient httpClient) {
+	public void setHttpClient(CloseableHttpClient httpClient) {
 		this.httpClient = httpClient;
 	}
 
@@ -69,7 +69,7 @@ public Sale createSale(Sale sale) throws IOException, CieloRequestException {
 
 	/**
 	 * Create a card token to be stored on store
-	 * 
+	 *
 	 * @param cardToken
 	 *            The credit card data
 	 * @return The card token
@@ -113,6 +113,31 @@ public Sale querySale(String paymentId) throws IOException, CieloRequestExceptio
 		return sale;
 	}
 
+	/**
+	 * Query a Sale on Cielo by paymentId
+	 *
+	 * @param paymentId
+	 *            The paymentId to be queried
+	 * @return The Sale with authorization, tid, etc. returned by Cielo.
+	 * @throws IOException
+	 * @throws CieloRequestException
+	 *             if anything gets wrong.
+	 * @see <a href=
+	 *      "https://developercielo.github.io/Webservice-3.0/english.html#error-codes">Error
+	 *      Codes</a>
+	 */
+	public QueryMerchantOrderResponse queryMerchantOrder(String merchantOrderId) throws IOException, CieloRequestException {
+		QueryMerchantOrderRequest querySaleRequest = new QueryMerchantOrderRequest(merchant, environment);
+
+		querySaleRequest.setHttpClient(httpClient);
+
+		QueryMerchantOrderResponse merchantOrder = querySaleRequest.execute(merchantOrderId);
+
+		return merchantOrder;
+	}
+
+
+
 	/**
 	 * Query a RecurrentSale on Cielo by recurrentPaymentId
 	 *

api30.sdk/src/main/java/cieloecommerce/sdk/ecommerce/DebitCard.java

@@ -0,0 +1,71 @@
+package cieloecommerce.sdk.ecommerce;
+
+import com.google.gson.annotations.SerializedName;
+
+public class DebitCard {
+
+	@SerializedName("CardNumber")
+	private String cardNumber;
+
+	@SerializedName("Holder")
+	private String holder;
+
+	@SerializedName("ExpirationDate")
+	private String expirationDate;
+
+	@SerializedName("SecurityCode")
+	private String securityCode;
+
+	@SerializedName("Brand")
+	private String brand;
+
+	public DebitCard(String securityCode, String brand) {
+		setSecurityCode(securityCode);
+		setBrand(brand);
+	}
+
+	public String getBrand() {
+		return brand;
+	}
+
+	public DebitCard setBrand(String brand) {
+		this.brand = brand;
+		return this;
+	}
+
+	public String getCardNumber() {
+		return cardNumber;
+	}
+
+	public DebitCard setCardNumber(String cardNumber) {
+		this.cardNumber = cardNumber;
+		return this;
+	}
+
+	public String getExpirationDate() {
+		return expirationDate;
+	}
+
+	public DebitCard setExpirationDate(String expirationDate) {
+		this.expirationDate = expirationDate;
+		return this;
+	}
+
+	public String getHolder() {
+		return holder;
+	}
+
+	public DebitCard setHolder(String holder) {
+		this.holder = holder;
+		return this;
+	}
+
+	public String getSecurityCode() {
+		return securityCode;
+	}
+
+	public DebitCard setSecurityCode(String securityCode) {
+		this.securityCode = securityCode;
+		return this;
+	}
+}

api30.sdk/src/main/java/cieloecommerce/sdk/ecommerce/ExternalAuthentication.java

@@ -0,0 +1,81 @@
+package cieloecommerce.sdk.ecommerce;
+
+import com.google.gson.annotations.SerializedName;
+
+public class ExternalAuthentication {
+
+    @SerializedName("Cavv")
+    private String cavv;
+
+    @SerializedName("Xid")
+    private String xid;
+
+    @SerializedName("Eci")
+    private String eci;
+
+    @SerializedName("Version")
+    private String version;
+
+    @SerializedName("ReferenceID")
+    private String referenceId;
+
+    public ExternalAuthentication(String cavv,
+                                  String xid,
+                                  String eci,
+                                  String version,
+                                  String referenceId) {
+        this.cavv = cavv;
+        this.xid = xid;
+        this.eci = eci;
+        this.version = version;
+        this.referenceId = referenceId;
+    }
+
+    public ExternalAuthentication() {
+    }
+
+    public String getCavv() {
+        return cavv;
+    }
+
+    public ExternalAuthentication setCavv(String cavv) {
+        this.cavv = cavv;
+        return this;
+    }
+
+    public String getXid() {
+        return xid;
+    }
+
+    public ExternalAuthentication setXid(String xid) {
+        this.xid = xid;
+        return this;
+    }
+
+    public String getEci() {
+        return eci;
+    }
+
+    public ExternalAuthentication setEci(String eci) {
+        this.eci = eci;
+        return this;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public ExternalAuthentication setVersion(String version) {
+        this.version = version;
+        return this;
+    }
+
+    public String getReferenceId() {
+        return referenceId;
+    }
+
+    public ExternalAuthentication setReferenceId(String referenceId) {
+        this.referenceId = referenceId;
+        return this;
+    }
+}

api30.sdk/src/main/java/cieloecommerce/sdk/ecommerce/InitiatedTransactionIndicator.java

@@ -0,0 +1,55 @@
+package cieloecommerce.sdk.ecommerce;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ *
+ * Identifica se a transação foi iniciada pelo titular do cartão ou pela loja. Válido apenas para
+ * bandeira Mastercard.
+ *
+ * Category: Categoria do indicador de início da transação.
+ * Valores possíveis:
+ * - “C1”: transação inciada pelo portador do cartão;
+ * - “M1”: transação recorrente ou parcelada iniciada pela loja;
+ * - “M2”: transação iniciada pela loja.
+ *
+ * Subcategory: Subcategoria do indicador.
+ * Valores possíveis:
+ *
+ * Se Category = “C1” ou “M1”
+ * - CredentialsOnFile
+ * - StandingOrder
+ * - Subscription
+ * - Installment
+ *
+ * Se Category = “M2”
+ * - PartialShipment
+ * - RelatedOrDelayedCharge
+ * - NoShow
+ * - Resubmission
+ */
+public class InitiatedTransactionIndicator {
+  @SerializedName("Category")
+  private String category;
+
+  @SerializedName("Subcategory")
+  private String subcategory;
+
+  public String getCategory() {
+    return this.category;
+  }
+
+  public InitiatedTransactionIndicator setCategory(String category) {
+    this.category = category;
+    return this;
+  }
+
+  public String getSubcategory() {
+    return this.subcategory;
+  }
+
+  public InitiatedTransactionIndicator setSubcategory(String subcategory) {
+    this.subcategory = subcategory;
+    return this;
+  }
+}