This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch rabbitmq in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/rabbitmq by this push: new 5e2562e CAMEL-16003: camel-spring-rabbitmq - New component using spring client 5e2562e is described below commit 5e2562e643f5ef1bee67dd8b3492cf5de4bbb839 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Tue Jan 12 08:00:07 2021 +0100 CAMEL-16003: camel-spring-rabbitmq - New component using spring client --- .../springrabbit/DefaultListenerContainerFactory.java | 16 ++++++++++++++++ .../springrabbit/DefaultMessagePropertiesConverter.java | 16 ++++++++++++++++ .../component/springrabbit/EndpointMessageListener.java | 16 ++++++++++++++++ .../camel/component/springrabbit/RabbitMQComponent.java | 3 ++- .../camel/component/springrabbit/RabbitMQEndpoint.java | 4 ++-- .../camel/component/springrabbit/RabbitMQHelper.java | 16 ++++++++++++++++ 6 files changed, 68 insertions(+), 3 deletions(-) diff --git a/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/DefaultListenerContainerFactory.java b/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/DefaultListenerContainerFactory.java index e23b599..94daa91 100644 --- a/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/DefaultListenerContainerFactory.java +++ b/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/DefaultListenerContainerFactory.java @@ -1,3 +1,19 @@ +/* + * 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.camel.component.springrabbit; import org.springframework.amqp.core.AmqpAdmin; diff --git a/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/DefaultMessagePropertiesConverter.java b/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/DefaultMessagePropertiesConverter.java index 3d462cf..3151c74 100644 --- a/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/DefaultMessagePropertiesConverter.java +++ b/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/DefaultMessagePropertiesConverter.java @@ -1,3 +1,19 @@ +/* + * 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.camel.component.springrabbit; import java.util.HashMap; diff --git a/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/EndpointMessageListener.java b/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/EndpointMessageListener.java index d14ae76..c43344c 100644 --- a/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/EndpointMessageListener.java +++ b/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/EndpointMessageListener.java @@ -1,3 +1,19 @@ +/* + * 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.camel.component.springrabbit; import com.rabbitmq.client.Channel; diff --git a/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/RabbitMQComponent.java b/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/RabbitMQComponent.java index 2d0584b..69f9519 100644 --- a/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/RabbitMQComponent.java +++ b/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/RabbitMQComponent.java @@ -75,7 +75,8 @@ public class RabbitMQComponent extends HeaderFilterStrategyComponent { description = "Tell the broker how many messages to send to each consumer in a single request. Often this can be set quite high to improve throughput.") private int prefetchCount = DEFAULT_PREFETCH_COUNT; @Metadata(label = "consumer,advanced", javaType = "java.time.Duration", defaultValue = "" + DEFAULT_SHUTDOWN_TIMEOUT, - description = "The time to wait for workers in milliseconds after the container is stopped. If any workers are active when the shutdown signal comes they will be allowed to finish processing as long as they can finish within this timeout.") + description = "The time to wait for workers in milliseconds after the container is stopped. If any workers are active when the shutdown signal comes" + + " they will be allowed to finish processing as long as they can finish within this timeout.") private long shutdownTimeout = DEFAULT_SHUTDOWN_TIMEOUT; @Metadata(label = "consumer,advanced", description = "To use a custom factory for creating and configuring ListenerContainer to be used by the consumer for receiving messages") diff --git a/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/RabbitMQEndpoint.java b/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/RabbitMQEndpoint.java index 7eedfe7..b3d5b60 100644 --- a/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/RabbitMQEndpoint.java +++ b/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/RabbitMQEndpoint.java @@ -418,7 +418,7 @@ public class RabbitMQEndpoint extends DefaultEndpoint implements AsyncEndpoint { Map<String, Object> args = getExchangeArgs(); boolean durable = parseArgsBoolean(args, "durable", "true"); boolean autoDelete = parseArgsBoolean(args, "autoDelete", "false"); - if ((!durable || autoDelete)) { + if (!durable || autoDelete) { LOG.info("Auto-declaring a non-durable or auto-delete Exchange (" + exchangeName + ") durable:" + durable + ", auto-delete:" + autoDelete + ". " @@ -445,7 +445,7 @@ public class RabbitMQEndpoint extends DefaultEndpoint implements AsyncEndpoint { autoDelete = parseArgsBoolean(args, "autoDelete", "false"); boolean exclusive = parseArgsBoolean(args, "exclusive", "false"); - if ((!durable || autoDelete || exclusive)) { + if (!durable || autoDelete || exclusive) { LOG.info("Auto-declaring a non-durable, auto-delete, or exclusive Queue (" + queue + ") durable:" + durable + ", auto-delete:" + autoDelete + ", exclusive:" diff --git a/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/RabbitMQHelper.java b/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/RabbitMQHelper.java index 28412e8..1c9b985 100644 --- a/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/RabbitMQHelper.java +++ b/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/RabbitMQHelper.java @@ -1,3 +1,19 @@ +/* + * 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.camel.component.springrabbit; public final class RabbitMQHelper {