Correcting custom keystore

Using custom keystore even if "Accept Any Certificate" is disabled.

Author: tomasbjerre

CHANGELOG.md

@@ -6,7 +6,7 @@ Changelog of Pull Request Notifier for Bitbucket.
 ### No issue
   doc
 
-  [c83497209554f52](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/c83497209554f52) Tomas Bjerre *2019-10-01 14:33:50*
+  [0965b48f845c45b](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/0965b48f845c45b) Tomas Bjerre *2019-10-01 14:37:09*
 
   Create FUNDING.yml
 

pom.xml

@@ -337,4 +337,4 @@ Changelog of Pull Request Notifier for Bitbucket.
   <quick.reload.version>2.0.0</quick.reload.version>
   <amps.version>8.0.2</amps.version>
  </properties>
-</project>
+</project>

src/main/java/se/bjurr/prnfb/http/UrlInvoker.java

@@ -307,10 +307,10 @@ private SSLContext newSslContext() throws Exception {
     final SSLContextBuilder sslContextBuilder = SSLContexts.custom();
     if (this.shouldAcceptAnyCertificate) {
       doAcceptAnyCertificate(sslContextBuilder);
-      if (this.clientKeyStore.getKeyStore().isPresent()) {
-        sslContextBuilder.loadKeyMaterial(
-            this.clientKeyStore.getKeyStore().get(), this.clientKeyStore.getPassword());
-      }
+    }
+    if (this.clientKeyStore.getKeyStore().isPresent()) {
+      sslContextBuilder.loadKeyMaterial(
+          this.clientKeyStore.getKeyStore().get(), this.clientKeyStore.getPassword());
     }
 
     return sslContextBuilder.build();

src/test/java/se/bjurr/prnfb/http/UrlInvokerTest.java

@@ -3,6 +3,7 @@
 import static com.google.common.base.Optional.of;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 import static se.bjurr.prnfb.http.UrlInvoker.HTTP_METHOD.DELETE;
 import static se.bjurr.prnfb.http.UrlInvoker.HTTP_METHOD.GET;
 import static se.bjurr.prnfb.http.UrlInvoker.HTTP_METHOD.POST;
@@ -31,11 +32,12 @@ public void before() {
     this.urlInvoker =
         new UrlInvoker() {
           @Override
-          HttpResponse doInvoke(HttpRequestBase httpRequest, HttpClientBuilder builder) {
+          HttpResponse doInvoke(
+              final HttpRequestBase httpRequest, final HttpClientBuilder builder) {
             UrlInvokerTest.this.httpRequestBase = httpRequest;
             try {
               return new HttpResponse(new URI("http://fake.com"), 200, "");
-            } catch (URISyntaxException e) {
+            } catch (final URISyntaxException e) {
               e.printStackTrace();
               return null;
             }
@@ -60,7 +62,7 @@ public void testThatHeadersAreAdded() {
 
   @Test
   public void testThatHeadersAreAddedForBasicAuth() throws Exception {
-    PrnfbNotification notification =
+    final PrnfbNotification notification =
         prnfbNotificationBuilder() //
             .withUrl("http://url.com/") //
             .withUser("user") //
@@ -82,7 +84,7 @@ public void testThatHeadersAreAddedForBasicAuth() throws Exception {
 
   @Test
   public void testThatHttpEntityEnclosingRequestBaseCanBeCreatedAsPOSTWithoutContent() {
-    HttpRequestBase response =
+    final HttpRequestBase response =
         this.urlInvoker //
             .withMethod(POST) //
             .newHttpRequestBase();
@@ -95,22 +97,22 @@ public void testThatHttpEntityEnclosingRequestBaseCanBeCreatedAsPOSTWithoutConte
 
   @Test
   public void testThatHttpEntityEnclosingRequestBaseCanBeCreatedAsPUTWithContent() {
-    HttpRequestBase response =
+    final HttpRequestBase response =
         this.urlInvoker //
             .withMethod(PUT) //
             .withPostContent(Optional.of("some content")) //
             .newHttpRequestBase();
 
     assertThat(response.getMethod()) //
         .isEqualTo(PUT.name());
-    HttpEntityEnclosingRequestBase c = (HttpEntityEnclosingRequestBase) response;
+    final HttpEntityEnclosingRequestBase c = (HttpEntityEnclosingRequestBase) response;
     assertThat(c.getEntity().getContentLength()) //
         .isGreaterThan(0);
   }
 
   @Test
   public void testThatHttpRequestBaseCanBeCreatedWithDelete() {
-    HttpRequestBase response =
+    final HttpRequestBase response =
         this.urlInvoker //
             .withMethod(DELETE) //
             .newHttpRequestBase();
@@ -123,43 +125,37 @@ public void testThatHttpRequestBaseCanBeCreatedWithDelete() {
 
   @Test
   public void testThatNoneSslCanBeConfigured() throws Exception {
-    HttpClientBuilder mockedBuilder = mock(HttpClientBuilder.class);
+    final HttpClientBuilder mockedBuilder = mock(HttpClientBuilder.class);
 
     this.urlInvoker //
         .withUrlParam("http://url.com/") //
         .configureSsl(mockedBuilder);
-
-    // verify(mockedBuilder, times(0)).setSSLSocketFactory(Matchers.any());
   }
 
   @Test
   public void testThatProxyIsConfiguredIfThereIsAHostAndPort() throws Exception {
-    HttpClientBuilder mockedBuilder = mock(HttpClientBuilder.class);
+    final HttpClientBuilder mockedBuilder = mock(HttpClientBuilder.class);
 
     this.urlInvoker //
         .withUrlParam("http://url.com/") //
         .withProxyServer(of("http://proxy.com/")) //
         .withProxyPort(123) //
         .configureProxy(mockedBuilder);
-
-    // verify(mockedBuilder, times(1)).setProxy(Matchers.any());
   }
 
   @Test
   public void testThatProxyIsNotConfiguredIfThereIsNoHost() throws Exception {
-    HttpClientBuilder mockedBuilder = mock(HttpClientBuilder.class);
+    final HttpClientBuilder mockedBuilder = mock(HttpClientBuilder.class);
 
     this.urlInvoker //
         .withUrlParam("http://url.com/") //
         .withProxyPort(123) //
         .configureProxy(mockedBuilder);
-
-    // verify(mockedBuilder, times(0)).setProxy(Matchers.any());
   }
 
   @Test
   public void testThatProxyUserIsConfiguredIfItIsSet() throws Exception {
-    HttpClientBuilder mockedBuilder = mock(HttpClientBuilder.class);
+    final HttpClientBuilder mockedBuilder = mock(HttpClientBuilder.class);
 
     this.urlInvoker //
         .withUrlParam("http://url.com/") //
@@ -168,37 +164,31 @@ public void testThatProxyUserIsConfiguredIfItIsSet() throws Exception {
         .withProxyUser(of("u")) //
         .withProxyPassword(of("p")) //
         .configureProxy(mockedBuilder);
-
-    // verify(mockedBuilder,
-    // times(1)).setDefaultCredentialsProvider(Matchers.any());
-    // verify(mockedBuilder, times(1)).setProxy(Matchers.any());
   }
 
   @Test
   public void testThatProxyUserIsNotConfiguredIfNoPasswordSet() throws Exception {
-    HttpClientBuilder mockedBuilder = mock(HttpClientBuilder.class);
+    final HttpClientBuilder mockedBuilder = mock(HttpClientBuilder.class);
 
     this.urlInvoker //
         .withUrlParam("http://url.com/") //
         .withProxyServer(of("http://proxy.com/")) //
         .withProxyPort(123) //
         .withProxyUser(of("u")) //
         .configureProxy(mockedBuilder);
-
-    // verify(mockedBuilder,
-    // times(0)).setDefaultCredentialsProvider(Matchers.any());
-    // verify(mockedBuilder, times(1)).setProxy(Matchers.any());
   }
 
   @Test
   public void testThatSslCanBeConfigured() throws Exception {
-    HttpClientBuilder mockedBuilder = mock(HttpClientBuilder.class);
+    final HttpClientBuilder mockedBuilder = mock(HttpClientBuilder.class);
+    final ClientKeyStore clientKeyStore = mock(ClientKeyStore.class);
+
+    when(clientKeyStore.getKeyStore()).thenReturn(Optional.absent());
 
     this.urlInvoker //
         .withUrlParam("https://url.com/") //
+        .withClientKeyStore(clientKeyStore) //
         .configureSsl(mockedBuilder);
-
-    // verify(mockedBuilder).setSSLSocketFactory(Matchers.any());
   }
 
   @Test