CAMEL-3195: Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bd666dbc Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bd666dbc Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bd666dbc Branch: refs/heads/master Commit: bd666dbc0a8ef32e6a305780766b9440982fecb7 Parents: 1b1ff1a Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Dec 4 08:35:52 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Dec 4 08:35:52 2014 +0100 ---------------------------------------------------------------------- .../camel/component/xmpp/XmppBinding.java | 51 +++++++++--------- .../camel/component/xmpp/XmppConstants.java | 4 +- .../camel/component/xmpp/XmppConsumer.java | 28 +++++----- .../camel/component/xmpp/XmppEndpoint.java | 54 ++++++++++---------- .../camel/component/xmpp/XmppMessage.java | 14 +++-- .../component/xmpp/XmppPubSubProducer.java | 38 ++++++++++---- 6 files changed, 99 insertions(+), 90 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/bd666dbc/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java ---------------------------------------------------------------------- diff --git a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java index 1f43527..0ea7717 100644 --- a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java +++ b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java @@ -26,7 +26,6 @@ import org.apache.camel.spi.HeaderFilterStrategy; import org.apache.camel.util.ObjectHelper; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.Packet; -import org.jivesoftware.smack.packet.Presence; import org.jivesoftware.smackx.pubsub.packet.PubSub; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,8 +33,6 @@ import org.slf4j.LoggerFactory; /** * A Strategy used to convert between a Camel {@link Exchange} and {@link XmppMessage} to and from a * XMPP {@link Message} - * - * @version */ public class XmppBinding { @@ -83,13 +80,13 @@ public class XmppBinding { } } } - + String id = exchange.getExchangeId(); if (id != null) { message.setProperty("exchangeId", id); } } - + /** * Populates the given XMPP packet from the inbound exchange */ @@ -99,33 +96,35 @@ public class XmppBinding { String name = entry.getKey(); Object value = entry.getValue(); if (!headerFilterStrategy.applyFilterToCamelHeaders(name, value, exchange)) { - try { - packet.setProperty(name, value); - LOG.debug("Added property name: " + name + " value: " + value.toString()); - } catch (IllegalArgumentException iae) { - LOG.debug("Not adding property " + name + " to XMPP message due to " + iae); - } + try { + packet.setProperty(name, value); + LOG.debug("Added property name: " + name + " value: " + value.toString()); + } catch (IllegalArgumentException iae) { + LOG.debug("Not adding property " + name + " to XMPP message due to " + iae); } - } + } + } String id = exchange.getExchangeId(); if (id != null) { - packet.setProperty("exchangeId", id); + packet.setProperty("exchangeId", id); } } - + /** * Extracts the body from the XMPP message */ public Object extractBodyFromXmpp(Exchange exchange, Packet xmppPacket) { - return (xmppPacket instanceof Message)? GetMessageBody((Message)xmppPacket): xmppPacket; + return (xmppPacket instanceof Message) ? getMessageBody((Message) xmppPacket) : xmppPacket; } - - private Object GetMessageBody(Message message) { - String messageBody = message.getBody(); - if(messageBody == null) //probably a pubsub message - return message; - return messageBody; + + private Object getMessageBody(Message message) { + String messageBody = message.getBody(); + if (messageBody == null) { + //probably a pubsub message + return message; + } + return messageBody; } public Map<String, Object> extractHeadersFromXmpp(Packet xmppPacket, Exchange exchange) { @@ -139,19 +138,19 @@ public class XmppBinding { } } - if(xmppPacket instanceof Message) { - Message xmppMessage = (Message)xmppPacket; + if (xmppPacket instanceof Message) { + Message xmppMessage = (Message) xmppPacket; answer.put(XmppConstants.MESSAGE_TYPE, xmppMessage.getType()); answer.put(XmppConstants.SUBJECT, xmppMessage.getSubject()); answer.put(XmppConstants.THREAD_ID, xmppMessage.getThread()); - } else if(xmppPacket instanceof PubSub) { - PubSub pubsubPacket = (PubSub)xmppPacket; + } else if (xmppPacket instanceof PubSub) { + PubSub pubsubPacket = (PubSub) xmppPacket; answer.put(XmppConstants.MESSAGE_TYPE, pubsubPacket.getType()); } answer.put(XmppConstants.FROM, xmppPacket.getFrom()); answer.put(XmppConstants.PACKET_ID, xmppPacket.getPacketID()); answer.put(XmppConstants.TO, xmppPacket.getTo()); - + return answer; } } http://git-wip-us.apache.org/repos/asf/camel/blob/bd666dbc/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConstants.java ---------------------------------------------------------------------- diff --git a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConstants.java b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConstants.java index 1251e9c..b380e38 100644 --- a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConstants.java +++ b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConstants.java @@ -18,8 +18,6 @@ package org.apache.camel.component.xmpp; /** * Constants used in Camel XMPP module - * - * @version */ public interface XmppConstants { String MESSAGE_TYPE = "CamelXmppMessageType"; @@ -28,5 +26,5 @@ public interface XmppConstants { String FROM = "CamelXmppFrom"; String PACKET_ID = "CamelXmppPacketID"; String TO = "CamelXmppTo"; - String docHeader = "doc"; + String DOC_HEADER = "CamelXmppDoc"; } http://git-wip-us.apache.org/repos/asf/camel/blob/bd666dbc/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java index ef57fda..ee0044f 100644 --- a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java +++ b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java @@ -18,6 +18,7 @@ package org.apache.camel.component.xmpp; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; + import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.impl.DefaultConsumer; @@ -46,8 +47,6 @@ import org.slf4j.LoggerFactory; /** * A {@link org.apache.camel.Consumer Consumer} which listens to XMPP packets - * - * @version */ public class XmppConsumer extends DefaultConsumer implements PacketListener, MessageListener, ChatManagerListener { private static final Logger LOG = LoggerFactory.getLogger(XmppConsumer.class); @@ -70,7 +69,7 @@ public class XmppConsumer extends DefaultConsumer implements PacketListener, Mes } catch (XMPPException e) { if (endpoint.isTestConnectionOnStartup()) { throw new RuntimeException("Could not connect to XMPP server.", e); - } else { + } else { LOG.warn(XmppEndpoint.getXmppExceptionLogMessage(e)); if (getExceptionHandler() != null) { getExceptionHandler().handleException(XmppEndpoint.getXmppExceptionLogMessage(e), e); @@ -82,13 +81,13 @@ public class XmppConsumer extends DefaultConsumer implements PacketListener, Mes chatManager = connection.getChatManager(); chatManager.addChatListener(this); - + OrFilter pubsubPacketFilter = new OrFilter(); - if(endpoint.isPubsub()){ - //xep-0060: pubsub#notification_type can be 'headline' or 'normal' - pubsubPacketFilter.addFilter(new MessageTypeFilter(Type.headline)); - pubsubPacketFilter.addFilter(new MessageTypeFilter(Type.normal)); - connection.addPacketListener(this, pubsubPacketFilter); + if (endpoint.isPubsub()) { + //xep-0060: pubsub#notification_type can be 'headline' or 'normal' + pubsubPacketFilter.addFilter(new MessageTypeFilter(Type.headline)); + pubsubPacketFilter.addFilter(new MessageTypeFilter(Type.normal)); + connection.addPacketListener(this, pubsubPacketFilter); } if (endpoint.getRoom() == null) { @@ -99,7 +98,7 @@ public class XmppConsumer extends DefaultConsumer implements PacketListener, Mes LOG.debug("Adding listener to existing chat opened to " + privateChat.getParticipant()); } privateChat.addMessageListener(this); - } else { + } else { privateChat = connection.getChatManager().createChat(endpoint.getParticipant(), endpoint.getChatId(), this); if (LOG.isDebugEnabled()) { LOG.debug("Opening private chat to " + privateChat.getParticipant()); @@ -169,6 +168,7 @@ public class XmppConsumer extends DefaultConsumer implements PacketListener, Mes } } } + private ScheduledExecutorService getExecutor() { if (this.scheduledExecutor == null) { scheduledExecutor = getEndpoint().getCamelContext().getExecutorServiceManager().newSingleThreadScheduledExecutor(this, "connectionPoll"); @@ -210,7 +210,7 @@ public class XmppConsumer extends DefaultConsumer implements PacketListener, Mes public void processPacket(Packet packet) { if (packet instanceof Message) { - processMessage(null, (Message)packet); + processMessage(null, (Message) packet); } } @@ -221,8 +221,8 @@ public class XmppConsumer extends DefaultConsumer implements PacketListener, Mes Exchange exchange = endpoint.createExchange(message); - if(endpoint.isDoc() == true) { - exchange.getIn().setHeader(XmppConstants.docHeader, message); + if (endpoint.isDoc()) { + exchange.getIn().setHeader(XmppConstants.DOC_HEADER, message); } try { getProcessor().process(exchange); @@ -237,5 +237,5 @@ public class XmppConsumer extends DefaultConsumer implements PacketListener, Mes } } } - + } http://git-wip-us.apache.org/repos/asf/camel/blob/bd666dbc/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java index a20799b..a740e25 100644 --- a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java +++ b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java @@ -34,7 +34,6 @@ import org.jivesoftware.smack.ConnectionConfiguration; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.filter.PacketFilter; -import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.Packet; import org.jivesoftware.smack.packet.XMPPError; import org.jivesoftware.smackx.muc.MultiUserChat; @@ -43,8 +42,6 @@ import org.slf4j.LoggerFactory; /** * A XMPP Endpoint - * - * @version */ public class XmppEndpoint extends DefaultEndpoint implements HeaderFilterStrategyAware { private static final Logger LOG = LoggerFactory.getLogger(XmppEndpoint.class); @@ -62,10 +59,10 @@ public class XmppEndpoint extends DefaultEndpoint implements HeaderFilterStrateg private String nickname; private String serviceName; private XMPPConnection connection; - private boolean pubsub = false; + private boolean pubsub; //Set a doc header on the IN message containing a Document form of the incoming packet; //default is true if pubsub is true, otherwise false - private boolean doc = false; + private boolean doc; private boolean testConnectionOnStartup = true; private int connectionPollDelay = 10; @@ -85,9 +82,9 @@ public class XmppEndpoint extends DefaultEndpoint implements HeaderFilterStrateg if (room != null) { return createGroupChatProducer(); } else { - if(isPubsub() == true) { - return createPubSubProducer(); - } + if (isPubsub()) { + return createPubSubProducer(); + } if (getParticipant() == null) { throw new IllegalArgumentException("No room or participant configured on this endpoint: " + this); } @@ -102,9 +99,9 @@ public class XmppEndpoint extends DefaultEndpoint implements HeaderFilterStrateg public Producer createPrivateChatProducer(String participant) throws Exception { return new XmppPrivateChatProducer(this, participant); } - + public Producer createPubSubProducer() throws Exception { - return new XmppPubSubProducer(this); + return new XmppPubSubProducer(this); } public Consumer createConsumer(Processor processor) throws Exception { @@ -201,6 +198,7 @@ public class XmppEndpoint extends DefaultEndpoint implements HeaderFilterStrateg return connection; } + /* * If there is no "@" symbol in the room, find the chat service JID and * return fully qualified JID for the room as room@conference.server.domain @@ -237,8 +235,8 @@ public class XmppEndpoint extends DefaultEndpoint implements HeaderFilterStrateg StringBuilder strBuff = new StringBuilder(); if (xmppError != null) { strBuff.append("[ ").append(xmppError.getCode()).append(" ] ") - .append(xmppError.getCondition()).append(" : ") - .append(xmppError.getMessage()); + .append(xmppError.getCondition()).append(" : ") + .append(xmppError.getMessage()); } if (t != null) { strBuff.append(" ( ").append(e.getWrappedThrowable().getMessage()).append(" )"); @@ -354,7 +352,7 @@ public class XmppEndpoint extends DefaultEndpoint implements HeaderFilterStrateg public String getServiceName() { return serviceName; - } + } public HeaderFilterStrategy getHeaderFilterStrategy() { return headerFilterStrategy; @@ -380,24 +378,24 @@ public class XmppEndpoint extends DefaultEndpoint implements HeaderFilterStrateg this.connectionPollDelay = connectionPollDelay; } - public void setPubsub(boolean pubsub) { - this.pubsub = pubsub; - if(pubsub == true) { - setDoc(true); - } - } + public void setPubsub(boolean pubsub) { + this.pubsub = pubsub; + if (pubsub) { + setDoc(true); + } + } - public boolean isPubsub() { - return pubsub; - } + public boolean isPubsub() { + return pubsub; + } - public void setDoc(boolean doc) { - this.doc = doc; - } + public void setDoc(boolean doc) { + this.doc = doc; + } - public boolean isDoc() { - return doc; - } + public boolean isDoc() { + return doc; + } // Implementation methods // ------------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/bd666dbc/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppMessage.java ---------------------------------------------------------------------- diff --git a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppMessage.java b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppMessage.java index b75243c..9cb62bd 100644 --- a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppMessage.java +++ b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppMessage.java @@ -25,8 +25,6 @@ import org.jivesoftware.smack.packet.Packet; /** * Represents a {@link org.apache.camel.Message} for working with XMPP - * - * @version */ public class XmppMessage extends DefaultMessage { private Packet xmppPacket; @@ -38,11 +36,11 @@ public class XmppMessage extends DefaultMessage { public XmppMessage(Message jmsMessage) { this.xmppPacket = jmsMessage; } - + public XmppMessage(Packet jmsMessage) { this.xmppPacket = jmsMessage; } - + @Override public String toString() { if (xmppPacket != null) { @@ -56,7 +54,7 @@ public class XmppMessage extends DefaultMessage { * Returns the underlying XMPP message */ public Message getXmppMessage() { - return (xmppPacket instanceof Message) ? (Message)xmppPacket : null; + return (xmppPacket instanceof Message) ? (Message) xmppPacket : null; } public void setXmppMessage(Message xmppMessage) { @@ -73,7 +71,7 @@ public class XmppMessage extends DefaultMessage { public void setXmppPacket(Packet xmppPacket) { this.xmppPacket = xmppPacket; } - + @Override public XmppMessage newInstance() { return new XmppMessage(); @@ -84,12 +82,12 @@ public class XmppMessage extends DefaultMessage { if (xmppPacket != null) { XmppBinding binding = ExchangeHelper.getBinding(getExchange(), XmppBinding.class); if (binding != null) { - return (getHeader(XmppConstants.docHeader) == null) ? binding.extractBodyFromXmpp(getExchange(), xmppPacket): getHeader(XmppConstants.docHeader); + return (getHeader(XmppConstants.DOC_HEADER) == null) ? binding.extractBodyFromXmpp(getExchange(), xmppPacket) : getHeader(XmppConstants.DOC_HEADER); } } return null; } - + @Override protected void populateInitialHeaders(Map<String, Object> map) { if (xmppPacket != null) { http://git-wip-us.apache.org/repos/asf/camel/blob/bd666dbc/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPubSubProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPubSubProducer.java b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPubSubProducer.java index 20d46a4..619f28d 100644 --- a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPubSubProducer.java +++ b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPubSubProducer.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.xmpp; import org.apache.camel.Exchange; @@ -10,7 +26,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class XmppPubSubProducer extends DefaultProducer { - private static final transient Logger LOG = LoggerFactory.getLogger(XmppPrivateChatProducer.class); + private static final transient Logger LOG = LoggerFactory.getLogger(XmppPrivateChatProducer.class); private final XmppEndpoint endpoint; private XMPPConnection connection; @@ -20,7 +36,7 @@ public class XmppPubSubProducer extends DefaultProducer { LOG.debug("Creating XmppPresenceProducer"); } - public void process(Exchange exchange) throws Exception { + public void process(Exchange exchange) throws Exception { try { if (connection == null) { connection = endpoint.createConnection(); @@ -35,19 +51,19 @@ public class XmppPubSubProducer extends DefaultProducer { } } catch (XMPPException e) { throw new RuntimeExchangeException("Cannot connect to XMPP Server: " - + ((connection != null) ? XmppEndpoint.getConnectionMessage(connection): endpoint.getHost()), exchange, e); + + ((connection != null) ? XmppEndpoint.getConnectionMessage(connection) : endpoint.getHost()), exchange, e); } - + try { Object body = exchange.getIn().getBody(Object.class); - if(body instanceof PubSub) { - PubSub pubsubpacket = (PubSub) body; + if (body instanceof PubSub) { + PubSub pubsubpacket = (PubSub) body; endpoint.getBinding().populateXmppPacket(pubsubpacket, exchange); - exchange.getIn().setHeader(XmppConstants.docHeader, pubsubpacket); - connection.sendPacket(pubsubpacket); + exchange.getIn().setHeader(XmppConstants.DOC_HEADER, pubsubpacket); + connection.sendPacket(pubsubpacket); } else { - throw new Exception("Message does not contain a pubsub packet"); - } + throw new Exception("Message does not contain a pubsub packet"); + } } catch (XMPPException xmppe) { throw new RuntimeExchangeException("Cannot send XMPP pubsub: from " + endpoint.getUser() + " to: " + XmppEndpoint.getConnectionMessage(connection), exchange, xmppe); @@ -55,6 +71,6 @@ public class XmppPubSubProducer extends DefaultProducer { throw new RuntimeExchangeException("Cannot send XMPP pubsub: from " + endpoint.getUser() + " to: " + XmppEndpoint.getConnectionMessage(connection), exchange, e); } - } + } }
