Merge branch 'nightlyBuild' of gitlab.iaik.tugraz.at:egiz/eaaf_components into nightlyBuild1.1.4

2 files changed, 211 insertions, 1 deletions

diff --git a/eaaf_core_utils/src/test/java/at/gv/egiz/eaaf/core/test/http/HttpClientFactoryTest.java b/eaaf_core_utils/src/test/java/at/gv/egiz/eaaf/core/test/http/HttpClientFactoryTest.java
index 72ec7008..63ac38a3 100644
--- a/eaaf_core_utils/src/test/java/at/gv/egiz/eaaf/core/test/http/HttpClientFactoryTest.java
+++ b/eaaf_core_utils/src/test/java/at/gv/egiz/eaaf/core/test/http/HttpClientFactoryTest.java
@@ -3,6 +3,7 @@ package at.gv.egiz.eaaf.core.test.http;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.InetAddress;
+import java.net.SocketTimeoutException;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.Provider;
@@ -12,6 +13,7 @@ import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.junit.After;
@@ -32,6 +34,7 @@ import okhttp3.HttpUrl;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 import okhttp3.mockwebserver.RecordedRequest;
+import okhttp3.mockwebserver.SocketPolicy;
 import okhttp3.tls.HandshakeCertificates;
 import okhttp3.tls.HeldCertificate;
 
@@ -84,6 +87,27 @@ public class HttpClientFactoryTest {
   }
 
   @Test
