Author: gertv
Date: Fri Jul 20 05:37:45 2007
New Revision: 557981
URL: http://svn.apache.org/viewvc?view=rev&rev=557981
Log:
Fix for SM-932: PMD/CheckStyle for servicemix-xmpp
Modified:
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/GroupChatEndpoint.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/PrivateChatEndpoint.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/XMPPComponent.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/XMPPEndpoint.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/XMPPListenerException.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/XMPPMarshaler.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/test/java/org/apache/servicemix/xmpp/DynamicEndpointTest.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/test/java/org/apache/servicemix/xmpp/SpringComponentTest.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/test/java/org/apache/servicemix/xmpp/UriConfigurationTest.java
Modified:
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/GroupChatEndpoint.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/GroupChatEndpoint.java?view=diff&rev=557981&r1=557980&r2=557981
==============================================================================
---
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/GroupChatEndpoint.java
(original)
+++
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/GroupChatEndpoint.java
Fri Jul 20 05:37:45 2007
@@ -16,12 +16,12 @@
*/
package org.apache.servicemix.xmpp;
-import org.jivesoftware.smack.GroupChat;
-import org.jivesoftware.smack.packet.Message;
-
import javax.jbi.messaging.MessageExchange;
import javax.jbi.messaging.NormalizedMessage;
import javax.jbi.servicedesc.ServiceEndpoint;
+
+import org.jivesoftware.smack.GroupChat;
+import org.jivesoftware.smack.packet.Message;
/**
* Represents a group chat endpoint
Modified:
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/PrivateChatEndpoint.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/PrivateChatEndpoint.java?view=diff&rev=557981&r1=557980&r2=557981
==============================================================================
---
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/PrivateChatEndpoint.java
(original)
+++
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/PrivateChatEndpoint.java
Fri Jul 20 05:37:45 2007
@@ -16,13 +16,14 @@
*/
package org.apache.servicemix.xmpp;
-import org.jivesoftware.smack.Chat;
-import org.jivesoftware.smack.packet.Message;
+import java.net.URI;
import javax.jbi.messaging.MessageExchange;
import javax.jbi.messaging.NormalizedMessage;
import javax.jbi.servicedesc.ServiceEndpoint;
-import java.net.URI;
+
+import org.jivesoftware.smack.Chat;
+import org.jivesoftware.smack.packet.Message;
/**
* Represents an endpoint for chatting to a single individual
@@ -45,11 +46,10 @@
public void start() throws Exception {
super.start();
if (chat == null) {
- String participant = getParticipant();
- if (participant == null) {
+ if (getParticipant() == null) {
throw new IllegalArgumentException("No participant property
specified");
}
- chat = getConnection().createChat(participant);
+ chat = getConnection().createChat(getParticipant());
}
}
Modified:
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/XMPPComponent.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/XMPPComponent.java?view=diff&rev=557981&r1=557980&r2=557981
==============================================================================
---
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/XMPPComponent.java
(original)
+++
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/XMPPComponent.java
Fri Jul 20 05:37:45 2007
@@ -110,8 +110,7 @@
String room = (String) map.get("room");
if (room != null) {
endpoint = new GroupChatEndpoint(this, ep, room);
- }
- else {
+ } else {
endpoint = new PrivateChatEndpoint(this, ep);
}
Modified:
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/XMPPEndpoint.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/XMPPEndpoint.java?view=diff&rev=557981&r1=557980&r2=557981
==============================================================================
---
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/XMPPEndpoint.java
(original)
+++
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/XMPPEndpoint.java
Fri Jul 20 05:37:45 2007
@@ -73,8 +73,7 @@
if (connection == null) {
if (port > 0) {
connection = new XMPPConnection(host, port);
- }
- else {
+ } else {
connection = new XMPPConnection(host);
}
}
@@ -92,12 +91,10 @@
}
if (resource != null) {
connection.login(user, password, resource);
- }
- else {
+ } else {
connection.login(user, password);
}
- }
- else {
+ } else {
logger.info("Logging in anonymously to Jabber on connection: "
+ connection);
connection.loginAnonymously();
}
@@ -130,8 +127,7 @@
Message message = (Message) packet;
logger.debug("Received message: " + message + " with " +
message.getBody());
- }
- else if (packet instanceof RosterPacket) {
+ } else if (packet instanceof RosterPacket) {
RosterPacket rosterPacket = (RosterPacket) packet;
if (logger.isDebugEnabled()) {
@@ -150,8 +146,7 @@
marshaler.toNMS(in, packet);
logger.debug("Exchange: " + exchange);
//send(exchange);
- }
- catch (MessagingException e) {
+ } catch (MessagingException e) {
throw new XMPPListenerException(e, packet);
}
}
@@ -251,7 +246,7 @@
}
- protected void init(XMPPComponent component) {
+ protected final void init(XMPPComponent component) {
if (user == null) {
user = component.getUser();
}
Modified:
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/XMPPListenerException.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/XMPPListenerException.java?view=diff&rev=557981&r1=557980&r2=557981
==============================================================================
---
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/XMPPListenerException.java
(original)
+++
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/XMPPListenerException.java
Fri Jul 20 05:37:45 2007
@@ -24,7 +24,7 @@
* @version $Revision: 426415 $
*/
public class XMPPListenerException extends RuntimeException {
- private Packet packet;
+ private final Packet packet;
public XMPPListenerException(Exception cause, Packet packet) {
super(cause.getMessage() + ". Was processing packet: " + packet,
cause);
Modified:
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/XMPPMarshaler.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/XMPPMarshaler.java?view=diff&rev=557981&r1=557980&r2=557981
==============================================================================
---
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/XMPPMarshaler.java
(original)
+++
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/main/java/org/apache/servicemix/xmpp/XMPPMarshaler.java
Fri Jul 20 05:37:45 2007
@@ -16,19 +16,20 @@
*/
package org.apache.servicemix.xmpp;
-import org.apache.servicemix.jbi.jaxp.SourceMarshaler;
-import org.jivesoftware.smack.packet.Message;
-import org.jivesoftware.smack.packet.Packet;
+import java.util.Date;
+import java.util.Iterator;
import javax.jbi.messaging.MessageExchange;
import javax.jbi.messaging.MessagingException;
import javax.jbi.messaging.NormalizedMessage;
import javax.jbi.servicedesc.ServiceEndpoint;
+import javax.xml.namespace.QName;
import javax.xml.transform.Source;
import javax.xml.transform.TransformerException;
-import javax.xml.namespace.QName;
-import java.util.Date;
-import java.util.Iterator;
+
+import org.apache.servicemix.jbi.jaxp.SourceMarshaler;
+import org.jivesoftware.smack.packet.Message;
+import org.jivesoftware.smack.packet.Packet;
/**
* Marshals Jabber messages into and out of NMS messages
Modified:
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/test/java/org/apache/servicemix/xmpp/DynamicEndpointTest.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/test/java/org/apache/servicemix/xmpp/DynamicEndpointTest.java?view=diff&rev=557981&r1=557980&r2=557981
==============================================================================
---
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/test/java/org/apache/servicemix/xmpp/DynamicEndpointTest.java
(original)
+++
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/test/java/org/apache/servicemix/xmpp/DynamicEndpointTest.java
Fri Jul 20 05:37:45 2007
@@ -16,6 +16,11 @@
*/
package org.apache.servicemix.xmpp;
+import javax.jbi.messaging.ExchangeStatus;
+import javax.jbi.messaging.InOnly;
+import javax.jbi.messaging.MessageExchange;
+import javax.jbi.servicedesc.ServiceEndpoint;
+
import org.apache.servicemix.client.DefaultServiceMixClient;
import org.apache.servicemix.client.ServiceMixClient;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
@@ -24,11 +29,6 @@
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
-import javax.jbi.messaging.ExchangeStatus;
-import javax.jbi.messaging.InOnly;
-import javax.jbi.messaging.MessageExchange;
-import javax.jbi.servicedesc.ServiceEndpoint;
-
public class DynamicEndpointTest extends SpringTestSupport {
public void testSendingToDynamicEndpoint() throws Exception {
@@ -49,12 +49,10 @@
if (me.getStatus() == ExchangeStatus.ERROR) {
if (me.getError() != null) {
throw me.getError();
- }
- else {
+ } else {
fail("Received ERROR status");
}
- }
- else if (me.getFault() != null) {
+ } else if (me.getFault() != null) {
fail("Received fault: " + new
SourceTransformer().toString(me.getFault().getContent()));
}
}
Modified:
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/test/java/org/apache/servicemix/xmpp/SpringComponentTest.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/test/java/org/apache/servicemix/xmpp/SpringComponentTest.java?view=diff&rev=557981&r1=557980&r2=557981
==============================================================================
---
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/test/java/org/apache/servicemix/xmpp/SpringComponentTest.java
(original)
+++
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/test/java/org/apache/servicemix/xmpp/SpringComponentTest.java
Fri Jul 20 05:37:45 2007
@@ -48,8 +48,7 @@
System.in.read();
test.tearDown();
- }
- catch (Exception e) {
+ } catch (Exception e) {
System.err.println("Caught: " + e);
e.printStackTrace();
}
@@ -79,12 +78,10 @@
if (me.getStatus() == ExchangeStatus.ERROR) {
if (me.getError() != null) {
throw me.getError();
- }
- else {
+ } else {
fail("Received ERROR status");
}
- }
- else if (me.getFault() != null) {
+ } else if (me.getFault() != null) {
fail("Received fault: " + new
SourceTransformer().toString(me.getFault().getContent()));
}
}
Modified:
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/test/java/org/apache/servicemix/xmpp/UriConfigurationTest.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/test/java/org/apache/servicemix/xmpp/UriConfigurationTest.java?view=diff&rev=557981&r1=557980&r2=557981
==============================================================================
---
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/test/java/org/apache/servicemix/xmpp/UriConfigurationTest.java
(original)
+++
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-xmpp/src/test/java/org/apache/servicemix/xmpp/UriConfigurationTest.java
Fri Jul 20 05:37:45 2007
@@ -16,11 +16,12 @@
*/
package org.apache.servicemix.xmpp;
-import junit.framework.TestCase;
-import org.apache.servicemix.common.ResolvedEndpoint;
-
import javax.jbi.servicedesc.ServiceEndpoint;
import javax.xml.namespace.QName;
+
+import junit.framework.TestCase;
+
+import org.apache.servicemix.common.ResolvedEndpoint;
/**
* @version $Revision: $
