From: Maros Marsalek <mmarsale@cisco.com>
Date: Fri, 20 Jun 2014 12:29:26 +0000 (+0200)
Subject: Fix checkstyle errors in sal-compatibility
X-Git-Tag: release/helium~634^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F73%2F8173%2F1;p=controller.git

Fix checkstyle errors in sal-compatibility

Change-Id: I696d3ade9b3b9d5705efa03f2a27dd914ae295ef
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
---

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 3f1fa38ebd..1c21351d57 100644
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -20,9 +20,9 @@
     <appauth.version>0.4.2-SNAPSHOT</appauth.version>
     <archetype-app-northbound>0.0.1-SNAPSHOT</archetype-app-northbound>
     <aries.util.version>1.1.0</aries.util.version>
-    <arphandler.version>0.5.2-SNAPSHOT</arphandler.version>
     <!-- Controller Modules Versions -->
     <arphandler.version>0.5.2-SNAPSHOT</arphandler.version>
+    <arphandler.version>0.5.2-SNAPSHOT</arphandler.version>
     <asm.version>4.1</asm.version>
     <!-- Plugin Versions -->
     <bouncycastle.version>1.50</bouncycastle.version>
diff --git a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/ToSalConversionsUtils.java b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/ToSalConversionsUtils.java
index b64f17a770..97a25bf71c 100644
--- a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/ToSalConversionsUtils.java
+++ b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/ToSalConversionsUtils.java
@@ -134,7 +134,7 @@ public class ToSalConversionsUtils {
     public static Flow toFlow(org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.Flow source, Node node) {
         final Flow target = new Flow();
         genericFlowToAdFlow(source, target);
-        
+
         target.setMatch(toMatch(source.getMatch()));
 
         List<Action> actions = getAction(source);
@@ -144,7 +144,7 @@ public class ToSalConversionsUtils {
 
         return target;
     }
-    
+
     /**
      * @param source notification, missing instructions
      * @param node corresponding node where the flow change occured
@@ -181,7 +181,7 @@ public class ToSalConversionsUtils {
         }
         target.setId(source.getCookie().getValue().longValue());
     }
-    
+
     public static List<Action> getAction(
             org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.Flow source) {
         if (source.getInstructions() != null) {