cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1150766 - in /cxf/trunk/rt/ws/rm/src: main/java/org/apache/cxf/ws/rm/ main/java/org/apache/cxf/ws/rm/soap/ test/java/org/apache/cxf/ws/rm/
Date Mon, 25 Jul 2011 16:14:58 GMT
Author: dkulp
Date: Mon Jul 25 16:14:54 2011
New Revision: 1150766

URL: http://svn.apache.org/viewvc?rev=1150766&view=rev
Log:
Fix checkstyle issues

Modified:
    cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/AbstractSequence.java
    cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ProtocolVariation.java
    cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java
    cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java
    cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java

Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/AbstractSequence.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/AbstractSequence.java?rev=1150766&r1=1150765&r2=1150766&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/AbstractSequence.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/AbstractSequence.java Mon Jul 25
16:14:54 2011
@@ -26,8 +26,8 @@ import org.apache.cxf.ws.rm.v200702.Sequ
 public abstract class AbstractSequence {
     
     protected final Identifier id;
-    private final ProtocolVariation protocol;
     protected SequenceAcknowledgement acknowledgement;
+    private final ProtocolVariation protocol;
     
     protected AbstractSequence(Identifier i, ProtocolVariation p) {
         id = i;

Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ProtocolVariation.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ProtocolVariation.java?rev=1150766&r1=1150765&r2=1150766&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ProtocolVariation.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ProtocolVariation.java Mon Jul 25
16:14:54 2011
@@ -22,8 +22,7 @@ package org.apache.cxf.ws.rm;
 /**
  * Supported protocol variations.
  */
-public enum ProtocolVariation
-{
+public enum ProtocolVariation {
     RM10WSA200408(EncoderDecoder10Impl.INSTANCE, RM10Constants.INSTANCE),
     RM10WSA200508(EncoderDecoder10AImpl.INSTANCE, RM10Constants.INSTANCE),
     RM11WSA200508(EncoderDecoder11Impl.INSTANCE, RM11Constants.INSTANCE);
@@ -60,7 +59,7 @@ public enum ProtocolVariation
      * @return variant (<code>null</code> if not a supported version)
      */
     public static ProtocolVariation findVariant(String wsrm, String wsa) {
-        for (ProtocolVariation variant: ProtocolVariation.values()) {
+        for (ProtocolVariation variant : ProtocolVariation.values()) {
             if (variant.getWSRMNamespace().equals(wsrm) && variant.getWSANamespace().equals(wsa))
{
                 return variant;
             }

Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java?rev=1150766&r1=1150765&r2=1150766&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java Mon Jul 25 16:14:54
2011
@@ -94,7 +94,7 @@ public class RMManager implements Server
     private RMStore store;
     private SequenceIdentifierGenerator idGenerator;
     private RetransmissionQueue retransmissionQueue;
-    private Map<ProtocolVariation,Map<Endpoint, RMEndpoint>> endpointMaps;
+    private Map<ProtocolVariation, Map<Endpoint, RMEndpoint>> endpointMaps;
     private AtomicReference<Timer> timer = new AtomicReference<Timer>();
     private RMAssertion rmAssertion;
     private DeliveryAssuranceType deliveryAssurance;
@@ -104,7 +104,7 @@ public class RMManager implements Server
     private String rmAddressingNamespace = Names200408.WSA_NAMESPACE_NAME;
     
     public RMManager() {
-        setEndpointMaps(new HashMap<ProtocolVariation,Map<Endpoint, RMEndpoint>>());
+        setEndpointMaps(new HashMap<ProtocolVariation, Map<Endpoint, RMEndpoint>>());
     }
     
     // ServerLifeCycleListener
@@ -448,7 +448,7 @@ public class RMManager implements Server
             if (map.size() > 0) {
                 LOG.log(Level.FINE,
                     "Shutting down RMManager with {0} remaining endpoints for protocol variation
{1}.",
-                    new Object[] { new Integer(map.size()), protocol });
+                    new Object[] {new Integer(map.size()), protocol });
                 for (RMEndpoint rme : map.values()) {            
                     rme.shutdown();
                 }
@@ -650,7 +650,7 @@ public class RMManager implements Server
         return endpointMaps;
     }
 
-    void setEndpointMaps(Map<ProtocolVariation, Map<Endpoint, RMEndpoint>> endpointMaps)
{
+    final void setEndpointMaps(Map<ProtocolVariation, Map<Endpoint, RMEndpoint>>
endpointMaps) {
         endpointMaps.put(ProtocolVariation.RM10WSA200408, new HashMap<Endpoint, RMEndpoint>());
         endpointMaps.put(ProtocolVariation.RM10WSA200508, new HashMap<Endpoint, RMEndpoint>());
         endpointMaps.put(ProtocolVariation.RM11WSA200508, new HashMap<Endpoint, RMEndpoint>());

Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java?rev=1150766&r1=1150765&r2=1150766&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java Mon
Jul 25 16:14:54 2011
@@ -76,7 +76,6 @@ import org.apache.cxf.ws.rm.RMManager;
 import org.apache.cxf.ws.rm.RMMessageConstants;
 import org.apache.cxf.ws.rm.RMProperties;
 import org.apache.cxf.ws.rm.SequenceFault;
-import org.apache.cxf.ws.rm.VersionTransformer;
 import org.apache.cxf.ws.rm.v200702.AckRequestedType;
 import org.apache.cxf.ws.rm.v200702.SequenceAcknowledgement;
 

Modified: cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java?rev=1150766&r1=1150765&r2=1150766&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java (original)
+++ cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java Mon Jul
25 16:14:54 2011
@@ -201,7 +201,8 @@ public class SourceSequenceTest extends 
     @Test
     public void testAllAcknowledged() throws RMException {
         
-        SourceSequence seq = new SourceSequence(id, null, null, 4, false, ProtocolVariation.RM10WSA200408);
       
+        SourceSequence seq = new SourceSequence(id, null, null, 4, false,
+                                                ProtocolVariation.RM10WSA200408);       

         setUpSource();
         seq.setSource(source);
         



Mime
View raw message