Sonar: Move trailing comment on previous empty line

Change-Id: I300972c7be4d89ffdc73a58475fa4a533ab5fc4b
Signed-off-by: Lorand Jakab <lojakab@cisco.com>

diff --git a/commons/unittest_tools/src/main/java/org/opendaylight/lispflowmapping/tools/junit/BaseExpectations.java b/commons/unittest_tools/src/main/java/org/opendaylight/lispflowmapping/tools/junit/BaseExpectations.java
index b34ecc631b75f00d849b2337cfb3570d1c164040..2b300d7c3214653e0366072ea1a1f91bd3307b34 100644 (file)
--- a/commons/unittest_tools/src/main/java/org/opendaylight/lispflowmapping/tools/junit/BaseExpectations.java
+++ b/commons/unittest_tools/src/main/java/org/opendaylight/lispflowmapping/tools/junit/BaseExpectations.java
@@ -47,8 +47,8 @@ public abstract class BaseExpectations extends Expectations {
         context = new Mockery() {
             {
                 setImposteriser(ClassImposteriser.INSTANCE);
-                setThreadingPolicy(synchroniser); // otherwise we get errors on
-                // the finalizer thread
+                // otherwise we get errors on the finalizer thread:
+                setThreadingPolicy(synchroniser);
             }
         };
         defaultAction = new ReturnDefaultValueAction(ClassImposteriser.INSTANCE);

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/authentication/LispKeyIDEnum.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/authentication/LispKeyIDEnum.java
index 2a9007723e229ecbe39c19de0216f57ba10c97d0..d99cee78a93bd302d56a84a1c3b79a0e0fa38be1 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/authentication/LispKeyIDEnum.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/authentication/LispKeyIDEnum.java
@@ -8,9 +8,9 @@
 package org.opendaylight.lispflowmapping.lisp.authentication;
 
 public enum LispKeyIDEnum {
-    NONE(0, null), //
-    SHA1(1, "HmacSHA1"), //
-    SHA256(2, "HmacSHA256"), //
+    NONE(0, null),
+    SHA1(1, "HmacSHA1"),
+    SHA256(2, "HmacSHA256"),
     UNKNOWN(-1, null);
 
     private short keyID;

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/MapReplySerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/MapReplySerializer.java
index 2b877b5258d9dd62a213a682d062c1d708c925f9..34ee197ae9f5b01c08b5a743f92fe338b7890328 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/MapReplySerializer.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/MapReplySerializer.java
@@ -42,9 +42,9 @@ public final class MapReplySerializer {
 
         ByteBuffer replyBuffer = ByteBuffer.allocate(size);
 
-        replyBuffer.put((byte) ((MessageType.MapReply.getIntValue() << 4) | //
-                (BooleanUtils.isTrue(mapReply.isProbe()) ? Flags.PROBE : 0x00) | //
-                (BooleanUtils.isTrue(mapReply.isEchoNonceEnabled()) ? Flags.ECHO_NONCE_ENABLED : 0x00)));
+        replyBuffer.put((byte) ((MessageType.MapReply.getIntValue() << 4)
+                | (BooleanUtils.isTrue(mapReply.isProbe()) ? Flags.PROBE : 0x00)
+                | (BooleanUtils.isTrue(mapReply.isEchoNonceEnabled()) ? Flags.ECHO_NONCE_ENABLED : 0x00)));
 
         replyBuffer.position(replyBuffer.position() + Length.RES);
         if (mapReply.getMappingRecordItem() != null) {

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/MappingRecordSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/MappingRecordSerializer.java
index 84b2b887832e852039931273f074eba35f7913cc..d498d7ca99f4138d68ee91bcd0baf7d93618ddeb 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/MappingRecordSerializer.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/MappingRecordSerializer.java
@@ -79,8 +79,8 @@ public final class MappingRecordSerializer {
         if (record.getAction() != null) {
             act = record.getAction();
         }
-        replyBuffer.put((byte) ((act.getIntValue() << 5) | //
-                ByteUtil.boolToBit(BooleanUtils.isTrue(record.isAuthoritative()), Flags.AUTHORITATIVE)));
+        replyBuffer.put((byte) ((act.getIntValue() << 5)
+                | ByteUtil.boolToBit(BooleanUtils.isTrue(record.isAuthoritative()), Flags.AUTHORITATIVE)));
         replyBuffer.position(replyBuffer.position() + Length.RESERVED);
         replyBuffer.putShort(NumberUtil.asShort(record.getMapVersion()));
         if (record.getEid() != null && record.getEid().getAddress() != null) {

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4PrefixBinarySerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4PrefixBinarySerializer.java
index 674def576bd27c04ec83a9cd042fa240ccf4eff3..ad76bb41e0271b92b91e802a1894a121bdf575bc 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4PrefixBinarySerializer.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4PrefixBinarySerializer.java
@@ -53,12 +53,14 @@ public final class Ipv4PrefixBinarySerializer extends LispAddressSerializer {
 
     @Override
     public int getAddressSize(LispAddress lispAddress) {
-        return Length.IPV4; // XXX does this need to worry about the mask too?
+        // XXX does this need to worry about the mask too?
+        return Length.IPV4;
     }
 
     @Override
     public int getAddressSize(SimpleAddress simpleAddress) {
-        return Length.IPV4; // XXX does this need to worry about the mask too?
+        // XXX does this need to worry about the mask too?
+        return Length.IPV4;
     }
 
     @Override

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4PrefixSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4PrefixSerializer.java
index 2022a5e64206e5807a9afb57cc1c72ba8d702ad1..b151afdc8798f03faa4169064be67da94fae9cac 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4PrefixSerializer.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4PrefixSerializer.java
@@ -50,12 +50,14 @@ public final class Ipv4PrefixSerializer extends LispAddressSerializer {
 
     @Override
     public int getAddressSize(LispAddress lispAddress) {
-        return Length.IPV4; // XXX does this need to worry about the mask too?
+        // XXX does this need to worry about the mask too?
+        return Length.IPV4;
     }
 
     @Override
     public int getAddressSize(SimpleAddress simpleAddress) {
-        return Length.IPV4; // XXX does this need to worry about the mask too?
+        // XXX does this need to worry about the mask too?
+        return Length.IPV4;
     }
 
     @Override

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6PrefixBinarySerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6PrefixBinarySerializer.java
index 81a28d1bdca48ddccbc1ad0aceb6f9672b203431..7c47d740ba24ee360f9c3d04c2f7eb80ed36901f 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6PrefixBinarySerializer.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6PrefixBinarySerializer.java
@@ -50,12 +50,14 @@ public final class Ipv6PrefixBinarySerializer extends LispAddressSerializer {
 
     @Override
     public int getAddressSize(LispAddress lispAddress) {
-        return Length.IPV6; // XXX does this need to worry about the mask too?
+        // XXX does this need to worry about the mask too?
+        return Length.IPV6;
     }
 
     @Override
     public int getAddressSize(SimpleAddress simpleAddress) {
-        return Length.IPV6; // XXX does this need to worry about the mask too?
+        // XXX does this need to worry about the mask too?
+        return Length.IPV6;
     }
 
     @Override

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6PrefixSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6PrefixSerializer.java
index 627b3d944e63a7ac3cd28052795ba9b6e1c23415..27a023b4a75e3f2878e7a8fa8d0b100be54c79b5 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6PrefixSerializer.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6PrefixSerializer.java
@@ -50,12 +50,14 @@ public final class Ipv6PrefixSerializer extends LispAddressSerializer {
 
     @Override
     public int getAddressSize(LispAddress lispAddress) {
-        return Length.IPV6; // XXX does this need to worry about the mask too?
+        // XXX does this need to worry about the mask too?
+        return Length.IPV6;
     }
 
     @Override
     public int getAddressSize(SimpleAddress simpleAddress) {
-        return Length.IPV6; // XXX does this need to worry about the mask too?
+        // XXX does this need to worry about the mask too?
+        return Length.IPV6;
     }
 
     @Override

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/LcafSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/LcafSerializer.java
index 082a486c872554817baf1ec6f51860a405f33835..f3c8a3f63a227bfb5cea70b320e526b8ab5fbc20 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/LcafSerializer.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/LcafSerializer.java
@@ -70,7 +70,8 @@ public class LcafSerializer extends LispAddressSerializer {
 
     private void serializeLCAFAddressHeader(ByteBuffer buffer, LispAddress lispAddress,
             LispAddressSerializer serializer) {
-        buffer.putShort((short) 0); // RES + Flags.
+        // RES + Flags
+        buffer.putShort((short) 0);
         buffer.put(serializer.getLcafType());
         buffer.put((byte) 0);
     }

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/SourceDestKeySerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/SourceDestKeySerializer.java
index 2bf62f22ab176ca7166d9ef0e77faa93515e4684..24f873fff259c674061e5b4cff68dd4b5ec5839a 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/SourceDestKeySerializer.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/SourceDestKeySerializer.java
@@ -97,7 +97,9 @@ public final class SourceDestKeySerializer extends LcafSerializer {
     }
 
     private Address deserializeData(ByteBuffer buffer, LispAddressSerializerContext ctx) {
-        buffer.getShort();  // reserved bytes
+        // reserved bytes
+        buffer.getShort();
+
         short srcMaskLength = (short) ByteUtil.getUnsignedByte(buffer);
         short dstMaskLength = (short) ByteUtil.getUnsignedByte(buffer);
         ctx.setMaskLen(srcMaskLength);

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/type/LispCanonicalAddressFormatEnum.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/type/LispCanonicalAddressFormatEnum.java
index 33d6e22ec1d54348e862b688e7a25506fedc20b1..4c7930bf7258884b26b35ca5c1a6d029da5b075f 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/type/LispCanonicalAddressFormatEnum.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/type/LispCanonicalAddressFormatEnum.java
@@ -12,12 +12,12 @@ package org.opendaylight.lispflowmapping.lisp.type;
  * The LCAF enum. http://tools.ietf.org/html/draft-ietf-lisp-lcaf-03
  */
 public enum LispCanonicalAddressFormatEnum {
-    LIST(1), //
-    SEGMENT(2), //
-    APPLICATION_DATA(4), //
-    SOURCE_DEST(12), //
-    TRAFFIC_ENGINEERING(10), //
-    KEY_VALUE(15), //
+    LIST(1),
+    SEGMENT(2),
+    APPLICATION_DATA(4),
+    SOURCE_DEST(12),
+    TRAFFIC_ENGINEERING(10),
+    KEY_VALUE(15),
     SERVICE_PATH(17),
     UNKNOWN(-1);