BUG-731: reduce field visibility

Sonar correctly reports these fields should be private. Let's add
accessors and hide them.

Change-Id: I97e4f6443d22a9b9ed90c3bdab8c3db251d5e4f3
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/Util.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/Util.java
index d35951613f35efb6ec2f6e8f07b3d8ba9dbdf6cd..0aad02b42bedf7d3f798a6ff6c1350c883c395d5 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/Util.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/Util.java
@@ -35,7 +35,7 @@ public final class Util {
                final PcerrBuilder errMessageBuilder = new PcerrBuilder();
                final PCEPErrorMapping mapping = PCEPErrorMapping.getInstance();
                final PCEPErrorIdentifier id = mapping.getFromErrorsEnum(e);
-               final ErrorObject err = new ErrorObjectBuilder().setType(id.type).setValue(id.value).build();
+               final ErrorObject err = new ErrorObjectBuilder().setType(id.getType()).setValue(id.getValue()).build();
                if (t == null) {
                        return errMessageBuilder.setPcerrMessage(
                                        new PcerrMessageBuilder().setErrors(Arrays.asList(new ErrorsBuilder().setErrorObject(err).build())).build()).build();

diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/FiniteStateMachineTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/FiniteStateMachineTest.java
index 8d20c20f5bbaa13bda3dc735d31d4730006363af..33e21b3ff0b359e7d07dc65badd1dc8bbd06d8ba 100644 (file)
--- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/FiniteStateMachineTest.java
+++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/FiniteStateMachineTest.java
@@ -109,7 +109,7 @@ public class FiniteStateMachineTest {
        /**
         * Both PCEs accept session characteristics. Also tests KeepAliveTimer and error message and when pce attempts to
         * establish pce session for the 2nd time.
-        * 
+        *
         * @throws Exception
         */
        @Test
@@ -126,7 +126,7 @@ public class FiniteStateMachineTest {
 
        /**
         * Mock PCE does not accept session characteristics the first time.
-        * 
+        *
         * @throws Exception
         */
        @Test
@@ -152,14 +152,14 @@ public class FiniteStateMachineTest {
                                                                new SessionBuilder().setOpen(
                                                                                new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.open.object.OpenBuilder().setKeepalive(
                                                                                                (short) 1).build()).build()).build()).setErrors(
-                                               Arrays.asList(new ErrorsBuilder().setErrorObject(
-                                                               new ErrorObjectBuilder().setType(maping.getFromErrorsEnum(e).type).setValue(
-                                                                               maping.getFromErrorsEnum(e).value).build()).build())).build()).build();
+                                                                                                               Arrays.asList(new ErrorsBuilder().setErrorObject(
+                                                                                                                               new ErrorObjectBuilder().setType(maping.getFromErrorsEnum(e).getType()).setValue(
+                                                                                                                                               maping.getFromErrorsEnum(e).getValue()).build()).build())).build()).build();
        }
 
        /**
         * Sending different PCEP Message than Open in session establishment phase.
-        * 
+        *
         * @throws Exception
         */
        @Test
