Se añade soporte para uso de proxy

lunasoft · Jan 14, 2019 · 7eccd55 · 7eccd55
1 parent 32c5696
commit 7eccd55
Show file tree

Hide file tree

Showing 43 changed files with 259 additions and 206 deletions.
diff --git a/src/main/java/Services/AcceptReject/SWAcceptRejectService.java b/src/main/java/Services/AcceptReject/SWAcceptRejectService.java
@@ -13,6 +13,14 @@
 import Utils.Responses.IResponse;
 
 public class SWAcceptRejectService extends SWService{
+    public SWAcceptRejectService(String user, String password, String URI, String proxyHost, int proxyPort) throws AuthException {
+        super(user, password, URI, proxyHost, proxyPort);
+    }
+
+    public SWAcceptRejectService(String token, String URI, String proxyHost, int proxyPort) {
+        super(token, URI, proxyHost, proxyPort);
+    }
+
     public SWAcceptRejectService(String user, String password, String URI) throws AuthException {
         super(user, password, URI);
     }
@@ -22,25 +30,25 @@ public SWAcceptRejectService(String token, String URI) {
     }
 
     public IResponse AceptarRechazarCancelacionCSD(Map<String,String> uuids,String password_csd, String rfc, String b64Cer, String b64Key) throws AuthException, GeneralException, IOException {
-        AceptarRechazarOptionsRequest settings = new AceptarRechazarOptionsRequest(getToken(),getURI(), uuids, password_csd, rfc, b64Cer, b64Key);
+        AceptarRechazarOptionsRequest settings = new AceptarRechazarOptionsRequest(getToken(),getURI(), uuids, password_csd, rfc, b64Cer, b64Key, getProxyHost(), getProxyPort());
         AceptarRechazarCancelationRequest req = new  AceptarRechazarCancelationRequest();
         return req.sendRequest(settings);
     }
 
     public IResponse AceptarRechazarCancelacionPFX(Map<String,String> uuids,String password_csd, String rfc, String b64pfx) throws AuthException, GeneralException, IOException, SOAPException {
-        AceptarRechazarOptionsRequest settings = new AceptarRechazarOptionsRequest(getToken(),getURI(), uuids, password_csd, rfc, b64pfx);
+        AceptarRechazarOptionsRequest settings = new AceptarRechazarOptionsRequest(getToken(),getURI(), uuids, password_csd, rfc, b64pfx, getProxyHost(), getProxyPort());
         AceptarRechazarCancelationRequest req = new  AceptarRechazarCancelationRequest();
         return req.sendRequestPFX(settings);
     }
 
     public IResponse AceptarRechazarCancelacionXML(String xml) throws AuthException, GeneralException, IOException {
-        AceptarRechazarOptionsRequest settings = new AceptarRechazarOptionsRequest(getToken(),getURI(),xml);
+        AceptarRechazarOptionsRequest settings = new AceptarRechazarOptionsRequest(getToken(),getURI(), xml, getProxyHost(), getProxyPort());
         AceptarRechazarCancelationRequest req = new AceptarRechazarCancelationRequest();
         return req.sendRequestXML(settings);
     }
 
     public IResponse AceptarRechazarCancelacionUUID(String uuid, String rfc, String action) throws AuthException, GeneralException, IOException, SOAPException {
-        AceptarRechazarOptionsRequest settings = new AceptarRechazarOptionsRequest(getToken(),getURI(), uuid, rfc, action);
+        AceptarRechazarOptionsRequest settings = new AceptarRechazarOptionsRequest(getToken(),getURI(), uuid, rfc, action, getProxyHost(), getProxyPort());
         AceptarRechazarCancelationRequest req = new  AceptarRechazarCancelationRequest();
         return req.sendRequestUUID(settings);
     }

diff --git a/src/main/java/Services/Authentication/SWAuthenticationService.java b/src/main/java/Services/Authentication/SWAuthenticationService.java
@@ -10,12 +10,15 @@
 import Utils.Responses.IResponse;
 
 public class SWAuthenticationService extends SWService {
+    public SWAuthenticationService(String user, String password, String URI, String proxyHost, int proxyPort) throws AuthException {
+        super(user, password, URI, proxyHost, proxyPort);
+    }
     public SWAuthenticationService(String user, String password, String URI) throws AuthException {
         super(user, password, URI);
     }
 
     public IResponse Token() throws GeneralException, AuthException, IOException {
-        AuthOptionsRequest settings = new AuthOptionsRequest(getURI(),getUser(),getPassword());
+        AuthOptionsRequest settings = new AuthOptionsRequest(getURI(), getUser(), getPassword(), getProxyHost(), getProxyPort());
         AuthRequest req = new AuthRequest();
         return req.sendRequest(settings);
     }

diff --git a/src/main/java/Services/BalanceAccount/SWBalanceAccountService.java b/src/main/java/Services/BalanceAccount/SWBalanceAccountService.java
@@ -20,8 +20,16 @@ public SWBalanceAccountService(String token, String URI) {
         super(token, URI);
     }
 
+    public SWBalanceAccountService(String user, String password, String URI, String proxyHost, int proxyPort) throws AuthException {
+        super(user, password, URI, proxyHost, proxyPort);
+    }
+
+    public SWBalanceAccountService(String token, String URI, String proxyHost, int proxyPort) {
+        super(token, URI, proxyHost, proxyPort);
+    }
+
     public IResponse GetBalanceAccount() throws AuthException, GeneralException, IOException {
-        BalanceAcctOptionsRequest settings = new BalanceAcctOptionsRequest(getToken(),getURI());
+        BalanceAcctOptionsRequest settings = new BalanceAcctOptionsRequest(getToken(), getURI(), getProxyHost(), getProxyPort());
         BalanceAcctRequest req = new BalanceAcctRequest();
         return req.sendRequest(settings);
     }

diff --git a/src/main/java/Services/Cancelation/SWCancelationService.java b/src/main/java/Services/Cancelation/SWCancelationService.java
@@ -21,26 +21,34 @@ public SWCancelationService(String token, String URI) {
         super(token, URI);
     }
 
+    public SWCancelationService(String user, String password, String URI, String proxyHost, int proxyPort) throws AuthException {
+        super(user, password, URI, proxyHost, proxyPort);
+    }
+
+    public SWCancelationService(String token, String URI, String proxyHost, int proxyPort) {
+        super(token, URI, proxyHost, proxyPort);
+    }
+
     public IResponse Cancelation(String uuid, String password_csd, String rfc, String b64Cer, String b64Key) throws AuthException, GeneralException, IOException {
-        CancelationOptionsRequest settings = new CancelationOptionsRequest(getToken(),getURI(),uuid, password_csd, rfc, b64Cer, b64Key);
+        CancelationOptionsRequest settings = new CancelationOptionsRequest(getToken(), getURI(), uuid, password_csd, rfc, b64Cer, b64Key, getProxyHost(), getProxyPort());
         CancelationRequest req = new CancelationRequest();
         return req.sendRequest(settings);
     }
 
     public IResponse Cancelation(String xml) throws AuthException, GeneralException, IOException {
-        CancelationOptionsRequest settings = new CancelationOptionsRequest(getToken(),getURI(),xml);
+        CancelationOptionsRequest settings = new CancelationOptionsRequest(getToken(), getURI(), xml, getProxyHost(), getProxyPort());
         CancelationRequest req = new CancelationRequest();
         return req.sendRequest(settings, true);
     }
 
     public IResponse Cancelation(String uuid, String password_csd, String rfc, String b64Pfx) throws AuthException, GeneralException, IOException {
-        CancelationOptionsRequest settings = new CancelationOptionsRequest(getToken(),getURI(),uuid, password_csd, rfc, b64Pfx);
+        CancelationOptionsRequest settings = new CancelationOptionsRequest(getToken(), getURI(), uuid, password_csd, rfc, b64Pfx, getProxyHost(), getProxyPort());
         CancelationRequest req = new CancelationRequest();
         return req.sendRequestPfx(settings);
     }
 
     public IResponse Cancelation(String uuid, String rfc) throws AuthException, GeneralException, IOException {
-        CancelationOptionsRequest settings = new CancelationOptionsRequest(getToken(),getURI(),uuid, rfc);
+        CancelationOptionsRequest settings = new CancelationOptionsRequest(getToken(), getURI(), uuid, rfc, getProxyHost(), getProxyPort());
         CancelationRequest req = new CancelationRequest();
         return req.sendRequestUuid(settings);
     }

diff --git a/src/main/java/Services/Csd/SWCsdService.java b/src/main/java/Services/Csd/SWCsdService.java
@@ -18,11 +18,11 @@ public SWCsdService(String user, String password, String URI) throws AuthExcepti
     public SWCsdService(String token, String URI) {
         super(token, URI);
     }
-    public SWCsdService(String user, String password, String URI, String proxyHost, String proxyPort) throws AuthException {
+    public SWCsdService(String user, String password, String URI, String proxyHost, int proxyPort) throws AuthException {
         super(user, password, URI, proxyHost, proxyPort);
     }
 
-    public SWCsdService(String token, String URI, String proxyHost, String proxyPort) {
+    public SWCsdService(String token, String URI, String proxyHost, int proxyPort) {
         super(token, URI, proxyHost, proxyPort);
     }
 

diff --git a/src/main/java/Services/Issue/SWIssueService.java b/src/main/java/Services/Issue/SWIssueService.java
@@ -19,27 +19,35 @@ public SWIssueService(String user, String password, String URI) throws AuthExcep
 	public SWIssueService(String token, String URI) {
 		super(token, URI);
 	}
+
+	public SWIssueService(String user, String password, String URI, String proxyHost, int proxyPort) throws AuthException {
+		super(user, password, URI, proxyHost, proxyPort);
+	}
+
+	public SWIssueService(String token, String URI, String proxyHost, int proxyPort) {
+		super(token, URI, proxyHost, proxyPort);
+	}
 
 	public IResponse IssueJson(String json, String version) throws AuthException, GeneralException, IOException {
-		IssueOptionsRequest settings = new IssueOptionsRequest(getToken(), getURI(), json, version);
+		IssueOptionsRequest settings = new IssueOptionsRequest(getToken(), getURI(), json, version, getProxyHost(), getProxyPort());
 		IssueRequest req = new IssueRequest();
 		return req.sendRequest(settings);
 	}
 
 	public IResponse IssueJson(byte[] jsonFile, String version) throws AuthException, GeneralException, IOException {
 		String jsonProcess = new String(jsonFile, Charset.forName("UTF-8"));
-		IssueOptionsRequest settings = new IssueOptionsRequest(getToken(), getURI(), jsonProcess, version);
+		IssueOptionsRequest settings = new IssueOptionsRequest(getToken(), getURI(), jsonProcess, version, getProxyHost(), getProxyPort());
 		IssueRequest req = new IssueRequest();
 		return req.sendRequest(settings);
 	}
 	public IResponse IssueXml(String xml, String version) throws AuthException, GeneralException, IOException {
-		IssueOptionsRequest settings = new IssueOptionsRequest(getToken(), getURI(), xml, version, true);
+		IssueOptionsRequest settings = new IssueOptionsRequest(getToken(), getURI(), xml, version, true, getProxyHost(), getProxyPort());
 		IssueRequest req = new IssueRequest();
 		return req.sendRequestXml(settings);
 	}
 	public IResponse IssueXml(byte[] xmlfile, String version) throws AuthException, GeneralException, IOException {
 		String xmlProcess = new String(xmlfile, Charset.forName("UTF-8"));
-		IssueOptionsRequest settings = new IssueOptionsRequest(getToken(), getURI(), xmlProcess, version, true);
+		IssueOptionsRequest settings = new IssueOptionsRequest(getToken(), getURI(), xmlProcess, version, true, getProxyHost(), getProxyPort());
 		IssueRequest req = new IssueRequest();
 		return req.sendRequestXml(settings);
 	}

diff --git a/src/main/java/Services/Pdf/SWPdfService.java b/src/main/java/Services/Pdf/SWPdfService.java
@@ -20,20 +20,28 @@ public SWPdfService(String token, String URI) {
         super(token, URI);
     }
 
+    public SWPdfService(String user, String password, String URI, String proxyHost, int proxyPort) throws AuthException {
+        super(user, password, URI, proxyHost, proxyPort);
+    }
+
+    public SWPdfService(String token, String URI, String proxyHost, int proxyPort) {
+        super(token, URI, proxyHost, proxyPort);
+    }
+
     public IResponse GeneratePdf(String xml) throws AuthException, GeneralException, IOException {
-        PdfOptionsRequest settings = new PdfOptionsRequest(getToken(),getURI(), xml);
+        PdfOptionsRequest settings = new PdfOptionsRequest(getToken(),getURI(), xml, getProxyHost(), getProxyPort());
         PdfRequest req = new PdfRequest();
         return req.sendRequest(settings);
     }
 
     public IResponse GeneratePdf(String xml, String extras) throws AuthException, GeneralException, IOException {
-        PdfOptionsRequest settings = new PdfOptionsRequest(getToken(),getURI(), xml, extras);
+        PdfOptionsRequest settings = new PdfOptionsRequest(getToken(),getURI(), xml, extras, getProxyHost(), getProxyPort());
         PdfRequest req = new PdfRequest();
         return req.sendRequest(settings);
     }
 
     public IResponse GeneratePdf(String xml, String extras, String templateId) throws AuthException, GeneralException, IOException {
-        PdfOptionsRequest settings = new PdfOptionsRequest(getToken(),getURI(), xml, extras, templateId);
+        PdfOptionsRequest settings = new PdfOptionsRequest(getToken(),getURI(), xml, extras, templateId, getProxyHost(), getProxyPort());
         PdfRequest req = new PdfRequest();
         return req.sendRequest(settings);
     }

diff --git a/src/main/java/Services/Pendings/SWPendingsService.java b/src/main/java/Services/Pendings/SWPendingsService.java
@@ -20,8 +20,16 @@ public SWPendingsService(String token, String URI) {
         super(token, URI);
     }
 
+    public SWPendingsService(String user, String password, String URI, String proxyHost, int proxyPort) throws AuthException {
+        super(user, password, URI, proxyHost, proxyPort);
+    }
+
+    public SWPendingsService(String token, String URI, String proxyHost, int proxyPort) {
+        super(token, URI, proxyHost, proxyPort);
+    }
+
     public IResponse PendientesPorCancelar(String rfc) throws AuthException, GeneralException, IOException, SOAPException {
-        PendientesCancelarOptionsRequest settings = new PendientesCancelarOptionsRequest(getToken(),getURI(), rfc);
+        PendientesCancelarOptionsRequest settings = new PendientesCancelarOptionsRequest(getToken(),getURI(), rfc, getProxyHost(), getProxyPort());
         PendientesCancelarRequest req = new  PendientesCancelarRequest();
         return req.sendRequest(settings);
     }

diff --git a/src/main/java/Services/Relations/SWRelationsService.java b/src/main/java/Services/Relations/SWRelationsService.java
@@ -20,26 +20,34 @@ public SWRelationsService(String token, String URI) {
         super(token, URI);
     }
 
+    public SWRelationsService(String user, String password, String URI, String proxyHost, int proxyPort) throws AuthException {
+        super(user, password, URI, proxyHost, proxyPort);
+    }
+
+    public SWRelationsService(String token, String URI, String proxyHost, int proxyPort) {
+        super(token, URI, proxyHost, proxyPort);
+    }
+
     public IResponse CfdiRelacionadosCSD(String uuid,String password_csd, String rfc, String b64Cer, String b64Key) throws AuthException, GeneralException, IOException {
-        CfdiRelacionadosOptionsRequest settings = new CfdiRelacionadosOptionsRequest(getToken(),getURI(), uuid, password_csd, rfc, b64Cer, b64Key);
+        CfdiRelacionadosOptionsRequest settings = new CfdiRelacionadosOptionsRequest(getToken(),getURI(), uuid, password_csd, rfc, b64Cer, b64Key, getProxyHost(), getProxyPort());
         CfdiRelacionadosRequest req = new  CfdiRelacionadosRequest();
         return req.sendRequest(settings);
     }
 
     public IResponse CfdiRelacionadosPFX(String uuid,String password_csd, String rfc, String b64pfx) throws AuthException, GeneralException, IOException, SOAPException {
-        CfdiRelacionadosOptionsRequest settings = new CfdiRelacionadosOptionsRequest(getToken(),getURI(), uuid, password_csd, rfc, b64pfx);
+        CfdiRelacionadosOptionsRequest settings = new CfdiRelacionadosOptionsRequest(getToken(),getURI(), uuid, password_csd, rfc, b64pfx, getProxyHost(), getProxyPort());
         CfdiRelacionadosRequest req = new  CfdiRelacionadosRequest();
         return req.sendRequestPFX(settings);
     }
 
     public IResponse CfdiRelacionadosXML(String xml) throws AuthException, GeneralException, IOException, SOAPException {
-        CfdiRelacionadosOptionsRequest settings = new CfdiRelacionadosOptionsRequest(getToken(),getURI(), xml);
+        CfdiRelacionadosOptionsRequest settings = new CfdiRelacionadosOptionsRequest(getToken(),getURI(), xml, getProxyHost(), getProxyPort());
         CfdiRelacionadosRequest req = new  CfdiRelacionadosRequest();
         return req.sendRequestXML(settings);
     }
 
     public IResponse CfdiRelacionadosUUID(String uuid, String rfc) throws AuthException, GeneralException, IOException, SOAPException {
-        CfdiRelacionadosOptionsRequest settings = new CfdiRelacionadosOptionsRequest(getToken(),getURI(), uuid, rfc);
+        CfdiRelacionadosOptionsRequest settings = new CfdiRelacionadosOptionsRequest(getToken(),getURI(), uuid, rfc, getProxyHost(), getProxyPort());
         CfdiRelacionadosRequest req = new  CfdiRelacionadosRequest();
         return req.sendRequestUUID(settings);
     }

diff --git a/src/main/java/Services/SWService.java b/src/main/java/Services/SWService.java
@@ -15,7 +15,7 @@ public abstract class SWService {
     private String User = null;
     private String Password = null;
     private String ProxyHost = null;
-    private String ProxyPort = null;
+    private int ProxyPort = 0;
     private Date time = null;
 
     public String getToken() throws AuthException, GeneralException, IOException {
@@ -41,7 +41,7 @@ public String getProxyHost() {
     	return ProxyHost;
     }
 
-    public String getProxyPort() {
+    public int getProxyPort() {
     	return ProxyPort;
     }
 
@@ -60,7 +60,7 @@ protected SWService(String user, String password, String URI) throws AuthExcepti
 		}
     }
 
-    protected SWService(String user, String password, String URI, String ProxyHost, String ProxyPort) throws AuthException {
+    protected SWService(String user, String password, String URI, String ProxyHost, int ProxyPort) throws AuthException {
         User = user;
         Password = password;
         this.ProxyHost = ProxyHost;
@@ -83,7 +83,7 @@ protected SWService(String token, String URI) {
         this.time = new Date((long)999999999*100000);
     }
 
-    protected SWService(String token, String URI, String ProxyHost, String ProxyPort) {
+    protected SWService(String token, String URI, String ProxyHost, int ProxyPort) {
         Token = token;
         this.URI = URI;
         this.ProxyHost = ProxyHost;
@@ -111,7 +111,7 @@ public void generateToken() throws AuthException, GeneralException, IOException
         if (User == null || Password == null) {
             throw new AuthException(400, "no existen elementos de autenticación");
         }
-        AuthOptionsRequest settings = new AuthOptionsRequest(URI, getUser(), getPassword());
+        AuthOptionsRequest settings = new AuthOptionsRequest(URI, getUser(), getPassword(), getProxyHost(), getProxyPort());
         AuthRequest req = new AuthRequest();
         SuccessAuthResponse res = (SuccessAuthResponse) req.sendRequest(settings);
         if (res.HttpStatusCode == 200) {

diff --git a/src/main/java/Services/Stamp/SWStampService.java b/src/main/java/Services/Stamp/SWStampService.java
@@ -21,11 +21,11 @@ public SWStampService(String token, String URI) {
 		super(token, URI);
 	}
 
-	public SWStampService(String user, String password, String URI, String proxyHost, String proxyPort) throws AuthException {
+	public SWStampService(String user, String password, String URI, String proxyHost, int proxyPort) throws AuthException {
 		super(user, password, URI, proxyHost, proxyPort);
 	}
 
-	public SWStampService(String token, String URI, String proxyHost, String proxyPort) {
+	public SWStampService(String token, String URI, String proxyHost, int proxyPort) {
 		super(token, URI, proxyHost, proxyPort);
 	}
 

diff --git a/src/main/java/Services/StatusCfdi/StatusCfdiService.java b/src/main/java/Services/StatusCfdi/StatusCfdiService.java
@@ -19,7 +19,7 @@ public StatusCfdiService(String URL, String Action) {
     }
 
     public IResponse StatusCfdi(String rfcEmisor, String rfcReceptor, String total, String uuid) throws AuthException, GeneralException, IOException, SOAPException {
-        StatusCancelationOptionsRequest settings = new StatusCancelationOptionsRequest(URL, Action, rfcEmisor, rfcReceptor, total, uuid);
+        StatusCancelationOptionsRequest settings = new StatusCancelationOptionsRequest(URL, Action, rfcEmisor, rfcReceptor, total, uuid, null, 0);
         StatusCancelationRequest req = new StatusCancelationRequest();
         return req.sendRequest(settings);
     }