activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject activemq-artemis git commit: Revert "ARTEMIS-2100 address routing-type overridden on attaching AMQP sender"
Date Thu, 01 Nov 2018 18:26:43 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 54db13326 -> 2f52e3ce2


Revert "ARTEMIS-2100 address routing-type overridden on attaching AMQP sender"

There are too many failures because of the semantic change here.

This reverts commit 1c17a4d59dc630a4ba2d3de5817dd33cbca5b431.


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/2f52e3ce
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/2f52e3ce
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/2f52e3ce

Branch: refs/heads/master
Commit: 2f52e3ce2ab2ffabe58444e4a7e23913953a5aa2
Parents: 54db133
Author: Clebert Suconic <clebertsuconic@apache.org>
Authored: Thu Nov 1 14:24:47 2018 -0400
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Thu Nov 1 14:24:52 2018 -0400

----------------------------------------------------------------------
 .../proton/ProtonServerReceiverContext.java     |  13 +--
 .../amqp/AmqpSenderRoutingTypeTest.java         | 116 -------------------
 2 files changed, 2 insertions(+), 127 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/2f52e3ce/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerReceiverContext.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerReceiverContext.java
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerReceiverContext.java
index 44b4152..0758714 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerReceiverContext.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerReceiverContext.java
@@ -19,13 +19,11 @@ package org.apache.activemq.artemis.protocol.amqp.proton;
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.artemis.api.core.ActiveMQSecurityException;
 import org.apache.activemq.artemis.api.core.RoutingType;
 import org.apache.activemq.artemis.api.core.SimpleString;
 import org.apache.activemq.artemis.core.security.CheckType;
 import org.apache.activemq.artemis.core.security.SecurityAuth;
-import org.apache.activemq.artemis.core.server.impl.AddressInfo;
 import org.apache.activemq.artemis.core.transaction.Transaction;
 import org.apache.activemq.artemis.protocol.amqp.broker.AMQPSessionCallback;
 import org.apache.activemq.artemis.protocol.amqp.exceptions.ActiveMQAMQPException;
@@ -231,15 +229,8 @@ public class ProtonServerReceiverContext extends ProtonInitializable
implements
             }
          }
       }
