[WFCORE-6771]: Fixing several small issues with the YAML extension.

* adding WARNING traces * adding warning if YAML is adding an existing resource without any attribute * failing if unexisting attribute is used * better error messages * ignoring removal of unexisting resource * warning about ignoring unexisting resource delete operation * Fixing how we apply YAML configuration on reload * Adding configuration for YAML file size. * Adding tests for yaml Jira: https://issues.redhat.com/browse/WFCORE-6771 Signed-off-by: Emmanuel Hugonnet <[email protected]>
wildfly · Apr 5, 2024 · 9afbbae · 9afbbae
1 parent 4c6947e
commit 9afbbae
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/controller/src/main/java/org/jboss/as/controller/RunningModeControl.java b/controller/src/main/java/org/jboss/as/controller/RunningModeControl.java
@@ -61,7 +61,7 @@ public void setSuspend(Boolean suspend) {
 
     /**
      * Indicates if the configuration extension should be applied after reloading.
-     * This should occur on a reload if no changes were applied (thus sotred) or after the changes made
+     * This should occur on a reload if no changes were applied (thus stored) or after the changes made
      * by a boot cli script.
      * @return true if we should apply the configuration extension - false otherwise.
      */

diff --git a/server/src/main/java/org/jboss/as/server/operations/ServerProcessReloadHandler.java b/server/src/main/java/org/jboss/as/server/operations/ServerProcessReloadHandler.java
@@ -148,7 +148,7 @@ protected ProcessReloadHandler.ReloadContext<RunningModeControl> initializeReloa
         }
         final boolean finalSuspend = suspend;
         final boolean finalAdminOnly = adminOnly;
- 
+
         //We need to know if some changes were applied because then the resulting standalone-boot.xml would contain
         //the configuration extension changes thus we must not re-apply them. But if there are changes due to
         // a boot cli script tor if there has been no changes persisted then we must apply the configuration

diff --git a/.../java/org/jboss/as/test/manualmode/management/persistence/yaml/YamlExtensionTestCase.java b/.../java/org/jboss/as/test/manualmode/management/persistence/yaml/YamlExtensionTestCase.java
@@ -558,7 +558,6 @@ public void testPostStartCLIChangesToModelSurviveReload() throws Exception {
         Assert.assertEquals("Change set to use-deployment-logging-config is wrong", "false", result.get("use-deployment-logging-config").asString());
     }
 
-
     @Test
     public void testPostStartCLIChangesToModelDoNotSurviveRestart() throws Exception {
         container.startYamlExtension(new Path[]{testYaml});
-Original file line number
+Diff line change
@@ Expand Up @@
             Assert.assertEquals("Change set to use-deployment-logging-config is wrong", "false", result.get("use-deployment-logging-config").asString());
         }
         @Test
         public void testPostStartCLIChangesToModelDoNotSurviveRestart() throws Exception {
             container.startYamlExtension(new Path[]{testYaml});
@@ Expand Down @@