cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1181903 - in /cxf/trunk/services/wsn/wsn-core: ./ src/main/java/org/apache/cxf/wsn/ src/main/java/org/apache/cxf/wsn/client/ src/main/java/org/apache/cxf/wsn/jaxws/ src/main/java/org/apache/cxf/wsn/jms/ src/main/java/org/apache/cxf/wsn/uti...
Date Tue, 11 Oct 2011 17:23:25 GMT
Author: dkulp
Date: Tue Oct 11 17:23:24 2011
New Revision: 1181903

URL: http://svn.apache.org/viewvc?rev=1181903&view=rev
Log:
Fix remaining Checkstyle issues

Modified:
    cxf/trunk/services/wsn/wsn-core/pom.xml
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractNotificationBroker.java
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractSubscription.java
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/NotificationBroker.java
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/Publisher.java
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsSubscription.java
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsNotificationBroker.java
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsSubscription.java
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/util/DOMUtil.java
    cxf/trunk/services/wsn/wsn-core/src/test/java/org/apache/cxf/wsn/WsnBrokerTest.java

Modified: cxf/trunk/services/wsn/wsn-core/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-core/pom.xml?rev=1181903&r1=1181902&r2=1181903&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-core/pom.xml (original)
+++ cxf/trunk/services/wsn/wsn-core/pom.xml Tue Oct 11 17:23:24 2011
@@ -32,10 +32,6 @@
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
-    <properties>
-        <checkstyle.skip>true</checkstyle.skip>
-    </properties>
-	
 	<dependencies>
         <dependency>
             <groupId>org.slf4j</groupId>

Modified: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractNotificationBroker.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractNotificationBroker.java?rev=1181903&r1=1181902&r2=1181903&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractNotificationBroker.java
(original)
+++ cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractNotificationBroker.java
Tue Oct 11 17:23:24 2011
@@ -169,11 +169,14 @@ public abstract class AbstractNotificati
             @WebParam(name = "Subscribe", 
                       targetNamespace = "http://docs.oasis-open.org/wsn/b-1", 
                       partName = "SubscribeRequest")
