Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-790 Support multiple routing types in config migration tool

This commit is contained in:
Martyn Taylor 2016-12-09 18:04:33 +00:00
parent 224f62b295
commit a5031b51d1
4 changed files with 65 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/XMLConfigurationMigration.java
View File

@ -68,16 +68,8 @@ public class XMLConfigurationMigration {
private static final String jmsQueuePrefix = "jms.queue.";
private static final String jmsTopicPrefix = "jms.topic.";
private final Map<String, Address> jmsQueueAddresses = new HashMap<>();
private final Map<String, Address> jmsTopicAddresses = new HashMap<>();
private final Map<String, Address> coreAddresses = new HashMap<>();
private final Map<String, Address> aliases = new HashMap<>();
private final Document document;
private final File input;
@ -155,6 +147,7 @@ public class XMLConfigurationMigration {
queue.setName(getString(queueNode, xPathAttrName));
queue.setDurable(getString(queueNode, xPathDurable));
queue.setFilter(getString(queueNode, xPathFilter));
queue.setRoutingType("multicast");
String addressName = getString(queueNode, xPathAddress);
@ -167,6 +160,7 @@ public class XMLConfigurationMigration {
coreAddresses.put(addressName, address);
}
address.getQueues().add(queue);
address.getRoutingTypes().add("multicast");
}
// Remove Core Queues Element from Core
@ -187,80 +181,86 @@ public class XMLConfigurationMigration {
NodeList jmsQueueElements = getNodeList(xPathJMSQueues);
for (int i = 0; i < jmsQueueElements.getLength(); i++) {
Node jmsQueueElement = jmsQueueElements.item(i);
String name = jmsQueuePrefix + getString(jmsQueueElement, xPathAttrName);
String name = getString(jmsQueueElement, xPathAttrName);
Address address;
if (jmsQueueAddresses.containsKey(name)) {
address = jmsQueueAddresses.get(name);
if (coreAddresses.containsKey(name)) {
address = coreAddresses.get(name);
} else {
address = new Address();
address.setName(name);
address.setRoutingType("anycast");
jmsQueueAddresses.put(name, address);
address.getRoutingTypes().add("anycast");
coreAddresses.put(name, address);
}
Queue queue = new Queue();
queue.setName(name);
queue.setName(jmsQueuePrefix + name);
queue.setDurable(getString(jmsQueueElement, xPathDurable));
queue.setFilter(getString(jmsQueueElement, xPathSelector));
queue.setRoutingType("anycast");
address.getQueues().add(queue);
address.getRoutingTypes().add("anycast");
}
NodeList jmsTopicElements = getNodeList(xPathJMSTopics);
for (int i = 0; i < jmsTopicElements.getLength(); i++) {
Node jmsTopicElement = jmsTopicElements.item(i);
String name = jmsTopicPrefix + getString(jmsTopicElement, xPathAttrName);
String name = getString(jmsTopicElement, xPathAttrName);
Address address;
if (jmsTopicAddresses.containsKey(name)) {
address = jmsTopicAddresses.get(name);
if (coreAddresses.containsKey(name)) {
address = coreAddresses.get(name);
} else {
address = new Address();
address.setName(name);
address.setRoutingType("multicast");
jmsTopicAddresses.put(name, address);
address.getRoutingTypes().add("multicast");
coreAddresses.put(name, address);
}
Queue queue = new Queue();
queue.setName(name);
address.getQueues().add(queue);
address.getRoutingTypes().add("multicast");
}
jmsElement.getParentNode().removeChild(jmsElement);
return true;
}
public void writeAddressesToDocument() {
public void writeAddressesToDocument() throws XPathExpressionException {
Element addressElement = document.createElement("addresses");
writeAddressListToDoc("= JMS Queues =", jmsQueueAddresses.values(), addressElement);
writeAddressListToDoc("= JMS Topics =", jmsTopicAddresses.values(), addressElement);
writeAddressListToDoc("= Core Queues =", coreAddresses.values(), addressElement);
writeAddressListToDoc(coreAddresses.values(), addressElement);
coreElement.appendChild(addressElement);
}
private void writeAddressListToDoc(String comment, Collection<Address> addresses, Node addressElement) {
private void writeAddressListToDoc(Collection<Address> addresses,
Node addressElement) throws XPathExpressionException {
if (addresses.isEmpty())
return;
addressElement.appendChild(document.createComment("=================="));
addressElement.appendChild(document.createComment(comment));
addressElement.appendChild(document.createComment("=================="));
for (Address addr : addresses) {
Element eAddr = document.createElement("address");
eAddr.setAttribute("name", addr.getName());
eAddr.setAttribute("type", addr.getRoutingType());
Element eMulticast = null;
if (addr.getRoutingTypes().contains("multicast")) {
eMulticast = (Element) eAddr.getElementsByTagName("multicast").item(0);
if (eMulticast == null) {
eMulticast = document.createElement("multicast");
eAddr.appendChild(eMulticast);
}
}
Element eAnycast = null;
if (addr.getRoutingTypes().contains("anycast")) {
eAnycast = (Element) eAddr.getElementsByTagName("anycast").item(0);
if (eAnycast == null) {
eAnycast = document.createElement("anycast");
eAddr.appendChild(eAnycast);
}
}
if (addr.getQueues().size() > 0) {
Element eQueues = document.createElement("queues");
for (Queue queue : addr.getQueues()) {
Element eQueue = document.createElement("queue");
eQueue.setAttribute("name", queue.getName());
eQueue.setAttribute("max-consumers", addr.getDefaultMaxConsumers());
eQueue.setAttribute("delete-on-no-consumers", addr.getDefaultDeleteOnNoConsumers());
if (queue.getDurable() != null && !queue.getDurable().isEmpty()) {
Element eDurable = document.createElement("durable");
@ -274,9 +274,14 @@ public class XMLConfigurationMigration {
eQueue.appendChild(eFilter);
}
eQueues.appendChild(eQueue);
if (queue.getRoutingType().equals("anycast")) {
eAnycast.appendChild(eQueue);
} else if (queue.getRoutingType().equals("multicast")) {
eMulticast.appendChild(eQueue);
} else {
System.err.print("Unknown Routing Type Found for Queue: " + queue.getName());
}
}
eAddr.appendChild(eQueues);
}
addressElement.appendChild(eAddr);
}

24
artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/addressing/Address.java
View File

@ -17,13 +17,15 @@
package org.apache.activemq.artemis.tools.migrate.config.addressing;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
public class Address {
private String name;
private String routingType = "multicast";
private Set<String> routingTypes = new HashSet<>();
private String defaultMaxConsumers = "-1";
@ -39,30 +41,18 @@ public class Address {
this.name = name;
}
public String getRoutingType() {
return routingType;
public Set<String> getRoutingTypes() {
return routingTypes;
}
public void setRoutingType(String routingType) {
this.routingType = routingType;
public void setRoutingTypes(Set<String> routingTypes) {
this.routingTypes = routingTypes;
}
public String getDefaultMaxConsumers() {
return defaultMaxConsumers;
}
public void setDefaultMaxConsumers(String defaultMaxConsumers) {
this.defaultMaxConsumers = defaultMaxConsumers;
}
public String getDefaultDeleteOnNoConsumers() {
return defaultDeleteOnNoConsumers;
}
public void setDefaultDeleteOnNoConsumers(String defaultDeleteOnNoConsumers) {
this.defaultDeleteOnNoConsumers = defaultDeleteOnNoConsumers;
}
public List<Queue> getQueues() {
return queues;
}

10
artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/addressing/Queue.java
View File

@ -24,6 +24,8 @@ public class Queue {
String durable;
String routingType;
public String getName() {
return name;
}
@ -47,4 +49,12 @@ public class Queue {
public void setDurable(String durable) {
this.durable = durable;
}
public String getRoutingType() {
return routingType;
}
public void setRoutingType(String routingType) {
this.routingType = routingType;
}
}

3
artemis-tools/src/test/resources/broker.xml
View File

@ -29,6 +29,9 @@
<topic name="topic1"/>
<topic name="topic2"/>
<topic name="topic3"/>
<queue name="orders"/>
<topic name="orders"/>
</jms>
<core xmlns="urn:activemq:core">