+  public void defaultHttpClientRetryOneTime() throws EaafException, InterruptedException, 
+      ClientProtocolException, IOException {    
+    CloseableHttpClient client = httpClientFactory.getHttpClient();
+    Assert.assertNotNull("No httpClient", client);
+    
+    mockWebServer = new MockWebServer();
+    mockServerUrl = mockWebServer.url("/sp/junit");
+    mockWebServer.enqueue(new MockResponse()
+        .setSocketPolicy(SocketPolicy.NO_RESPONSE)
+        .setResponseCode(HttpURLConnection.HTTP_NO_CONTENT));       
+    mockWebServer.enqueue(new MockResponse().setResponseCode(200)
+        .setBody("GetData"));
+
+    //request webservice
+    final HttpUriRequest httpGet1 = new HttpGet(mockServerUrl.url().toString());
+    final CloseableHttpResponse httpResp1 = client.execute(httpGet1);    
+    Assert.assertEquals("http statusCode", 200, httpResp1.getStatusLine().getStatusCode());
+        
+  }
+  
+  @Test
   public void getCustomClientsDefault() throws EaafException {
     final HttpClientConfiguration config = new HttpClientConfiguration("jUnit");
     Assert.assertFalse("Wrong default config - Hostnamevalidation",
@@ -157,6 +181,187 @@ public class HttpClientFactoryTest {
   }
 
   @Test
+  public void httpPostRetryNotAllowed() throws EaafException, InterruptedException, 
+      ClientProtocolException, IOException {
+    final HttpClientConfiguration config = 
+        new HttpClientConfiguration("jUnit_retry_" + RandomStringUtils.randomAlphabetic(3));
+    config.setHttpErrorRetryCount(2);
+    config.setHttpErrorRetryPost(false);
+    
+    CloseableHttpClient client = httpClientFactory.getHttpClient(config);
+    Assert.assertNotNull("No httpClient", client);
+    
+    
+    mockWebServer = new MockWebServer();
+    mockServerUrl = mockWebServer.url("/sp/junit");
+    mockWebServer.enqueue(new MockResponse()
+        .setSocketPolicy(SocketPolicy.NO_RESPONSE)
+        .setResponseCode(HttpURLConnection.HTTP_NO_CONTENT));       
+    mockWebServer.enqueue(new MockResponse().setResponseCode(200)
+        .setBody("GetData"));
+
+    //request webservice
+    final HttpUriRequest httpGet1 = new HttpPost(mockServerUrl.url().toString());
+    try {
+      client.execute(httpGet1);    
+      Assert.fail("HTTP POST retry not allowed");
+      
+    } catch (SocketTimeoutException e) {
+      Assert.assertNotNull("No errorMsg", e.getMessage());
+      
+    }
+    
+  }
+  
+  @Test
+  public void httpPostRetryOneTime() throws EaafException, InterruptedException, 
+      ClientProtocolException, IOException {
+    final HttpClientConfiguration config = 
+        new HttpClientConfiguration("jUnit_retry_" + RandomStringUtils.randomAlphabetic(3));
+    config.setHttpErrorRetryCount(2);
+    config.setHttpErrorRetryPost(true);
+    
+    CloseableHttpClient client = httpClientFactory.getHttpClient(config);
+    Assert.assertNotNull("No httpClient", client);
+    
+    
+    mockWebServer = new MockWebServer();
+    mockServerUrl = mockWebServer.url("/sp/junit");
+    mockWebServer.enqueue(new MockResponse()
+        .setSocketPolicy(SocketPolicy.NO_RESPONSE)
+        .setResponseCode(HttpURLConnection.HTTP_NO_CONTENT));       
+    mockWebServer.enqueue(new MockResponse().setResponseCode(200)
+        .setBody("GetData"));
+
+    //request webservice
+    final HttpUriRequest httpGet1 = new HttpPost(mockServerUrl.url().toString());
+    final CloseableHttpResponse httpResp1 = client.execute(httpGet1);    
+    Assert.assertEquals("http statusCode", 200, httpResp1.getStatusLine().getStatusCode());
+        
+  }
+  
+  @Test
+  public void testHttpClientRetryOneTime() throws EaafException, InterruptedException, 
+      ClientProtocolException, IOException {
+    final HttpClientConfiguration config = 
+        new HttpClientConfiguration("jUnit_retry_" + RandomStringUtils.randomAlphabetic(3));
+    config.setHttpErrorRetryCount(2);
+    
+    CloseableHttpClient client = httpClientFactory.getHttpClient(config);
+    Assert.assertNotNull("No httpClient", client);
+    
+    
+    mockWebServer = new MockWebServer();
+    mockServerUrl = mockWebServer.url("/sp/junit");
+    mockWebServer.enqueue(new MockResponse()
+        .setSocketPolicy(SocketPolicy.NO_RESPONSE)
+        .setResponseCode(HttpURLConnection.HTTP_NO_CONTENT));       
+    mockWebServer.enqueue(new MockResponse().setResponseCode(200)
+        .setBody("GetData"));
+
+    //request webservice
+    final HttpUriRequest httpGet1 = new HttpGet(mockServerUrl.url().toString());
+    final CloseableHttpResponse httpResp1 = client.execute(httpGet1);    
+    Assert.assertEquals("http statusCode", 200, httpResp1.getStatusLine().getStatusCode());
+        
+  }
+  
+  @Test
+  public void testHttpClientRetryTwoTime() throws EaafException, InterruptedException, 
+      ClientProtocolException, IOException {
+    final HttpClientConfiguration config = 
+        new HttpClientConfiguration("jUnit_retry_" + RandomStringUtils.randomAlphabetic(3));
+    config.setHttpErrorRetryCount(2);
+    
+    CloseableHttpClient client = httpClientFactory.getHttpClient(config);
+    Assert.assertNotNull("No httpClient", client);
+    
+    
+    mockWebServer = new MockWebServer();
+    mockServerUrl = mockWebServer.url("/sp/junit");
+    mockWebServer.enqueue(new MockResponse()
+        .setSocketPolicy(SocketPolicy.NO_RESPONSE)
+        .setResponseCode(HttpURLConnection.HTTP_NO_CONTENT));       
+    mockWebServer.enqueue(new MockResponse()
+        .setSocketPolicy(SocketPolicy.NO_RESPONSE)
+        .setResponseCode(HttpURLConnection.HTTP_NO_CONTENT));
+    mockWebServer.enqueue(new MockResponse().setResponseCode(200)
+        .setBody("GetData"));
+
+    //request webservice
+    final HttpUriRequest httpGet1 = new HttpGet(mockServerUrl.url().toString());
+    final CloseableHttpResponse httpResp1 = client.execute(httpGet1);    
+    Assert.assertEquals("http statusCode", 200, httpResp1.getStatusLine().getStatusCode());
+    
+  }
+  
+  @Test
+  public void testHttpClientRetryMaxReached() throws EaafException, InterruptedException, 
+      ClientProtocolException, IOException {
+    final HttpClientConfiguration config = 
+        new HttpClientConfiguration("jUnit_retry_" + RandomStringUtils.randomAlphabetic(3));
+    config.setHttpErrorRetryCount(2);
+    
+    CloseableHttpClient client = httpClientFactory.getHttpClient(config);
+    Assert.assertNotNull("No httpClient", client);
+        
+    mockWebServer = new MockWebServer();
+    mockServerUrl = mockWebServer.url("/sp/junit");
+    mockWebServer.enqueue(new MockResponse()
+        .setSocketPolicy(SocketPolicy.NO_RESPONSE)
+        .setResponseCode(HttpURLConnection.HTTP_NO_CONTENT));       
+    mockWebServer.enqueue(new MockResponse()
+        .setSocketPolicy(SocketPolicy.NO_RESPONSE)
+        .setResponseCode(HttpURLConnection.HTTP_NO_CONTENT));
+    mockWebServer.enqueue(new MockResponse()
+        .setSocketPolicy(SocketPolicy.NO_RESPONSE)
+        .setResponseCode(HttpURLConnection.HTTP_NO_CONTENT));
+    mockWebServer.enqueue(new MockResponse().setResponseCode(200)
+        .setBody("GetData"));
+
+    //request webservice
+    final HttpUriRequest httpGet1 = new HttpGet(mockServerUrl.url().toString());
+    try {
+      client.execute(httpGet1);    
+      Assert.fail("Max retry failed");
+      
+    } catch (SocketTimeoutException e) {
+      Assert.assertNotNull("No errorMsg", e.getMessage());
+      
+    }        
+  }
+  
+  @Test
+  public void testHttpClientNoRetry() throws EaafException, InterruptedException, 
+      ClientProtocolException, IOException {
+    final HttpClientConfiguration config = 
+        new HttpClientConfiguration("jUnit_retry_" + RandomStringUtils.randomAlphabetic(3));
+    config.setHttpErrorRetryCount(0);
+    
+    CloseableHttpClient client = httpClientFactory.getHttpClient(config);
+    Assert.assertNotNull("No httpClient", client);
+        
+    mockWebServer = new MockWebServer();
+    mockServerUrl = mockWebServer.url("/sp/junit");
+    mockWebServer.enqueue(new MockResponse()
+        .setSocketPolicy(SocketPolicy.NO_RESPONSE)
+        .setResponseCode(HttpURLConnection.HTTP_NO_CONTENT));       
+    mockWebServer.enqueue(new MockResponse().setResponseCode(200)
+        .setBody("GetData"));
+
+    //request webservice
+    final HttpUriRequest httpGet1 = new HttpGet(mockServerUrl.url().toString());
+    try {
+      client.execute(httpGet1);    
+      Assert.fail("Max retry failed");
+      
+    } catch (SocketTimeoutException e) {
+      Assert.assertNotNull("No errorMsg", e.getMessage());
+      
+    }        
+  }
+  
+  @Test
   public void getCustomClientBasicAuthNoPassword() throws EaafException {
     final HttpClientConfiguration config = new HttpClientConfiguration("jUnit");
     config.setAuthMode("password");
@@ -370,4 +575,5 @@ public class HttpClientFactoryTest {
     Assert.assertEquals("http statusCode", 200, httpResp2.getStatusLine().getStatusCode());
 
   }
+  
 }
diff --git a/eaaf_core_utils/src/test/resources/data/config1.properties b/eaaf_core_utils/src/test/resources/data/config1.properties
index 25bd201f..93729b15 100644
--- a/eaaf_core_utils/src/test/resources/data/config1.properties
+++ b/eaaf_core_utils/src/test/resources/data/config1.properties
@@ -2,4 +2,8 @@ security.hsmfacade.host=eid.a-sit.at
 security.hsmfacade.port=9050
 security.hsmfacade.trustedsslcert=src/test/resources/data/hsm_facade_trust_root.crt
 security.hsmfacade.username=authhandler-junit
-security.hsmfacade.password=supersecret123
\ No newline at end of file
+security.hsmfacade.password=supersecret123
+
+client.http.connection.timeout.socket=1
+client.http.connection.timeout.connection=1
+client.http.connection.timeout.request=1
\ No newline at end of file