From commits-return-66545-archive-asf-public=cust-asf.ponee.io@camel.apache.org Sat Nov 10 16:42:22 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id F2DBA180668 for ; Sat, 10 Nov 2018 16:42:21 +0100 (CET) Received: (qmail 62530 invoked by uid 500); 10 Nov 2018 15:42:21 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 62521 invoked by uid 99); 10 Nov 2018 15:42:21 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 Nov 2018 15:42:21 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 581C7856E8; Sat, 10 Nov 2018 15:42:20 +0000 (UTC) Date: Sat, 10 Nov 2018 15:42:20 +0000 To: "commits@camel.apache.org" Subject: [camel] branch sandbox/camel-3.x updated: Fix camel-nsq MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <154186453989.8558.6085079599510301873@gitbox.apache.org> From: lburgazzoli@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: camel X-Git-Refname: refs/heads/sandbox/camel-3.x X-Git-Reftype: branch X-Git-Oldrev: f3a2615be60d4a2b58abf571dce318d7a58fcc5d X-Git-Newrev: 58085d5bdbbfc626182a3a6017f8ab032cd01e3b X-Git-Rev: 58085d5bdbbfc626182a3a6017f8ab032cd01e3b X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch sandbox/camel-3.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/sandbox/camel-3.x by this push: new 58085d5 Fix camel-nsq 58085d5 is described below commit 58085d5bdbbfc626182a3a6017f8ab032cd01e3b Author: lburgazzoli AuthorDate: Sat Nov 10 16:42:07 2018 +0100 Fix camel-nsq --- .../src/main/java/org/apache/camel/component/nsq/NsqComponent.java | 2 +- .../main/java/org/apache/camel/component/nsq/NsqConfiguration.java | 2 +- .../src/main/java/org/apache/camel/component/nsq/NsqConsumer.java | 5 ++--- .../src/main/java/org/apache/camel/component/nsq/NsqEndpoint.java | 4 +--- .../src/main/java/org/apache/camel/component/nsq/NsqProducer.java | 3 +-- .../component/nsq/springboot/NsqComponentAutoConfiguration.java | 2 +- 6 files changed, 7 insertions(+), 11 deletions(-) diff --git a/components/camel-nsq/src/main/java/org/apache/camel/component/nsq/NsqComponent.java b/components/camel-nsq/src/main/java/org/apache/camel/component/nsq/NsqComponent.java index 37ede30..ceef1c5 100644 --- a/components/camel-nsq/src/main/java/org/apache/camel/component/nsq/NsqComponent.java +++ b/components/camel-nsq/src/main/java/org/apache/camel/component/nsq/NsqComponent.java @@ -20,8 +20,8 @@ import java.util.Map; import org.apache.camel.Endpoint; import org.apache.camel.SSLContextParametersAware; -import org.apache.camel.impl.DefaultComponent; import org.apache.camel.spi.Metadata; +import org.apache.camel.support.DefaultComponent; /** * Represents the component that manages {@link NsqEndpoint}. diff --git a/components/camel-nsq/src/main/java/org/apache/camel/component/nsq/NsqConfiguration.java b/components/camel-nsq/src/main/java/org/apache/camel/component/nsq/NsqConfiguration.java index 0204540..88e3ac7 100644 --- a/components/camel-nsq/src/main/java/org/apache/camel/component/nsq/NsqConfiguration.java +++ b/components/camel-nsq/src/main/java/org/apache/camel/component/nsq/NsqConfiguration.java @@ -24,7 +24,7 @@ import org.apache.camel.spi.Metadata; import org.apache.camel.spi.UriParam; import org.apache.camel.spi.UriParams; import org.apache.camel.spi.UriPath; -import org.apache.camel.util.jsse.SSLContextParameters; +import org.apache.camel.support.jsse.SSLContextParameters; import static org.apache.camel.component.nsq.NsqConstants.NSQ_DEFAULT_LOOKUP_PORT; import static org.apache.camel.component.nsq.NsqConstants.NSQ_DEFAULT_PORT; diff --git a/components/camel-nsq/src/main/java/org/apache/camel/component/nsq/NsqConsumer.java b/components/camel-nsq/src/main/java/org/apache/camel/component/nsq/NsqConsumer.java index eb877ff..24e6bf9 100644 --- a/components/camel-nsq/src/main/java/org/apache/camel/component/nsq/NsqConsumer.java +++ b/components/camel-nsq/src/main/java/org/apache/camel/component/nsq/NsqConsumer.java @@ -24,11 +24,10 @@ import com.github.brainlag.nsq.ServerAddress; import com.github.brainlag.nsq.callbacks.NSQMessageCallback; import com.github.brainlag.nsq.lookup.DefaultNSQLookup; import com.github.brainlag.nsq.lookup.NSQLookup; - import org.apache.camel.Exchange; import org.apache.camel.ExchangePattern; import org.apache.camel.Processor; -import org.apache.camel.impl.DefaultConsumer; +import org.apache.camel.support.DefaultConsumer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,7 +37,7 @@ import org.slf4j.LoggerFactory; public class NsqConsumer extends DefaultConsumer { private static final Logger LOG = LoggerFactory.getLogger(NsqConsumer.class); - + NSQConsumer consumer; private final Processor processor; diff --git a/components/camel-nsq/src/main/java/org/apache/camel/component/nsq/NsqEndpoint.java b/components/camel-nsq/src/main/java/org/apache/camel/component/nsq/NsqEndpoint.java index 63cf654..2410249 100644 --- a/components/camel-nsq/src/main/java/org/apache/camel/component/nsq/NsqEndpoint.java +++ b/components/camel-nsq/src/main/java/org/apache/camel/component/nsq/NsqEndpoint.java @@ -21,17 +21,15 @@ import java.security.GeneralSecurityException; import java.util.concurrent.ExecutorService; import com.github.brainlag.nsq.NSQConfig; - import io.netty.handler.ssl.JdkSslContext; import io.netty.handler.ssl.SslContext; - import org.apache.camel.Consumer; import org.apache.camel.Processor; import org.apache.camel.Producer; import org.apache.camel.RuntimeCamelException; -import org.apache.camel.impl.DefaultEndpoint; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; +import org.apache.camel.support.DefaultEndpoint; import org.apache.camel.util.ObjectHelper; /** diff --git a/components/camel-nsq/src/main/java/org/apache/camel/component/nsq/NsqProducer.java b/components/camel-nsq/src/main/java/org/apache/camel/component/nsq/NsqProducer.java index ec0f760..0b2bc0a 100644 --- a/components/camel-nsq/src/main/java/org/apache/camel/component/nsq/NsqProducer.java +++ b/components/camel-nsq/src/main/java/org/apache/camel/component/nsq/NsqProducer.java @@ -18,9 +18,8 @@ package org.apache.camel.component.nsq; import com.github.brainlag.nsq.NSQProducer; import com.github.brainlag.nsq.ServerAddress; - import org.apache.camel.Exchange; -import org.apache.camel.impl.DefaultProducer; +import org.apache.camel.support.DefaultProducer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/platforms/spring-boot/components-starter/camel-nsq-starter/src/main/java/org/apache/camel/component/nsq/springboot/NsqComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-nsq-starter/src/main/java/org/apache/camel/component/nsq/springboot/NsqComponentAutoConfiguration.java index 6b02ac0..881648e 100644 --- a/platforms/spring-boot/components-starter/camel-nsq-starter/src/main/java/org/apache/camel/component/nsq/springboot/NsqComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-nsq-starter/src/main/java/org/apache/camel/component/nsq/springboot/NsqComponentAutoConfiguration.java @@ -30,7 +30,7 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper; import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator; -import org.apache.camel.util.IntrospectionSupport; +import org.apache.camel.support.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory;