ARTEMIS-1023 - fixx Openwire auto creation of queues
https://issues.apache.org/jira/browse/ARTEMIS-1023
This commit is contained in:
parent
a4beb18a6e
commit
8ab7588910
|
@ -731,7 +731,7 @@ public class OpenWireConnection extends AbstractRemotingConnection implements Se
|
||||||
CheckType checkType = dest.isTemporary() ? CheckType.CREATE_NON_DURABLE_QUEUE : CheckType.CREATE_DURABLE_QUEUE;
|
CheckType checkType = dest.isTemporary() ? CheckType.CREATE_NON_DURABLE_QUEUE : CheckType.CREATE_DURABLE_QUEUE;
|
||||||
server.getSecurityStore().check(qName, checkType, this);
|
server.getSecurityStore().check(qName, checkType, this);
|
||||||
server.checkQueueCreationLimit(getUsername());
|
server.checkQueueCreationLimit(getUsername());
|
||||||
server.createQueue(qName, RoutingType.ANYCAST, qName, connInfo == null ? null : SimpleString.toSimpleString(connInfo.getUserName()), true, false);
|
server.createQueue(qName, RoutingType.ANYCAST, qName, connInfo == null ? null : SimpleString.toSimpleString(connInfo.getUserName()), null,true, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -287,6 +287,9 @@ public interface ActiveMQServer extends ServiceComponent {
|
||||||
Queue createQueue(SimpleString address, RoutingType routingType, SimpleString queueName, SimpleString filter,
|
Queue createQueue(SimpleString address, RoutingType routingType, SimpleString queueName, SimpleString filter,
|
||||||
boolean durable, boolean temporary) throws Exception;
|
boolean durable, boolean temporary) throws Exception;
|
||||||
|
|
||||||
|
Queue createQueue(final SimpleString address, final RoutingType routingType, final SimpleString queueName, final SimpleString user,
|
||||||
|
final SimpleString filterString, final boolean durable, final boolean temporary) throws Exception;
|
||||||
|
|
||||||
Queue createQueue(SimpleString address, RoutingType routingType, SimpleString queueName, SimpleString filter,
|
Queue createQueue(SimpleString address, RoutingType routingType, SimpleString queueName, SimpleString filter,
|
||||||
boolean durable, boolean temporary, int maxConsumers, boolean purgeOnNoConsumers,
|
boolean durable, boolean temporary, int maxConsumers, boolean purgeOnNoConsumers,
|
||||||
boolean autoCreateAddress) throws Exception;
|
boolean autoCreateAddress) throws Exception;
|
||||||
|
|
|
@ -1527,6 +1527,18 @@ public class ActiveMQServerImpl implements ActiveMQServer {
|
||||||
return createQueue(address, routingType, queueName, filterString, durable, temporary, as.getDefaultMaxConsumers(), as.isDefaultPurgeOnNoConsumers(), as.isAutoCreateAddresses());
|
return createQueue(address, routingType, queueName, filterString, durable, temporary, as.getDefaultMaxConsumers(), as.isDefaultPurgeOnNoConsumers(), as.isAutoCreateAddresses());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Queue createQueue(final SimpleString address,
|
||||||
|
final RoutingType routingType,
|
||||||
|
final SimpleString queueName,
|
||||||
|
final SimpleString user,
|
||||||
|
final SimpleString filterString,
|
||||||
|
final boolean durable,
|
||||||
|
final boolean temporary) throws Exception {
|
||||||
|
AddressSettings as = getAddressSettingsRepository().getMatch(address.toString());
|
||||||
|
return createQueue(address, routingType, queueName, filterString, user, durable, temporary, false, as.getDefaultMaxConsumers(), as.isDefaultPurgeOnNoConsumers(), as.isAutoCreateAddresses());
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Queue createQueue(final SimpleString address,
|
public Queue createQueue(final SimpleString address,
|
||||||
final RoutingType routingType,
|
final RoutingType routingType,
|
||||||
|
|
|
@ -0,0 +1,59 @@
|
||||||
|
/*
|
||||||
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||||
|
* contributor license agreements. See the NOTICE file distributed with
|
||||||
|
* this work for additional information regarding copyright ownership.
|
||||||
|
* The ASF licenses this file to You under the Apache License, Version 2.0
|
||||||
|
* (the "License"); you may not use this file except in compliance with
|
||||||
|
* the License. You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
package org.apache.activemq.artemis.tests.integration.openwire.amq;
|
||||||
|
|
||||||
|
import org.apache.activemq.artemis.api.core.SimpleString;
|
||||||
|
import org.apache.activemq.artemis.core.config.Configuration;
|
||||||
|
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
|
||||||
|
import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
|
||||||
|
import org.junit.Assert;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import javax.jms.Connection;
|
||||||
|
import javax.jms.MessageProducer;
|
||||||
|
import javax.jms.Queue;
|
||||||
|
import javax.jms.Session;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
public class ProducerAutoCreateQueueTest extends BasicOpenWireTest {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void extraServerConfig(Configuration serverConfig) {
|
||||||
|
String match = "#";
|
||||||
|
Map<String, AddressSettings> asMap = serverConfig.getAddressesSettings();
|
||||||
|
asMap.get(match).setAutoCreateAddresses(true).setAutoCreateQueues(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testProducerBlockWontGetTimeout() throws Exception {
|
||||||
|
Connection connection = null;
|
||||||
|
try {
|
||||||
|
connection = factory.createConnection("admin", "password");
|
||||||
|
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
|
||||||
|
Queue trash = session.createQueue("trash");
|
||||||
|
final MessageProducer producer = session.createProducer(trash);
|
||||||
|
producer.send(session.createTextMessage("foo"));
|
||||||
|
Assert.assertNotNull(server.getPostOffice().getBinding(new SimpleString("trash")));
|
||||||
|
} finally {
|
||||||
|
if (connection != null) {
|
||||||
|
connection.close();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue