MDA-11050

se agrega soporte para https en la modalidad uso de proxy
lunasoft · Jan 4, 2018 · baa6e92 · baa6e92
1 parent 71904ac
commit baa6e92
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 35 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/SW-JAVA.iml b/SW-JAVA.iml
@@ -10,7 +10,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="com.github.bingoohuang:unirest-java:0.0.1" level="project" />
     <orderEntry type="module-library" exported="" scope="TEST">
@@ -41,18 +41,19 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="library" exported="" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" exported="" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Maven: com.github.bingoohuang:unirest-java:0.0.1" level="project" />
-    <orderEntry type="library" exported="" name="Maven: org.apache.httpcomponents:httpclient:4.3.6" level="project" />
-    <orderEntry type="library" exported="" name="Maven: org.apache.httpcomponents:httpcore:4.3.3" level="project" />
-    <orderEntry type="library" exported="" name="Maven: commons-logging:commons-logging:1.1.3" level="project" />
-    <orderEntry type="library" exported="" name="Maven: commons-codec:commons-codec:1.6" level="project" />
-    <orderEntry type="library" exported="" name="Maven: org.apache.httpcomponents:httpasyncclient:4.0.2" level="project" />
-    <orderEntry type="library" exported="" name="Maven: org.apache.httpcomponents:httpcore-nio:4.3.2" level="project" />
-    <orderEntry type="library" exported="" name="Maven: org.apache.httpcomponents:httpmime:4.3.6" level="project" />
-    <orderEntry type="library" exported="" name="Maven: org.json:json:20140107" level="project" />
-    <orderEntry type="library" exported="" name="Maven: com.googlecode.juniversalchardet:juniversalchardet:1.0.3" level="project" />
     <orderEntry type="library" exported="" name="org.apache.servicemix.bundles:org.apache.servicemix.bundles.not-yet-commons-ssl:0.3.11_1" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" name="Maven: com.github.bingoohuang:unirest-java:0.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.3.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.3.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.3.6" level="project" />
+    <orderEntry type="library" name="Maven: org.json:json:20140107" level="project" />
+    <orderEntry type="library" name="Maven: com.googlecode.juniversalchardet:juniversalchardet:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.servicemix.bundles:org.apache.servicemix.bundles.not-yet-commons-ssl:0.3.11_1" level="project" />
   </component>
 </module>
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>mx.com.sw.services</groupId>
     <artifactId>SW-JAVA</artifactId>
-    <version>0.0.3.6</version>
+    <version>0.0.3.7</version>
 
     <packaging>jar</packaging>
 

