DATAGO-116001 code complete

Author: rudraneel-chakraborty

service/application/src/test/java/com/solace/maas/ep/event/management/agent/plugin/config/VMRPropertiesTests.java

@@ -266,7 +266,7 @@ void testNoGatewayConnectionProperties() {
     void testSetDefaultTrustStoreCalledWhenCustomCaCertsPresent() {
         // Spy on vmrProperties to mock getCustomCaCertsPresentEnv and verify setDefaultTrustStore is called
         VMRProperties spyVmrProperties = spy(vmrProperties);
-        when(spyVmrProperties.getCustomCaCertsPresentEnv()).thenReturn("1");
+        when(spyVmrProperties.isCustomCACertConfigured()).thenReturn(true);
         doNothing().when(spyVmrProperties).setDefaultTrustStore(any(Properties.class));
 
         MessagingServiceConnectionProperties connectionProps = createConnectionProperties(false, null, null, null, null, null);
@@ -283,7 +283,7 @@ void testSetDefaultTrustStoreCalledWhenCustomCaCertsPresent() {
     void testSetDefaultTrustStoreNotCalledWhenCustomCaCertsNotPresent() {
         // Spy on vmrProperties to mock getCustomCaCertsPresentEnv and verify setDefaultTrustStore is NOT called
         VMRProperties spyVmrProperties = spy(vmrProperties);
-        when(spyVmrProperties.getCustomCaCertsPresentEnv()).thenReturn(null);
+        when(spyVmrProperties.isCustomCACertConfigured()).thenReturn(false);
 
         MessagingServiceConnectionProperties connectionProps = createConnectionProperties(false, null, null, null, null, null);
         when(gatewayMessagingProperties.getConnections()).thenReturn(Collections.singletonList(connectionProps));

service/plugin/src/main/java/com/solace/maas/ep/event/management/agent/plugin/config/VMRProperties.java

@@ -137,19 +137,19 @@ private void configureDefaultTrustStore(Properties properties) {
             return;
         }
 
-        String customCaCertsPresent = getCustomCaCertsPresentEnv();
-        if (!"1".equals(customCaCertsPresent)) {
-            log.debug("Custom CA certificates not present (CUSTOM_CA_CERTS_PRESENT={}). Skipping explicit default truststore configuration.",
-                    customCaCertsPresent);
+        if (!isCustomCACertConfigured()) {
+            log.debug("Custom CA certificates not present. Skipping explicit default truststore configuration.");
             return;
         }
 
         setDefaultTrustStore(properties);
     }
 
 
-    String getCustomCaCertsPresentEnv() {
-        return System.getenv("CUSTOM_CA_CERTS_PRESENT");
+    boolean isCustomCACertConfigured() {
+        String customCaCertsPresent = System.getenv("CUSTOM_CA_CERTS_PRESENT");
+
+        return ("1".equals(customCaCertsPresent));
     }
 
     void setDefaultTrustStore(Properties properties) {