ARTEMIS-5682 broker properties, support clear of collection or map properties with the removeValue -

Author: gtully

artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java

@@ -739,7 +739,19 @@ public void setProperty(final Object bean, String name, final Object value) thro
                         throw new InvocationTargetException(e, "Can only remove named entries from collections or maps. property: " + name + ", on: " + target);
                      }
                   } else {
-                     throw new InvocationTargetException(null, "Can only remove entries from collections or maps. property: " + name + ", on: " + target);
+                     // empty the collection referenced by this property
+                     try {
+                        target = getPropertyUtils().getProperty(target, name);
+                     } catch (NoSuchMethodException e) {
+                        throw new InvocationTargetException(e, "Can only clear entries from collection or map properties that are accessible. property: " + name + ", on: " + target);
+                     }
+                     if (target instanceof Map mapToClear) {
+                        mapToClear.clear();
+                     } else if (target instanceof Collection collectionToClear) {
+                        collectionToClear.clear();
+                     } else {
+                        throw new InvocationTargetException(null, "Can only clear entries from collection or map properties. property: " + name + ", on: " + target);
+                     }
                   }
 
                   logger.trace("removed from target, bean: {}, name: {}", target.getClass(), name);

artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java

@@ -1535,6 +1535,66 @@ public void testAddressRemovalViaProperties() throws Throwable {
       assertTrue(configuration.getStatus().contains("\"errors\":[]"));
    }
 
+   @Test
+   public void testAllAddressRemovalViaProperties() throws Throwable {
+      ConfigurationImpl configuration = new ConfigurationImpl();
+
+      Properties properties = new Properties();
+
+      properties.put("addressConfigurations.\"LB.TEST\".queueConfigs.\"LB.TEST\".routingType", "ANYCAST");
+      configuration.parsePrefixedProperties(properties, null);
+
+      assertEquals(1, configuration.getAddressConfigurations().size());
+      assertEquals(1, configuration.getAddressConfigurations().get(0).getQueueConfigs().size());
+      assertTrue(configuration.getStatus().contains("\"errors\":[]"));
+
+      properties.clear();
+      properties.put("addressConfigurations", "-");
+      configuration.parsePrefixedProperties(properties, null);
+
+      assertEquals(0, configuration.getAddressConfigurations().size());
+      assertTrue(configuration.getStatus().contains("\"errors\":[]"));
+   }
+
+   @Test
+   public void testAllMapRemovalViaProperties() throws Throwable {
+      ConfigurationImpl configuration = new ConfigurationImpl();
+
+      Properties properties = new Properties();
+      properties.put("addressSettings.NeedToTrackExpired.expiryAddress", "important");
+      configuration.parsePrefixedProperties(properties, null);
+
+      assertEquals(1, configuration.getAddressSettings().size());
+      assertTrue(configuration.getStatus().contains("\"errors\":[]"));
+
+      properties.clear();
+      properties.put("addressSettings", "-");
+      configuration.parsePrefixedProperties(properties, null);
+
+      assertEquals(0, configuration.getAddressSettings().size());
+      assertTrue(configuration.getStatus().contains("\"errors\":[]"));
+   }
+
+   @Test
+   public void testRemovalInvalidViaProperties() throws Throwable {
+      ConfigurationImpl configuration = new ConfigurationImpl();
+
+      Properties properties = new Properties();
+      properties.put("HAPolicyConfiguration", "PRIMARY_ONLY");
+      configuration.parsePrefixedProperties(properties, null);
+
+      assertNotNull(configuration.getHAPolicyConfiguration());
+      assertTrue(configuration.getStatus().contains("\"errors\":[]"));
+
+      properties.clear();
+      properties.put("HAPolicyConfiguration", "-");
+      configuration.parsePrefixedProperties(properties, null);
+      assertNotNull(configuration.getHAPolicyConfiguration());
+
+      assertEquals(0, configuration.getAddressSettings().size());
+      assertTrue(configuration.getStatus().contains("InvocationTargetException"));
+   }
+
    @Test
    public void testRoleRemovalViaCustomRemoveProperties() throws Throwable {
       ConfigurationImpl configuration = new ConfigurationImpl();