ARTEMIS-5588 allow config reload when there is no xml, just property files

Author: gtully

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

@@ -3385,21 +3385,22 @@ synchronized boolean initialisePart1(boolean scalingDown) throws Exception {
       if (configurationFileRefreshPeriod > 0) {
          this.reloadManager = new ReloadManagerImpl(getScheduledPool(), executorFactory.getExecutor(), configurationFileRefreshPeriod);
 
-         if (configuration.getConfigurationUrl() != null && getScheduledPool() != null) {
-            final URL configUrl = configuration.getConfigurationUrl();
-            ReloadCallback xmlConfigReload = uri -> {
-               // ignore the argument from the callback such that we can respond
-               // to property file locations with a full reload
-               reloadConfigurationFile(configUrl);
-            };
-            reloadManager.addCallback(configUrl, xmlConfigReload);
-
-            // watch properties and reload xml config
-            String propsLocations = configuration.resolvePropertiesSources(propertiesFileUrl);
-            if (propsLocations != null) {
-               for (String fileUrl : propsLocations.split(",")) {
-                  reloadManager.addCallback(new File(fileUrl).toURI().toURL(), xmlConfigReload);
-               }
+         final URL configUrl = configuration.getConfigurationUrl();
+         ReloadCallback fullConfigReloadCallback = uri -> {
+            // ignore the argument from the callback such that we can respond
+            // to property file locations with a full reload
+            reloadConfigurationFile(configUrl);
+         };
+
+         if (configUrl != null) {
+            reloadManager.addCallback(configUrl, fullConfigReloadCallback);
+         }
+
+         // watch properties and reload config
+         String propsLocations = configuration.resolvePropertiesSources(propertiesFileUrl);
+         if (propsLocations != null) {
+            for (String fileUrl : propsLocations.split(",")) {
+               reloadManager.addCallback(new File(fileUrl).toURI().toURL(), fullConfigReloadCallback);
             }
          }
 
@@ -4624,9 +4625,14 @@ public void reloadConfigurationFile() throws Exception {
    }
 
    private void reloadConfigurationFile(URL uri) throws Exception {
-      Configuration config = new FileConfigurationParser().parseMainConfig(uri.openStream());
-      LegacyJMSConfiguration legacyJMSConfiguration = new LegacyJMSConfiguration(config);
-      legacyJMSConfiguration.parseConfiguration(uri.openStream());
+      Configuration config = null;
+      if (uri == null) {
+         config = new ConfigurationImpl();
+      } else {
+         config = new FileConfigurationParser().parseMainConfig(uri.openStream());
+         LegacyJMSConfiguration legacyJMSConfiguration = new LegacyJMSConfiguration(config);
+         legacyJMSConfiguration.parseConfiguration(uri.openStream());
+      }
       configuration.setSecurityRoles(config.getSecurityRoles());
       configuration.setAddressSettings(config.getAddressSettings());
       configuration.setDivertConfigurations(config.getDivertConfigurations());

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ConfigurationTest.java

@@ -22,6 +22,7 @@
 
 import java.io.File;
 import java.io.FileOutputStream;
+import java.util.Properties;
 
 import org.apache.activemq.artemis.api.core.SimpleString;
 import org.apache.activemq.artemis.core.config.CoreQueueConfiguration;
@@ -82,7 +83,7 @@ public void testPropertiesConfigReload() throws Exception {
       propsFile.createNewFile();
 
       ConfigurationImpl.InsertionOrderedProperties config = new ConfigurationImpl.InsertionOrderedProperties();
-      config.put("configurationFileRefreshPeriod", "500");
+      config.put("configurationFileRefreshPeriod", "100");
 
       config.put("addressConfigurations.mytopic_3.routingTypes", "MULTICAST");
 
@@ -161,6 +162,55 @@ public void testPropertiesConfigReload() throws Exception {
       }
    }
 
+   @Test
+   public void testPropertiesOnlyConfigReload() throws Exception {
+
+      File propsFile = new File(getTestDirfile(), "somemore.props");
+      propsFile.createNewFile();
+
+
+      Properties properties = new ConfigurationImpl.InsertionOrderedProperties();
+      properties.put("configurationFileRefreshPeriod", "100");
+      properties.put("persistenceEnabled", "false");
+      properties.put("connectionRouters.joe.localTargetFilter", "LF");
+
+      try (FileOutputStream outStream = new FileOutputStream(propsFile)) {
+         properties.store(outStream, null);
+      }
+      assertTrue(propsFile.exists());
+
+      FileConfiguration fc = new FileConfiguration();
+      ActiveMQJAASSecurityManager sm = new ActiveMQJAASSecurityManager(InVMLoginModule.class.getName(), new SecurityConfiguration());
+      ActiveMQServer server = addServer(new ActiveMQServerImpl(fc, sm));
+      server.setProperties(propsFile.getAbsolutePath());    // no xml config
+      try {
+
+         server.start();
+
+         assertEquals(1, server.getConfiguration().getConnectionRouters().size());
+         assertEquals("LF", server.getConfiguration().getConnectionRouters().get(0).getLocalTargetFilter());
+
+         properties.put("persistenceEnabled", "false");
+         properties.put("configurationFileRefreshPeriod", "100");
+
+         // verify update
+         properties.put("connectionRouters.joe.localTargetFilter", "UPDATED");
+         try (FileOutputStream outStream = new FileOutputStream(propsFile)) {
+            properties.store(outStream, null);
+         }
+
+         Wait.assertTrue(() -> {
+            return "UPDATED".equals(server.getConfiguration().getConnectionRouters().get(0).getLocalTargetFilter());
+         });
+
+      } finally {
+         try {
+            server.stop();
+         } catch (Exception e) {
+         }
+      }
+   }
+
    protected ActiveMQServer getActiveMQServer(String brokerConfig) throws Exception {
       FileConfiguration fc = new FileConfiguration();
       FileJMSConfiguration fileConfiguration = new FileJMSConfiguration();