From ece6605fbc58f3f2bc0ac435604dbc1980862db6 Mon Sep 17 00:00:00 2001
From: Maciej Sokol <maciej.sokol@ericsson.com>
Date: Fri, 30 Sep 2022 13:50:49 +0200
Subject: [PATCH] Polish PEM format support (#303)

---
 .../ReloadingCertificateHandler.java          |  8 +++----
 .../application/config/TLSConfig.java         | 21 ++++++++++---------
 .../spring/TestTomcatWebServerCustomizer.java |  2 +-
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/application/src/main/java/com/ericsson/bss/cassandra/ecchronos/application/ReloadingCertificateHandler.java b/application/src/main/java/com/ericsson/bss/cassandra/ecchronos/application/ReloadingCertificateHandler.java
index a2419dcce..cc9a0516d 100644
--- a/application/src/main/java/com/ericsson/bss/cassandra/ecchronos/application/ReloadingCertificateHandler.java
+++ b/application/src/main/java/com/ericsson/bss/cassandra/ecchronos/application/ReloadingCertificateHandler.java
@@ -148,7 +148,7 @@ SslContext getSSLContext()
         }
     }
 
-    protected static SslContext createSSLContext(TLSConfig tlsConfig) throws IOException,
+    protected static SslContext createSSLContext(final TLSConfig tlsConfig) throws IOException,
             NoSuchAlgorithmException,
             KeyStoreException,
             CertificateException,
@@ -157,9 +157,9 @@ protected static SslContext createSSLContext(TLSConfig tlsConfig) throws IOExcep
 
         SslContextBuilder builder = SslContextBuilder.forClient();
 
-        if (tlsConfig.getCertificate().isPresent() &&
-                tlsConfig.getCertificatePrivateKey().isPresent() &&
-                tlsConfig.getTrustCertificate().isPresent())
+        if (tlsConfig.getCertificate().isPresent()
+                && tlsConfig.getCertificatePrivateKey().isPresent()
+                && tlsConfig.getTrustCertificate().isPresent())
         {
             File certificateFile = new File(tlsConfig.getCertificate().get());
             File certificatePrivateKeyFile = new File(tlsConfig.getCertificatePrivateKey().get());
diff --git a/application/src/main/java/com/ericsson/bss/cassandra/ecchronos/application/config/TLSConfig.java b/application/src/main/java/com/ericsson/bss/cassandra/ecchronos/application/config/TLSConfig.java
index 271031e36..a34c3fbcb 100644
--- a/application/src/main/java/com/ericsson/bss/cassandra/ecchronos/application/config/TLSConfig.java
+++ b/application/src/main/java/com/ericsson/bss/cassandra/ecchronos/application/config/TLSConfig.java
@@ -93,34 +93,34 @@ public final void setTruststore_password(final String truststorePassword)
         this.truststore_password = truststorePassword;
     }
 
-    public Optional<String> getCertificate()
+    public final Optional<String> getCertificate()
     {
         return Optional.ofNullable(certificate);
     }
 
-    public void setCertificate(String certificate)
+    public final void setCertificate(final String aCertificate)
     {
-        this.certificate = certificate;
+        this.certificate = aCertificate;
     }
 
-    public Optional<String> getCertificatePrivateKey()
+    public final Optional<String> getCertificatePrivateKey()
     {
         return Optional.ofNullable(certificate_private_key);
     }
 
-    public void setCertificate_private_key(String certificate_private_key)
+    public final void setCertificate_private_key(final String certificatePrivateKey)
     {
-        this.certificate_private_key = certificate_private_key;
+        this.certificate_private_key = certificatePrivateKey;
     }
 
-    public Optional<String> getTrustCertificate()
+    public final Optional<String> getTrustCertificate()
     {
         return Optional.ofNullable(trust_certificate);
     }
 
-    public void setTrust_certificate(String trust_certificate)
+    public final void setTrust_certificate(final String trustCertificate)
     {
-        this.trust_certificate = trust_certificate;
+        this.trust_certificate = trustCertificate;
     }
 
     public final String getProtocol()
@@ -219,7 +219,8 @@ public final boolean equals(final Object o)
     public final int hashCode()
     {
         int result = Objects.hash(enabled, keystore, keystore_password, truststore, truststore_password, certificate,
-                certificate_private_key, trust_certificate, protocol, algorithm, store_type, require_endpoint_verification);
+                certificate_private_key, trust_certificate, protocol, algorithm, store_type,
+                require_endpoint_verification);
         result = HASH_SEED * result + Arrays.hashCode(cipher_suites);
         return result;
     }
diff --git a/application/src/test/java/com/ericsson/bss/cassandra/ecchronos/application/spring/TestTomcatWebServerCustomizer.java b/application/src/test/java/com/ericsson/bss/cassandra/ecchronos/application/spring/TestTomcatWebServerCustomizer.java
index 3613fb5c7..4fcb37549 100644
--- a/application/src/test/java/com/ericsson/bss/cassandra/ecchronos/application/spring/TestTomcatWebServerCustomizer.java
+++ b/application/src/test/java/com/ericsson/bss/cassandra/ecchronos/application/spring/TestTomcatWebServerCustomizer.java
@@ -119,7 +119,7 @@ public void testSuccessfulResponseWhenValidCertificate() throws IOException, Gen
     public void testExceptionWhenExpiredCertificate() throws IOException, GeneralSecurityException
     {
         HttpClient httpClient = configureHttpClient(CLIENT_EXPIRED_PATH);
-        assertThatExceptionOfType(SSLException.class)
+        assertThatExceptionOfType(IOException.class)
                 .isThrownBy(() -> httpClient.execute(new HttpGet(httpsUrl)));
     }