diff --git a/src/main/java/Utils/Requests/Authentication/AuthRequest.java b/src/main/java/Utils/Requests/Authentication/AuthRequest.java
@@ -45,7 +45,7 @@ public IResponse sendRequest(IRequest request) throws GeneralException, AuthExce
             httppost.setHeader("user", request.User);
             httppost.setHeader("password", request.Password);
             if( hostProxy !=null && portProxy != null){
-                HttpHost proxy = new HttpHost(hostProxy, Integer.parseInt(portProxy), request.URI.split(":")[0]);
+                HttpHost proxy = new HttpHost(hostProxy, Integer.parseInt(portProxy));
                 RequestConfig config = RequestConfig.custom()
                         .setProxy(proxy)
                         .build();

diff --git a/src/main/java/Utils/Requests/Cancelation/CancelationRequest.java b/src/main/java/Utils/Requests/Cancelation/CancelationRequest.java
@@ -46,7 +46,7 @@ public IResponse sendRequest(IRequest request) throws GeneralException, AuthExce
             StringEntity d = new StringEntity(send.toString());
             httppost.setEntity(d);
             if( hostProxy !=null && portProxy != null){
-                HttpHost proxy = new HttpHost(hostProxy, Integer.parseInt(portProxy), request.URI.split(":")[0]);
+                HttpHost proxy = new HttpHost(hostProxy, Integer.parseInt(portProxy));
                 RequestConfig config = RequestConfig.custom()
                         .setProxy(proxy)
                         .build();

diff --git a/src/main/java/Utils/Requests/Stamp/StampRequest.java b/src/main/java/Utils/Requests/Stamp/StampRequest.java
@@ -47,6 +47,7 @@ public IResponse sendRequest(IRequest request) throws GeneralException, AuthExce
 
             CloseableHttpClient client = HttpClients.createDefault();
             HttpPost httppost = new HttpPost(request.URI);
+
             MultipartEntity entity = new MultipartEntity( HttpMultipartMode.BROWSER_COMPATIBLE );
             StringBody xmlcfdi = new StringBody(raw,  Charset.forName( "UTF-8" ));
             entity.addPart("xml",xmlcfdi);
@@ -57,9 +58,11 @@ public IResponse sendRequest(IRequest request) throws GeneralException, AuthExce
             httppost.addHeader("Content-Disposition", "form-data; name=xml; filename=xml");
 
             if( hostProxy !=null && portProxy != null){
-                HttpHost proxy = new HttpHost(hostProxy, Integer.parseInt(portProxy), request.URI.split(":")[0]);
+                //, request.URI.split(":")[0]
+                HttpHost proxy = new HttpHost(hostProxy, Integer.parseInt(portProxy));
                 RequestConfig config = RequestConfig.custom()
                         .setProxy(proxy)
+
                         .build();
                 httppost.setConfig(config);
             }
@@ -136,22 +139,8 @@ else if(request.version.equalsIgnoreCase("v3")){
                 else{
                     return new SuccessV1Response(statusE,"error","",responseB.getStatusLine().getReasonPhrase(),responseB.getStatusLine().getReasonPhrase());
                 }
-
-
-            }
-
-
-
-
-
-
-
-
-
-
-
-
-        }
+     }
+         }
         catch (JSONException e){
             throw  new GeneralException(500,e.getMessage());
         } catch (IOException e) {

diff --git a/src/test/java/Tests/Stamp/SWStampServiceTest.java b/src/test/java/Tests/Stamp/SWStampServiceTest.java
@@ -20,7 +20,7 @@ public class SWStampServiceTest extends TestCase {
    public void testStampREAL_XML_STRING_USER_PASSWORD_AUTH_V1() throws Exception {
         SWStampService api = new SWStampService(
                "T2lYQ0t4L0RHVkR4dHZ5Nkk1VHNEakZ3Y0J4Nk9GODZuRyt4cE1wVm5tbXB3YVZxTHdOdHAwVXY2NTdJb1hkREtXTzE3dk9pMmdMdkFDR2xFWFVPUXpTUm9mTG1ySXdZbFNja3FRa0RlYURqbzdzdlI2UUx1WGJiKzViUWY2dnZGbFloUDJ6RjhFTGF4M1BySnJ4cHF0YjUvbmRyWWpjTkVLN3ppd3RxL0dJPQ.T2lYQ0t4L0RHVkR4dHZ5Nkk1VHNEakZ3Y0J4Nk9GODZuRyt4cE1wVm5tbFlVcU92YUJTZWlHU3pER1kySnlXRTF4alNUS0ZWcUlVS0NhelhqaXdnWTRncklVSWVvZlFZMWNyUjVxYUFxMWFxcStUL1IzdGpHRTJqdS9Zakw2UGRiMTFPRlV3a2kyOWI5WUZHWk85ODJtU0M2UlJEUkFTVXhYTDNKZVdhOXIySE1tUVlFdm1jN3kvRStBQlpLRi9NeWJrd0R3clhpYWJrVUMwV0Mwd3FhUXdpUFF5NW5PN3J5cklMb0FETHlxVFRtRW16UW5ZVjAwUjdCa2g0Yk1iTExCeXJkVDRhMGMxOUZ1YWlIUWRRVC8yalFTNUczZXdvWlF0cSt2UW0waFZKY2gyaW5jeElydXN3clNPUDNvU1J2dm9weHBTSlZYNU9aaGsvalpQMUxsekZtK1Q3N25hd09CZmJ1K2RMVlRkandoUmE3c2gvanFxTUkwQmtmYURMQ2o0WjVqajlhVXRFejFHTHpVN211dFl6cE9iTFFOV1JKZFJ2dDZnaytXNktncDVKa1hlVElzM2VUenNXQ1dnVU4zc05pM0cyaXZLYWsxMFlVbHE2d1ZpeWgxWTRIdGhibG1seXg4UllCMm89.uMq7ctwyL9rXfh06z5mJ5Co0WDvanjOiITzzQCFxDfQ",
-               "http://services.test.sw.com.mx",
+               "https://services.test.sw.com.mx",
                "127.0.0.1",
                "8888");
         SuccessV4Response response = null;