-            Subscribe subscribeRequest) throws InvalidFilterFault, InvalidMessageContentExpressionFault,
+            Subscribe subscribeRequest)
+        //CHECKSTYLE:OFF - WS-Notification spec throws a lot of faults
+        throws InvalidFilterFault, InvalidMessageContentExpressionFault,
             InvalidProducerPropertiesExpressionFault, InvalidTopicExpressionFault, ResourceUnknownFault,
             SubscribeCreationFailedFault, TopicExpressionDialectUnknownFault, TopicNotSupportedFault,
             UnacceptableInitialTerminationTimeFault, UnsupportedPolicyRequestFault,
             UnrecognizedPolicyRequestFault {
+        //CHECKSTYLE:ON
 
         LOGGER.debug("Subscribe");
         return handleSubscribe(subscribeRequest, null);
@@ -181,11 +184,14 @@ public abstract class AbstractNotificati
 
     public SubscribeResponse handleSubscribe(
                 Subscribe subscribeRequest, 
-                EndpointManager manager) throws InvalidFilterFault, InvalidMessageContentExpressionFault,
+                EndpointManager manager)
+        //CHECKSTYLE:OFF - WS-Notification spec throws a lot of faults
+        throws InvalidFilterFault, InvalidMessageContentExpressionFault,
             InvalidProducerPropertiesExpressionFault, InvalidTopicExpressionFault,
             SubscribeCreationFailedFault, TopicExpressionDialectUnknownFault,
             TopicNotSupportedFault, UnacceptableInitialTerminationTimeFault,
             UnsupportedPolicyRequestFault, UnrecognizedPolicyRequestFault {
+        //CHECKSTYLE:ON
         AbstractSubscription subscription = null;
         boolean success = false;
         try {
@@ -243,10 +249,12 @@ public abstract class AbstractNotificati
             @WebParam(name = "GetCurrentMessage", 
                       targetNamespace = "http://docs.oasis-open.org/wsn/b-1", 
                       partName = "GetCurrentMessageRequest")
-            GetCurrentMessage getCurrentMessageRequest) throws InvalidTopicExpressionFault,
+            GetCurrentMessage getCurrentMessageRequest)
+        //CHECKSTYLE:OFF - WS-Notification spec throws a lot of faults
+        throws InvalidTopicExpressionFault,
             MultipleTopicsSpecifiedFault, NoCurrentMessageOnTopicFault, ResourceUnknownFault,
             TopicExpressionDialectUnknownFault, TopicNotSupportedFault {
-
+        //CHECKSTYLE:ON
         LOGGER.debug("GetCurrentMessage");
         NoCurrentMessageOnTopicFaultType fault = new NoCurrentMessageOnTopicFaultType();
         throw new NoCurrentMessageOnTopicFault("There is no current message on this topic.",
fault);

Modified: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractSubscription.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractSubscription.java?rev=1181903&r1=1181902&r2=1181903&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractSubscription.java
(original)
+++ cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractSubscription.java
Tue Oct 11 17:23:24 2011
@@ -32,7 +32,27 @@ import javax.xml.datatype.XMLGregorianCa
 import javax.xml.namespace.QName;
 import javax.xml.ws.wsaddressing.W3CEndpointReference;
 
-import org.oasis_open.docs.wsn.b_2.*;
+import org.oasis_open.docs.wsn.b_2.InvalidFilterFaultType;
+import org.oasis_open.docs.wsn.b_2.InvalidMessageContentExpressionFaultType;
+import org.oasis_open.docs.wsn.b_2.InvalidProducerPropertiesExpressionFaultType;
+import org.oasis_open.docs.wsn.b_2.InvalidTopicExpressionFaultType;
+import org.oasis_open.docs.wsn.b_2.PauseSubscription;
+import org.oasis_open.docs.wsn.b_2.PauseSubscriptionResponse;
+import org.oasis_open.docs.wsn.b_2.QueryExpressionType;
+import org.oasis_open.docs.wsn.b_2.Renew;
+import org.oasis_open.docs.wsn.b_2.RenewResponse;
+import org.oasis_open.docs.wsn.b_2.ResumeSubscription;
+import org.oasis_open.docs.wsn.b_2.ResumeSubscriptionResponse;
+import org.oasis_open.docs.wsn.b_2.Subscribe;
+import org.oasis_open.docs.wsn.b_2.SubscribeCreationFailedFaultType;
+import org.oasis_open.docs.wsn.b_2.TopicExpressionType;
+import org.oasis_open.docs.wsn.b_2.UnableToDestroySubscriptionFaultType;
+import org.oasis_open.docs.wsn.b_2.UnacceptableInitialTerminationTimeFaultType;
+import org.oasis_open.docs.wsn.b_2.UnacceptableTerminationTimeFaultType;
+import org.oasis_open.docs.wsn.b_2.UnrecognizedPolicyRequestFaultType;
+import org.oasis_open.docs.wsn.b_2.Unsubscribe;
+import org.oasis_open.docs.wsn.b_2.UnsubscribeResponse;
+import org.oasis_open.docs.wsn.b_2.UseRaw;
 import org.oasis_open.docs.wsn.bw_2.InvalidFilterFault;
 import org.oasis_open.docs.wsn.bw_2.InvalidMessageContentExpressionFault;
 import org.oasis_open.docs.wsn.bw_2.InvalidProducerPropertiesExpressionFault;
@@ -260,11 +280,12 @@ public abstract class AbstractSubscripti
     }
 
     public void create(Subscribe subscribeRequest) 
+        //CHECKSTYLE:OFF
         throws InvalidFilterFault, InvalidMessageContentExpressionFault,
         InvalidProducerPropertiesExpressionFault, InvalidTopicExpressionFault, SubscribeCreationFailedFault,
         TopicExpressionDialectUnknownFault, TopicNotSupportedFault, UnacceptableInitialTerminationTimeFault,
         UnrecognizedPolicyRequestFault, UnsupportedPolicyRequestFault {
-        
+        //CHECKSTYLE:ON
         
         validateSubscription(subscribeRequest);
         start();
@@ -287,11 +308,14 @@ public abstract class AbstractSubscripti
         }
     }
 
