You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/01/03 12:00:53 UTC
[camel] branch main updated: CAMEL-18854: x-queue-type was set with x-single-active-consumer value. (#8965)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new db62a9eb200 CAMEL-18854: x-queue-type was set with x-single-active-consumer value. (#8965)
db62a9eb200 is described below
commit db62a9eb20031b4f6019e90f4a26a6b3aab18c03
Author: hdumont <hd...@gmail.com>
AuthorDate: Tue Jan 3 13:00:45 2023 +0100
CAMEL-18854: x-queue-type was set with x-single-active-consumer value. (#8965)
* CAMEL-18854: x-queue-type was set with x-single-active-consumer value.
* (chores) remove unused constants and noop code.
Co-authored-by: Herve Dumont <hd...@opentext.com>
---
.../java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java | 1 -
.../org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java | 5 -----
.../apache/camel/component/springrabbit/SpringRabbitMQConstants.java | 1 -
.../apache/camel/component/springrabbit/SpringRabbitMQEndpoint.java | 4 ----
4 files changed, 11 deletions(-)
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java
index d07efe30c2e..a99ef556283 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java
@@ -96,7 +96,6 @@ public final class RabbitMQConstants {
public static final String RABBITMQ_QUEUE_MESSAGE_TTL_KEY = "x-message-ttl";
public static final String RABBITMQ_QUEUE_TTL_KEY = "x-expires";
public static final String RABBITMQ_QUEUE_SINGLE_ACTIVE_CONSUMER_KEY = "x-single-active-consumer";
- public static final String RABBITMQ_QUEUE_TYPE_KEY = "x-queue-type";
public static final Set<String> BASIC_AMQP_PROPERTIES = Stream
.of(CONTENT_TYPE, PRIORITY, MESSAGE_ID, CLUSTERID, REPLY_TO, CORRELATIONID, DELIVERY_MODE, USERID, TYPE,
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
index bd2a3281a41..8b7b56158b0 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
@@ -100,11 +100,6 @@ public class RabbitMQDeclareSupport {
queueArgs.put(RabbitMQConstants.RABBITMQ_QUEUE_SINGLE_ACTIVE_CONSUMER_KEY,
Boolean.parseBoolean((String) singleConsumer));
}
-
- Object queueType = queueArgs.get(RabbitMQConstants.RABBITMQ_QUEUE_TYPE_KEY);
- if (queueType instanceof String) {
- queueArgs.put(RabbitMQConstants.RABBITMQ_QUEUE_TYPE_KEY, singleConsumer);
- }
}
private void populateQueueArgumentsFromDeadLetterExchange(final Map<String, Object> queueArgs) {
diff --git a/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/SpringRabbitMQConstants.java b/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/SpringRabbitMQConstants.java
index bb012c425e2..7e51f6384e7 100644
--- a/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/SpringRabbitMQConstants.java
+++ b/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/SpringRabbitMQConstants.java
@@ -39,7 +39,6 @@ public final class SpringRabbitMQConstants {
public static final String DELIVERY_LIMIT = "x-delivery-limit";
public static final String EXPIRES = "x-expires";
public static final String SINGLE_ACTIVE_CONSUMER = "x-single-active-consumer";
- public static final String QUEUE_TYPE = "x-queue-type";
private SpringRabbitMQConstants() {
// Constants class
diff --git a/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/SpringRabbitMQEndpoint.java b/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/SpringRabbitMQEndpoint.java
index 543f7c4c419..84b5b49f1a8 100644
--- a/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/SpringRabbitMQEndpoint.java
+++ b/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/SpringRabbitMQEndpoint.java
@@ -718,10 +718,6 @@ public class SpringRabbitMQEndpoint extends DefaultEndpoint implements AsyncEndp
if (arg instanceof String) {
args.put(SpringRabbitMQConstants.SINGLE_ACTIVE_CONSUMER, Boolean.parseBoolean((String) arg));
}
- arg = args.get(SpringRabbitMQConstants.QUEUE_TYPE);
- if (arg instanceof String) {
- args.put(SpringRabbitMQConstants.QUEUE_TYPE, arg);
- }
}
}