Mailing-List: contact dev-help@activemq.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@activemq.apache.org
From: michaelandrepearce <git@git.apache.org>
To: dev@activemq.apache.org
Reply-To: dev@activemq.apache.org
References: <git-pr-1345-activemq-artemis@git.apache.org>
In-Reply-To: <git-pr-1345-activemq-artemis@git.apache.org>
Subject: [GitHub] activemq-artemis pull request #1345: ARTEMIS-1235 Support queue and address ...
Content-Type: text/plain
Message-Id: <20170622113624.9F30BDFB92@git1-us-west.apache.org>
Date: Thu, 22 Jun 2017 11:36:23 +0000 (UTC)
archived-at: Thu, 22 Jun 2017 11:36:28 -0000

Github user michaelandrepearce commented on a diff in the pull request:

    https://github.com/apache/activemq-artemis/pull/1345#discussion_r123486475
  
    --- Diff: artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java ---
    @@ -2313,6 +2318,53 @@ private void deploySecurityFromConfiguration() {
           }
        }
     
    +   private void undeployAddressesAndQueueNotInConfiguration() throws Exception {
    +      undeployAddressesAndQueueNotInConfiguration(configuration);
    +   }
    +
    +   private void undeployAddressesAndQueueNotInConfiguration(Configuration configuration) throws Exception {
    +      Set<String> addressesInConfig = configuration.getAddressConfigurations().stream()
    +                                                   .map(CoreAddressConfiguration::getName)
    +                                                   .collect(Collectors.toSet());
    +
    +      Set<String> queuesInConfig = configuration.getAddressConfigurations().stream()
    +                                                .map(CoreAddressConfiguration::getQueueConfigurations)
    +                                                .flatMap(List::stream).map(CoreQueueConfiguration::getName)
    +                                                .collect(Collectors.toSet());
    +
    +      for (SimpleString addressName : listAddressNames()) {
    +         AddressSettings addressSettings = getAddressSettingsRepository().getMatch(addressName.toString());
    +
    +         if (!addressesInConfig.contains(addressName.toString()) && addressSettings.getConfigDeleteAddresses() == DeletionPolicy.FORCE) {
    +            for (Queue queue : listQueues(addressName)) {
    +               ActiveMQServerLogger.LOGGER.undeployQueue(queue.getName());
    +               queue.deleteQueue(true);
    +            }
    +            ActiveMQServerLogger.LOGGER.undeployAddress(addressName);
    +            removeAddressInfo(addressName, null);
    +         } else if (addressSettings.getConfigDeleteQueues() == DeletionPolicy.FORCE) {
    +            for (Queue queue : listConfiguredQueues(addressName)) {
    +               if (!queuesInConfig.contains(queue.getName().toString())) {
    --- End diff --
    
    @mtaylor yes indeed this is what i was trying to convey, but you manage to express it a lot cleaner than i can. Thanks.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---