Fix merge conflicts

Ericsson · Sep 27, 2022 · ed65728 · ed65728
1 parent c1c050d
commit ed65728
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...in/java/com/ericsson/bss/cassandra/ecchronos/application/ReloadingCertificateHandler.java b/...in/java/com/ericsson/bss/cassandra/ecchronos/application/ReloadingCertificateHandler.java
@@ -175,9 +175,9 @@ protected static SslContext createSSLContext(TLSConfig tlsConfig) throws IOExcep
             builder.keyManager(keyManagerFactory);
             builder.trustManager(trustManagerFactory);
         }
-        if (tlsConfig.getCipherSuites().isPresent())
+        if (tlsConfig.getCipher_suites().isPresent())
         {
-            builder.ciphers(Arrays.asList(tlsConfig.getCipherSuites().get()));
+            builder.ciphers(Arrays.asList(tlsConfig.getCipher_suites().get()));
         }
         return builder.protocols(tlsConfig.getProtocols()).build();
     }

diff --git a/...tion/src/main/java/com/ericsson/bss/cassandra/ecchronos/application/config/TLSConfig.java b/...tion/src/main/java/com/ericsson/bss/cassandra/ecchronos/application/config/TLSConfig.java
@@ -128,7 +128,7 @@ public final String getProtocol()
         return protocol;
     }
 
-    public String[] getProtocols()
+    public final String[] getProtocols()
     {
         return protocol.split(",");
     }
@@ -201,7 +201,7 @@ public final boolean equals(final Object o)
         }
         TLSConfig tlsConfig = (TLSConfig) o;
         return enabled == tlsConfig.enabled
-                require_endpoint_verification == tlsConfig.require_endpoint_verification
+                && require_endpoint_verification == tlsConfig.require_endpoint_verification
                 && Objects.equals(keystore, tlsConfig.keystore)
                 && Objects.equals(keystore_password, tlsConfig.keystore_password)
                 && Objects.equals(truststore, tlsConfig.truststore)