-    protected void validateSubscription(Subscribe subscribeRequest) throws InvalidFilterFault,
+    protected void validateSubscription(Subscribe subscribeRequest)
+       //CHECKSTYLE:OFF - WS-Notification spec throws a lot of faults
+       throws InvalidFilterFault,
             InvalidMessageContentExpressionFault, InvalidProducerPropertiesExpressionFault,
             InvalidTopicExpressionFault, SubscribeCreationFailedFault, TopicExpressionDialectUnknownFault,
             TopicNotSupportedFault, UnacceptableInitialTerminationTimeFault, UnrecognizedPolicyRequestFault,
             UnsupportedPolicyRequestFault {
+        //CHECKSTYLE:ON
         // Check consumer reference
         consumerReference = subscribeRequest.getConsumerReference();
         // Check terminationTime

Modified: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/NotificationBroker.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/NotificationBroker.java?rev=1181903&r1=1181902&r2=1181903&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/NotificationBroker.java
(original)
+++ cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/NotificationBroker.java
Tue Oct 11 17:23:24 2011
@@ -98,31 +98,37 @@ public class NotificationBroker implemen
     }
 
     public Subscription subscribe(Referencable consumer, String topic) 
+        //CHECKSTYLE:OFF - WS-Notification spec throws a lot of faults
         throws TopicExpressionDialectUnknownFault, InvalidFilterFault, TopicNotSupportedFault,
         UnacceptableInitialTerminationTimeFault, SubscribeCreationFailedFault, 
         InvalidMessageContentExpressionFault, InvalidTopicExpressionFault, ResourceUnknownFault,

         UnsupportedPolicyRequestFault, UnrecognizedPolicyRequestFault, 
         NotifyMessageNotSupportedFault, InvalidProducerPropertiesExpressionFault {
+        //CHECKSTYLE:ON
         
         return subscribe(consumer, topic, null, false);
     }
 
     public Subscription subscribe(Referencable consumer, String topic, String xpath) 
+        //CHECKSTYLE:OFF - WS-Notification spec throws a lot of faults
         throws TopicExpressionDialectUnknownFault, InvalidFilterFault, TopicNotSupportedFault,

         UnacceptableInitialTerminationTimeFault, SubscribeCreationFailedFault, 
         InvalidMessageContentExpressionFault, InvalidTopicExpressionFault, ResourceUnknownFault,

         UnsupportedPolicyRequestFault, UnrecognizedPolicyRequestFault, NotifyMessageNotSupportedFault,

         InvalidProducerPropertiesExpressionFault {
+        //CHECKSTYLE:ON
         return subscribe(consumer, topic, xpath, false);
     }
 
     public Subscription subscribe(Referencable consumer, String topic,
-                                  String xpath, boolean raw) 
+                                  String xpath, boolean raw)
+        //CHECKSTYLE:OFF - WS-Notification spec throws a lot of faults
         throws TopicNotSupportedFault, InvalidFilterFault, TopicExpressionDialectUnknownFault,

         UnacceptableInitialTerminationTimeFault, SubscribeCreationFailedFault, 
         InvalidMessageContentExpressionFault, InvalidTopicExpressionFault, UnrecognizedPolicyRequestFault,

         UnsupportedPolicyRequestFault, ResourceUnknownFault, NotifyMessageNotSupportedFault,

         InvalidProducerPropertiesExpressionFault {
+        //CHECKSTYLE:ON
 
         Subscribe subscribeRequest = new Subscribe();
         subscribeRequest.setConsumerReference(consumer.getEpr());
@@ -151,8 +157,10 @@ public class NotificationBroker implemen
     }
 
     public List<Object> getCurrentMessage(String topic) 
