Fix validation

Author: sfuhrm

src/main/java/com/ionos/go/plugin/notifier/ValidateConfigurationHandler.java

@@ -140,13 +140,17 @@ private void validateCondition(ValidateConfigurationRequest validateRequest, Lis
             response.add(new ValidateConfigurationResponse(Constants.PARAM_CONDITION, Constants.PARAM_CONDITION + " is empty"));
         } else {
             try {
+                String nonTrueOrFalse = null;
                 TemplateHandler handler = new TemplateHandler(Constants.PARAM_CONDITION, condition);
                 for (StageStatusRequest sample : newSampleStageStatusRequests()) {
                     String shouldBeBool = handler.eval(sample, serverInfo);
                     if (!(shouldBeBool.equals("true") || shouldBeBool.equals("false"))) {
-                        response.add(new ValidateConfigurationResponse(Constants.PARAM_CONDITION, "Condition should eval to true or false, but evals to: " + shouldBeBool));
+                        nonTrueOrFalse = shouldBeBool;
                     }
                 }
+                if (nonTrueOrFalse != null) {
+                    response.add(new ValidateConfigurationResponse(Constants.PARAM_CONDITION, "Condition should eval to true or false, but evals to: " + nonTrueOrFalse));
+                }
             }
             catch (Exception e) {
                 LOGGER.warn("Exception in " + Constants.PARAM_CONDITION, e);

src/test/java/com/ionos/go/plugin/notifier/GoNotifierPluginValidateConfigurationTest.java

@@ -121,6 +121,22 @@ public void testHandleValidateConfigurationWithConditionAccessingUndefinedProper
         assertEquals(Constants.PARAM_CONDITION, validateConfigurationResponses[0].getKey());
     }
 
+    @Test
+    public void testHandleValidateConfigurationWithConditionNotTrueOrFalse() {
+        Map<String, Map<String, String>> pluginSettings = newGoodPluginSettingsTemplate();
+        pluginSettings.put(Constants.PARAM_CONDITION, Collections.singletonMap(Constants.FIELD_VALUE, "tralse"));
+        request.setPluginSettings(pluginSettings);
+        GoPluginApiResponse response = getGoNotifierPlugin().handle(
+                GoCdObjects.request(Constants.PLUGIN_VALIDATE_CONFIGURATION, getGson().toJson(request)));
+        assertNotNull(response);
+        assertEquals(HttpStatus.SC_OK, response.responseCode());
+        assertEquals(Collections.emptyMap(), response.responseHeaders());
+        ValidateConfigurationResponse[] validateConfigurationResponses = getGson().fromJson(response.responseBody(), ValidateConfigurationResponse[].class);
+        assertEquals(1, validateConfigurationResponses.length);
+        assertEquals(Constants.PARAM_CONDITION, validateConfigurationResponses[0].getKey());
+        assertTrue("Should contain 'true or false'", validateConfigurationResponses[0].getMessage().contains("true or false"));
+    }
+
     @Test
     public void testHandleValidateConfigurationWithMalformedProxyUrl() {
         Map<String, Map<String, String>> pluginSettings = newGoodPluginSettingsTemplate();
@@ -134,6 +150,7 @@ public void testHandleValidateConfigurationWithMalformedProxyUrl() {
         ValidateConfigurationResponse[] validateConfigurationResponses = getGson().fromJson(response.responseBody(), ValidateConfigurationResponse[].class);
         assertEquals(1, validateConfigurationResponses.length);
         assertEquals(Constants.PARAM_PROXY_URL, validateConfigurationResponses[0].getKey());
+        assertEquals("Malformed url: unknown protocol: hppt", validateConfigurationResponses[0].getMessage());
     }
 
     @Test
@@ -149,5 +166,6 @@ public void testHandleValidateConfigurationWithMalformedWebhookUrl() {
         ValidateConfigurationResponse[] validateConfigurationResponses = getGson().fromJson(response.responseBody(), ValidateConfigurationResponse[].class);
         assertEquals(1, validateConfigurationResponses.length);
         assertEquals(Constants.PARAM_WEBHOOK_URL, validateConfigurationResponses[0].getKey());
+        assertEquals("Malformed url: unknown protocol: hppt", validateConfigurationResponses[0].getMessage());
     }
 }