-      final AddressInfo addressInfo = sessionSPI.getAddress(address);
-      if (addressInfo != null && !addressInfo.getRoutingTypes().isEmpty()) {
-         if (addressInfo.getRoutingTypes().size() == 1) {
-            return addressInfo.getRoutingType();
-         }
-      }
-      RoutingType defaultRoutingType = sessionSPI.getDefaultRoutingType(address);
-      defaultRoutingType = defaultRoutingType == null ? ActiveMQDefaultConfiguration.getDefaultRoutingType()
: defaultRoutingType;
-      return defaultRoutingType;
+
+      return sessionSPI.getDefaultRoutingType(address);
    }
 
    /*

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/2f52e3ce/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSenderRoutingTypeTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSenderRoutingTypeTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSenderRoutingTypeTest.java
deleted file mode 100644
index 0d46798..0000000
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSenderRoutingTypeTest.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/**
- * 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.amqp;
-
-import java.util.Map;
-import java.util.UUID;
-
-import org.apache.activemq.artemis.api.core.RoutingType;
-import org.apache.activemq.artemis.api.core.SimpleString;
-import org.apache.activemq.artemis.api.core.client.ClientSession;
-import org.apache.activemq.artemis.core.config.Configuration;
-import org.apache.activemq.artemis.core.server.ActiveMQServer;
-import org.apache.activemq.artemis.core.server.JournalType;
-import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
-import org.apache.activemq.artemis.jms.client.ActiveMQConnection;
-import org.apache.activemq.transport.amqp.client.AmqpClient;
-import org.apache.activemq.transport.amqp.client.AmqpConnection;
-import org.apache.activemq.transport.amqp.client.AmqpSender;
-import org.apache.activemq.transport.amqp.client.AmqpSession;
-import org.hamcrest.CoreMatchers;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class AmqpSenderRoutingTypeTest extends JMSClientTestSupport {
-
-   @Override
-   protected void configureAddressPolicy(ActiveMQServer server) {
-      Configuration serverConfig = server.getConfiguration();
-      serverConfig.setJournalType(JournalType.NIO);
-      Map<String, AddressSettings> map = serverConfig.getAddressesSettings();
-      if (map.size() == 0) {
-         AddressSettings as = new AddressSettings();
-         as.setDefaultAddressRoutingType(RoutingType.ANYCAST);
-         map.put("#", as);
-      }
-   }
-
-   @Override
-   protected String getConfiguredProtocols() {
-      return "AMQP,CORE";
-   }
-
-   @Test
-   public void testAMQPSenderHonourRoutingTypeOfExistingAddress() throws Exception {
-      RoutingType routingType = server.getConfiguration().getAddressesSettings().get("#").getDefaultAddressRoutingType();
-      Assert.assertEquals(RoutingType.ANYCAST, routingType);
-      try (ActiveMQConnection coreConnection = (ActiveMQConnection) createCoreConnection();
-           ClientSession clientSession = coreConnection.getSessionFactory().createSession())
{
-         RoutingType addressRoutingType = RoutingType.MULTICAST;
-         SimpleString address = SimpleString.toSimpleString("myTopic_" + UUID.randomUUID().toString());
-         clientSession.createAddress(address, addressRoutingType, false);
-         ClientSession.AddressQuery addressQuery = clientSession.addressQuery(address);
-         Assert.assertTrue(addressQuery.isExists());
-         Assert.assertTrue(addressQuery.getQueueNames().isEmpty());
-         AmqpClient client = createAmqpClient(guestUser, guestPass);
-         AmqpConnection connection = addConnection(client.connect());
-         AmqpSession session = connection.createSession();
-         AmqpSender sender = session.createSender(address.toString());
-         try {
-            ClientSession.QueueQuery queueQuery = clientSession.queueQuery(address);
-            Assert.assertFalse(queueQuery.isExists());
-            Assert.assertEquals(addressRoutingType, queueQuery.getRoutingType());
-         } finally {
-            sender.close();
-            session.close();
-            connection.close();
-         }
-      }
-
-   }
-
-   @Test
-   public void testAMQPSenderCreateQueueWithDefaultRoutingTypeIfAddressDoNotExist() throws
Exception {
-      RoutingType defaultRoutingType = server.getConfiguration().getAddressesSettings().get("#").getDefaultAddressRoutingType();
-      Assert.assertEquals(RoutingType.ANYCAST, defaultRoutingType);
-      try (ActiveMQConnection coreConnection = (ActiveMQConnection) createCoreConnection();
-           ClientSession clientSession = coreConnection.getSessionFactory().createSession())
{
-         SimpleString address = SimpleString.toSimpleString("myTopic_" + UUID.randomUUID().toString());
-         ClientSession.AddressQuery addressQuery = clientSession.addressQuery(address);
-         Assert.assertFalse(addressQuery.isExists());
-         Assert.assertTrue(addressQuery.getQueueNames().isEmpty());
-         AmqpClient client = createAmqpClient(guestUser, guestPass);
-         AmqpConnection connection = addConnection(client.connect());
-         AmqpSession session = connection.createSession();
-         AmqpSender sender = session.createSender(address.toString());
-         try {
-            addressQuery = clientSession.addressQuery(address);
-            Assert.assertTrue(addressQuery.isExists());
-            Assert.assertThat(addressQuery.getQueueNames(), CoreMatchers.hasItem(address));
-            ClientSession.QueueQuery queueQuery = clientSession.queueQuery(address);
-            Assert.assertTrue(queueQuery.isExists());
-            Assert.assertEquals(defaultRoutingType, queueQuery.getRoutingType());
-         } finally {
-            sender.close();
-            session.close();
-            connection.close();
-         }
-      }
-
-   }
-}


Mime
View raw message