+        //CHECKSTYLE:OFF - WS-Notification spec throws a lot of faults
         throws TopicNotSupportedFault, TopicExpressionDialectUnknownFault, MultipleTopicsSpecifiedFault,

         InvalidTopicExpressionFault, ResourceUnknownFault, NoCurrentMessageOnTopicFault {
+        //CHECKSTYLE:ON
         GetCurrentMessage getCurrentMessageRequest = new GetCurrentMessage();
         if (topic != null) {
             TopicExpressionType topicExp = new TopicExpressionType();
@@ -163,24 +171,30 @@ public class NotificationBroker implemen
         return response.getAny();
     }
 
-    public Registration registerPublisher(Referencable publisher, String topic) 
+    public Registration registerPublisher(Referencable publisher, String topic)
+        //CHECKSTYLE:OFF - WS-Notification spec throws a lot of faults
         throws TopicNotSupportedFault, PublisherRegistrationFailedFault, 
         UnacceptableInitialTerminationTimeFault, InvalidTopicExpressionFault, 
         ResourceUnknownFault, PublisherRegistrationRejectedFault {
+        //CHECKSTYLE:ON
         return registerPublisher(publisher, topic, false);
     }
 
     public Registration registerPublisher(Referencable publisher, String topic, boolean demand)

+        //CHECKSTYLE:OFF - WS-Notification spec throws a lot of faults
         throws TopicNotSupportedFault, PublisherRegistrationFailedFault, 
         UnacceptableInitialTerminationTimeFault, InvalidTopicExpressionFault, ResourceUnknownFault,

         PublisherRegistrationRejectedFault {
+        //CHECKSTYLE:ON
         return registerPublisher(publisher, Collections.singletonList(topic), demand);
     }
 
     public Registration registerPublisher(Referencable publisher, List<String> topics,
boolean demand)
+        //CHECKSTYLE:OFF - WS-Notification spec throws a lot of faults
         throws TopicNotSupportedFault, PublisherRegistrationFailedFault, 
         UnacceptableInitialTerminationTimeFault, InvalidTopicExpressionFault, ResourceUnknownFault,

         PublisherRegistrationRejectedFault {
+        //CHECKSTYLE:ON
 
         RegisterPublisher registerPublisherRequest = new RegisterPublisher();
         registerPublisherRequest.setPublisherReference(publisher.getEpr());

Modified: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/Publisher.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/Publisher.java?rev=1181903&r1=1181902&r2=1181903&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/Publisher.java
(original)
+++ cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/client/Publisher.java
Tue Oct 11 17:23:24 2011
@@ -18,8 +18,6 @@
  */
 package org.apache.cxf.wsn.client;
 
-import java.util.HashMap;
-import java.util.Map;
 import javax.jws.WebParam;
 import javax.jws.WebService;
 import javax.xml.bind.JAXBElement;
@@ -75,8 +73,6 @@ public class Publisher implements Notifi
     private final String address;
     private final Endpoint endpoint;
     private final IdGenerator idGenerator = new IdGenerator();
-    private final Map<String, PublisherSubscription> subscriptions 
-        = new HashMap<String, PublisherSubscription>();
 
     public Publisher(Callback callback, String address) {
         this.callback = callback;
@@ -96,10 +92,12 @@ public class Publisher implements Notifi
     public SubscribeResponse subscribe(
         @WebParam(partName = "SubscribeRequest", name = "Subscribe",
                   targetNamespace = "http://docs.oasis-open.org/wsn/b-2") Subscribe subscribeRequest)
+        //CHECKSTYLE:OFF - WS-Notification spec throws a lot of faults
         throws InvalidTopicExpressionFault, ResourceUnknownFault, InvalidProducerPropertiesExpressionFault,
-        UnrecognizedPolicyRequestFault, TopicExpressionDialectUnknownFault, NotifyMessageNotSupportedFault,
-        InvalidFilterFault, UnsupportedPolicyRequestFault, InvalidMessageContentExpressionFault,
-        SubscribeCreationFailedFault, TopicNotSupportedFault, UnacceptableInitialTerminationTimeFault
{
+            UnrecognizedPolicyRequestFault, TopicExpressionDialectUnknownFault, NotifyMessageNotSupportedFault,
+            InvalidFilterFault, UnsupportedPolicyRequestFault, InvalidMessageContentExpressionFault,
+            SubscribeCreationFailedFault, TopicNotSupportedFault, UnacceptableInitialTerminationTimeFault
{
+        //CHECKSYTLE:ON
         
         TopicExpressionType topic = null;
         if (subscribeRequest.getFilter() != null) {
@@ -137,8 +135,10 @@ public class Publisher implements Notifi
             @WebParam(partName = "GetCurrentMessageRequest", name = "GetCurrentMessage",

                       targetNamespace = "http://docs.oasis-open.org/wsn/b-2") 
                 GetCurrentMessage getCurrentMessageRequest) 
+        //CHECKSTYLE:OFF - WS-Notification spec throws a lot of faults
         throws InvalidTopicExpressionFault, ResourceUnknownFault, TopicExpressionDialectUnknownFault,

-        MultipleTopicsSpecifiedFault, NoCurrentMessageOnTopicFault, TopicNotSupportedFault
{
+            MultipleTopicsSpecifiedFault, NoCurrentMessageOnTopicFault, TopicNotSupportedFault
{
+        //CHECKSTYLE:ON
         
         NoCurrentMessageOnTopicFaultType fault = new NoCurrentMessageOnTopicFaultType();
         throw new NoCurrentMessageOnTopicFault("There is no current message on this topic.",
fault);

Modified: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsSubscription.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsSubscription.java?rev=1181903&r1=1181902&r2=1181903&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsSubscription.java
(original)
+++ cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsSubscription.java
Tue Oct 11 17:23:24 2011
@@ -47,11 +47,14 @@ public class JaxwsSubscription extends J
     }
 
     @Override
-    protected void validateSubscription(Subscribe subscribeRequest) throws InvalidFilterFault,
+    protected void validateSubscription(Subscribe subscribeRequest)
+        //CHECKSTYLE:OFF - WS-Notification spec throws a lot of faults
+        throws InvalidFilterFault,
             InvalidMessageContentExpressionFault, InvalidProducerPropertiesExpressionFault,
             InvalidTopicExpressionFault, SubscribeCreationFailedFault, TopicExpressionDialectUnknownFault,
             TopicNotSupportedFault, UnacceptableInitialTerminationTimeFault,
             UnsupportedPolicyRequestFault, UnrecognizedPolicyRequestFault {
+        //CHECKSTYLE:ON
         super.validateSubscription(subscribeRequest);
         // TODO: implement raw notifications
         if (useRaw) {

Modified: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsNotificationBroker.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsNotificationBroker.java?rev=1181903&r1=1181902&r2=1181903&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsNotificationBroker.java
(original)
+++ cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsNotificationBroker.java
Tue Oct 11 17:23:24 2011
@@ -19,6 +19,8 @@
 package org.apache.cxf.wsn.jms;
 
 import java.net.URI;
+import java.net.URISyntaxException;
+
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
 import javax.xml.bind.JAXBElement;
@@ -101,8 +103,13 @@ public abstract class JmsNotificationBro
             // TODO
         } else if (TOPIC_EXPRESSION_DIALECT_QNAME.equals(property)) {
             GetResourcePropertyResponse r = new GetResourcePropertyResponse();
-            r.getAny().add(new JAXBElement(TOPIC_EXPRESSION_DIALECT_QNAME, 
-                    URI.class, JmsTopicExpressionConverter.SIMPLE_DIALECT));
+            try {
+                r.getAny().add(new JAXBElement<URI>(TOPIC_EXPRESSION_DIALECT_QNAME,

+                        URI.class, new URI(JmsTopicExpressionConverter.SIMPLE_DIALECT)));
+            } catch (URISyntaxException e) {
+                r.getAny().add(new JAXBElement<String>(TOPIC_EXPRESSION_DIALECT_QNAME,

+                    String.class, JmsTopicExpressionConverter.SIMPLE_DIALECT));         
     
+            }
             return r;
         } else if (TOPIC_SET_QNAME.equals(property)) {
             // TODO

Modified: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsSubscription.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsSubscription.java?rev=1181903&r1=1181902&r2=1181903&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsSubscription.java
(original)
+++ cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsSubscription.java
Tue Oct 11 17:23:24 2011
@@ -104,11 +104,14 @@ public abstract class JmsSubscription ex
     }
 
     @Override
-    protected void validateSubscription(Subscribe subscribeRequest) throws InvalidFilterFault,
+    protected void validateSubscription(Subscribe subscribeRequest)
+        //CHECKSTYLE:OFF - WS-Notification spec throws a lot of faults
+        throws InvalidFilterFault,
             InvalidMessageContentExpressionFault, InvalidProducerPropertiesExpressionFault,
             InvalidTopicExpressionFault, SubscribeCreationFailedFault, TopicExpressionDialectUnknownFault,
             TopicNotSupportedFault, UnacceptableInitialTerminationTimeFault,
             UnsupportedPolicyRequestFault, UnrecognizedPolicyRequestFault {
+        //CHECKSTYLE:ON
         super.validateSubscription(subscribeRequest);
         try {
             jmsTopic = topicConverter.toActiveMQTopic(topic);

Modified: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/util/DOMUtil.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/util/DOMUtil.java?rev=1181903&r1=1181902&r2=1181903&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/util/DOMUtil.java (original)
+++ cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/util/DOMUtil.java Tue
Oct 11 17:23:24 2011
@@ -53,10 +53,10 @@ import org.slf4j.LoggerFactory;
  */
 public final class DOMUtil {
 
-    private final static Logger logger = LoggerFactory.getLogger(DOMUtil.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DOMUtil.class);
 
     private static DocumentBuilderFactory dbf;
-    private static Queue builders = new ConcurrentLinkedQueue();
+    private static Queue<DocumentBuilder> builders = new ConcurrentLinkedQueue<DocumentBuilder>();
 
 
     private DOMUtil() {
@@ -206,8 +206,8 @@ public final class DOMUtil {
         try {
             answer = element.getAttribute(attributeName);
         } catch (Exception e) {
-            if (logger.isTraceEnabled()) {
-                logger.trace("Caught exception looking up attribute: " + attributeName 
+            if (LOG.isTraceEnabled()) {
+                LOG.trace("Caught exception looking up attribute: " + attributeName 
                              + " on element: " + element + ". Cause: " + e, e);
             }
         }

Modified: cxf/trunk/services/wsn/wsn-core/src/test/java/org/apache/cxf/wsn/WsnBrokerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-core/src/test/java/org/apache/cxf/wsn/WsnBrokerTest.java?rev=1181903&r1=1181902&r2=1181903&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-core/src/test/java/org/apache/cxf/wsn/WsnBrokerTest.java (original)
+++ cxf/trunk/services/wsn/wsn-core/src/test/java/org/apache/cxf/wsn/WsnBrokerTest.java Tue
Oct 11 17:23:24 2011
@@ -154,7 +154,8 @@ public abstract class WsnBrokerTest exte
         Subscription subscription = notificationBroker.subscribe(consumer, "myTopic");
 
         PublisherCallback publisherCallback = new PublisherCallback();
-        Publisher publisher = new Publisher(publisherCallback, "http://localhost:" + port2
+ "/test/publisher");
+        Publisher publisher = new Publisher(publisherCallback, "http://localhost:" + port2

+                                            + "/test/publisher");
         Registration registration = notificationBroker.registerPublisher(publisher, "myTopic");
 
         synchronized (consumerCallback.notifications) {
@@ -181,7 +182,8 @@ public abstract class WsnBrokerTest exte
         Consumer consumer = new Consumer(consumerCallback, "http://localhost:" + port2 +
"/test/consumer");
 
         PublisherCallback publisherCallback = new PublisherCallback();
-        Publisher publisher = new Publisher(publisherCallback, "http://localhost:" + port2
+ "/test/publisher");
+        Publisher publisher = new Publisher(publisherCallback, "http://localhost:" 
+            + port2 + "/test/publisher");
         Registration registration = notificationBroker.registerPublisher(publisher, 
                                                                          Arrays.asList("myTopic1",

                                                                                        "myTopic2"),
true);
@@ -207,7 +209,7 @@ public abstract class WsnBrokerTest exte
 
     public static class TestConsumer implements Consumer.Callback {
 
-        public final List<NotificationMessageHolderType> notifications 
+        final List<NotificationMessageHolderType> notifications 
             = new ArrayList<NotificationMessageHolderType>();
 
         public void notify(NotificationMessageHolderType message) {
@@ -219,8 +221,8 @@ public abstract class WsnBrokerTest exte
     }
 
     public static class PublisherCallback implements Publisher.Callback {
-        public final CountDownLatch subscribed = new CountDownLatch(1);
-        public final CountDownLatch unsubscribed = new CountDownLatch(1);
+        final CountDownLatch subscribed = new CountDownLatch(1);
+        final CountDownLatch unsubscribed = new CountDownLatch(1);
 
         public void subscribe(TopicExpressionType topic) {
             subscribed.countDown();



Mime
View raw message