Revert "Merge pull request #29730 from vespa-engine/revert-29692-jonmv/keep-config-change-actions-in-dev"

This reverts commit ef3db955e75e6df68a2a358feb5b95e44979377f, reversing
changes made to d73a4b8daaffd30c78d3894a73e5b2eb79af06af.

2 files changed, 23 insertions, 10 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/CertificateRemovalChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/CertificateRemovalChangeValidatorTest.java
index 6b7df8871aa..bc36b800bfb 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/CertificateRemovalChangeValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/CertificateRemovalChangeValidatorTest.java
@@ -23,9 +23,11 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 public class CertificateRemovalChangeValidatorTest {
 
     private static final String validationOverrides =
-            "<validation-overrides>\n" +
-            "    <allow until='2000-01-14' comment='test override'>certificate-removal</allow>\n" +
-            "</validation-overrides>\n";
+            """
+            <validation-overrides>
+                <allow until='2000-01-14' comment='test override'>certificate-removal</allow>
+            </validation-overrides>
+            """;
 
     @Test
     void validate() {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidatorTest.java
index 3fd3180b37e..9e0eab9aba7 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidatorTest.java
@@ -22,19 +22,28 @@ import static org.junit.jupiter.api.Assertions.fail;
 public class IndexingModeChangeValidatorTest {
 
     @Test
+    void testChangingIndexModeFromIndexedToStreamingWhenDisallowedButInDev() {
+        ValidationTester tester = new ValidationTester();
+
+        VespaModel oldModel =
+                tester.deploy(null, getServices("index"), Environment.dev, "<validation-overrides />").getFirst();
+        List<ConfigChangeAction> actions = tester.deploy(oldModel, getServices("streaming"), Environment.dev, "<calidation-overrides />").getSecond();
+        assertReindexingChange("Document type 'music' in cluster 'default-content' changed indexing mode from 'indexed' to 'streaming'", actions);
+    }
+
+    @Test
     void testChangingIndexModeFromIndexedToStreamingWhenDisallowed() {
         ValidationTester tester = new ValidationTester();
 
         VespaModel oldModel =
                 tester.deploy(null, getServices("index"), Environment.prod, "<validation-overrides />").getFirst();
         try {
-            List<ConfigChangeAction> changeActions =
-                    tester.deploy(oldModel, getServices("streaming"), Environment.prod, "<calidation-overrides />").getSecond();
+            tester.deploy(oldModel, getServices("streaming"), Environment.prod, "<calidation-overrides />").getSecond();
             fail("Should throw on disallowed config change action");
         }
         catch (ValidationException e) {
-            assertEquals("indexing-mode-change:\n" +
-                    "\tDocument type 'music' in cluster 'default-content' changed indexing mode from 'indexed' to 'streaming'\n" +
+            assertEquals("indexing-mode-change: " +
+                    "Document type 'music' in cluster 'default-content' changed indexing mode from 'indexed' to 'streaming'. " +
                     "To allow this add <allow until='yyyy-mm-dd'>indexing-mode-change</allow> to validation-overrides.xml, see https://docs.vespa.ai/en/reference/validation-overrides.html",
                     e.getMessage());
         }
@@ -94,8 +103,10 @@ public class IndexingModeChangeValidatorTest {
     }
 
     private static final String validationOverrides =
-            "<validation-overrides>\n" +
-            "    <allow until='2000-01-14' comment='test override'>indexing-mode-change</allow>\n" +
-            "</validation-overrides>\n";
+            """
+            <validation-overrides>
+                <allow until='2000-01-14' comment='test override'>indexing-mode-change</allow>
+            </validation-overrides>
+            """;
 
 }