@@ -179,7 +179,7 @@ public class FiniteStateMachineTest {
 
        /**
         * KeepWaitTimer expired.
-        * 
+        *
         * @throws Exception
         */
        @Test
@@ -202,7 +202,7 @@ public class FiniteStateMachineTest {
 
        /**
         * OpenWait timer expired.
-        * 
+        *
         * @throws InterruptedException
         */
        @Test

diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractMessageParser.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractMessageParser.java
index 97ce4243f357db907757fddfb7c6ebbd3d7b24f4..60914d7d759940d85fbc7d2a2b134e4224884f72 100644 (file)
--- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractMessageParser.java
+++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractMessageParser.java
@@ -23,8 +23,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.pcerr.message.pcerr.message.error.type.request._case.RequestBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.pcerr.message.pcerr.message.error.type.request._case.request.RpsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.rp.object.Rp;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
@@ -32,8 +30,6 @@ import com.google.common.primitives.UnsignedBytes;
 
 public abstract class AbstractMessageParser implements MessageParser, MessageSerializer {
 
-       private static final Logger LOG = LoggerFactory.getLogger(AbstractMessageParser.class);
-
        private static final int COMMON_OBJECT_HEADER_LENGTH = 4;
 
        private static final int OC_F_LENGTH = 1;
@@ -118,8 +114,8 @@ public abstract class AbstractMessageParser implements MessageParser, MessageSer
                return new PcerrBuilder().setPcerrMessage(
                                new PcerrMessageBuilder().setErrors(
                                                Arrays.asList(new ErrorsBuilder().setErrorObject(
-                                                               new ErrorObjectBuilder().setType(maping.getFromErrorsEnum(e).type).setValue(
-                                                                               maping.getFromErrorsEnum(e).value).build()).build())).build()).build();
+                                                               new ErrorObjectBuilder().setType(maping.getFromErrorsEnum(e).getType()).setValue(
+                                                                               maping.getFromErrorsEnum(e).getValue()).build()).build())).build()).build();
        }
 
        public static Message createErrorMsg(final PCEPErrors e, final Rp rp) {
@@ -129,8 +125,8 @@ public abstract class AbstractMessageParser implements MessageParser, MessageSer
                                                new RequestCaseBuilder().setRequest(
                                                                new RequestBuilder().setRps(Lists.newArrayList(new RpsBuilder().setRp(rp).build())).build()).build()).setErrors(
                                                                                Arrays.asList(new ErrorsBuilder().setErrorObject(
-                                                                                               new ErrorObjectBuilder().setType(maping.getFromErrorsEnum(e).type).setValue(
-                                                                                                               maping.getFromErrorsEnum(e).value).build()).build())).build()).build();
+                                                                                               new ErrorObjectBuilder().setType(maping.getFromErrorsEnum(e).getType()).setValue(
+                                                                                                               maping.getFromErrorsEnum(e).getValue()).build()).build())).build()).build();
        }
 
        protected abstract Message validate(final List<Object> objects, final List<Message> errors) throws PCEPDeserializerException;

diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PCEPErrorMapping.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PCEPErrorMapping.java
index 19d4d28ff17fef045eaa6eabed265a39c610afb9..307ae1c25b2c8319d84e1a7c74dd7a99e0b5a0f0 100644 (file)
--- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PCEPErrorMapping.java
+++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PCEPErrorMapping.java
@@ -26,14 +26,22 @@ public final class PCEPErrorMapping {
         * Caret for combination of Error-type and Error-value
         */
        public static final class PCEPErrorIdentifier {
-               public short type;
-               public short value;
+               private final short type;
+               private final short value;
 
                private PCEPErrorIdentifier(final short type, final short value) {
                        this.type = type;
                        this.value = value;
                }
 
+               public short getType() {
+                       return type;
+               }
+
+               public short getValue() {
+                       return value;
+               }
+
                @Override
                public int hashCode() {
                        final int prime = 31;

diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/UnknownObject.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/UnknownObject.java
index ddf1f26d7d65a84b8c56e44897f73f6d7e751657..37a83bf710299957dc3f4917786d00d03b2a22ec 100644 (file)
--- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/UnknownObject.java
+++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/UnknownObject.java
@@ -36,7 +36,7 @@ public final class UnknownObject implements Object {
 
                final PCEPErrorMapping mapping = PCEPErrorMapping.getInstance();
                this.error = new ErrorsBuilder().setErrorObject(
-                               new ErrorObjectBuilder().setType(mapping.getFromErrorsEnum(error).type).setValue(mapping.getFromErrorsEnum(error).value).build()).build();
+                               new ErrorObjectBuilder().setType(mapping.getFromErrorsEnum(error).getType()).setValue(mapping.getFromErrorsEnum(error).getValue()).build()).build();
                this.invalidObject = invalidObject;
        }