diff --git a/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/codec/EncodeMappingActionCodecHelper.java b/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/codec/EncodeMappingActionCodecHelper.java
index 741df5a..ded1462 100644
--- a/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/codec/EncodeMappingActionCodecHelper.java
+++ b/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/codec/EncodeMappingActionCodecHelper.java
@@ -30,7 +30,7 @@
  * Encode portion of the mapping action codec.
  */
 public final class EncodeMappingActionCodecHelper {
-    protected static final Logger log = getLogger(EncodeMappingActionCodecHelper.class);
+    private static final Logger log = getLogger(EncodeMappingActionCodecHelper.class);
     private final MappingAction action;
     private final CodecContext context;
 
diff --git a/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/codec/EncodeMappingInstructionCodecHelper.java b/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/codec/EncodeMappingInstructionCodecHelper.java
index fffa872..fa04df8 100644
--- a/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/codec/EncodeMappingInstructionCodecHelper.java
+++ b/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/codec/EncodeMappingInstructionCodecHelper.java
@@ -28,7 +28,7 @@
  * JSON encoding of MappingInstructions.
  */
 public final class EncodeMappingInstructionCodecHelper {
-    protected static final Logger log = getLogger(EncodeMappingInstructionCodecHelper.class);
+    private static final Logger log = getLogger(EncodeMappingInstructionCodecHelper.class);
     private final MappingInstruction instruction;
     private final CodecContext context;
 
diff --git a/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/codec/MappingActionCodec.java b/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/codec/MappingActionCodec.java
index bf7adac..8a86977 100644
--- a/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/codec/MappingActionCodec.java
+++ b/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/codec/MappingActionCodec.java
@@ -27,11 +27,11 @@
  */
 public final class MappingActionCodec extends JsonCodec<MappingAction> {
 
-    protected static final Logger log =
+    private static final Logger log =
                             LoggerFactory.getLogger(MappingActionCodec.class);
 
-    protected static final String TYPE = "type";
-    protected static final String ERROR_MESSAGE =
+    static final String TYPE = "type";
+    static final String ERROR_MESSAGE =
                                     " not specified in MappingAction";
 
     @Override
diff --git a/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/codec/MappingAddressCodec.java b/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/codec/MappingAddressCodec.java
index fe404b4..f04890f 100644
--- a/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/codec/MappingAddressCodec.java
+++ b/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/codec/MappingAddressCodec.java
@@ -27,15 +27,15 @@
  */
 public final class MappingAddressCodec extends JsonCodec<MappingAddress> {
 
-    protected static final Logger log =
+    private static final Logger log =
                             LoggerFactory.getLogger(MappingAddressCodec.class);
 
-    protected static final String TYPE = "type";
-    protected static final String IPV4 = "ipv4";
-    protected static final String IPV6 = "ipv6";
-    protected static final String MAC = "mac";
-    protected static final String DN = "dn";
-    protected static final String AS = "as";
+    static final String TYPE = "type";
+    static final String IPV4 = "ipv4";
+    static final String IPV6 = "ipv6";
+    static final String MAC = "mac";
+    static final String DN = "dn";
+    static final String AS = "as";
 
     @Override
     public ObjectNode encode(MappingAddress address, CodecContext context) {
diff --git a/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/codec/MappingEntryCodec.java b/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/codec/MappingEntryCodec.java
index bd69ca8..e47fb75 100644
--- a/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/codec/MappingEntryCodec.java
+++ b/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/codec/MappingEntryCodec.java
@@ -29,11 +29,11 @@
  */
 public final class MappingEntryCodec extends JsonCodec<MappingEntry> {
 
-    protected static final String KEY = "key";
-    protected static final String VALUE = "value";
-    protected static final String ID = "id";
-    protected static final String DEVICE_ID = "deviceId";
-    protected static final String STATE = "state";
+    static final String KEY = "key";
+    static final String VALUE = "value";
+    static final String ID = "id";
+    static final String DEVICE_ID = "deviceId";
+    static final String STATE = "state";
 
     @Override
     public ObjectNode encode(MappingEntry mappingEntry, CodecContext context) {
diff --git a/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/codec/MappingInstructionCodec.java b/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/codec/MappingInstructionCodec.java
index 57a5e48..316e329 100644
--- a/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/codec/MappingInstructionCodec.java
+++ b/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/codec/MappingInstructionCodec.java
@@ -29,18 +29,18 @@
  */
 public final class MappingInstructionCodec extends JsonCodec<MappingInstruction> {
 
-    protected static final Logger log = LoggerFactory.getLogger(MappingInstructionCodec.class);
+    private static final Logger log = LoggerFactory.getLogger(MappingInstructionCodec.class);
 
-    protected static final String TYPE = "type";
-    protected static final String SUBTYPE = "subtype";
-    protected static final String UNICAST_WEIGHT = "unicastWeight";
-    protected static final String UNICAST_PRIORITY = "unicastPriority";
-    protected static final String MULTICAST_WEIGHT = "multicastWeight";
-    protected static final String MULTICAST_PRIORITY = "multicastPriority";
+    static final String TYPE = "type";
+    static final String SUBTYPE = "subtype";
+    static final String UNICAST_WEIGHT = "unicastWeight";
+    static final String UNICAST_PRIORITY = "unicastPriority";
+    static final String MULTICAST_WEIGHT = "multicastWeight";
+    static final String MULTICAST_PRIORITY = "multicastPriority";
 
-    protected static final String MISSING_MEMBER_MESSAGE =
+    static final String MISSING_MEMBER_MESSAGE =
                                         " member is required in Instruction";
-    protected static final String ERROR_MESSAGE =
+    static final String ERROR_MESSAGE =
                                         " not specified in Instruction";
 
     @Override
diff --git a/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/codec/MappingValueCodec.java b/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/codec/MappingValueCodec.java
index f128243..199df62 100644
--- a/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/codec/MappingValueCodec.java
+++ b/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/codec/MappingValueCodec.java
@@ -34,8 +34,8 @@
  */
 public final class MappingValueCodec extends JsonCodec<MappingValue> {
 
-    protected static final String ACTION = "action";
-    protected static final String TREATMENTS = "treatments";
+    static final String ACTION = "action";
+    static final String TREATMENTS = "treatments";
 
     @Override
     public ObjectNode encode(MappingValue value, CodecContext context) {
diff --git a/apps/newoptical/src/main/java/org/onosproject/newoptical/OpticalPathProvisioner.java b/apps/newoptical/src/main/java/org/onosproject/newoptical/OpticalPathProvisioner.java
index ca2d3de..e907cf5 100644
--- a/apps/newoptical/src/main/java/org/onosproject/newoptical/OpticalPathProvisioner.java
+++ b/apps/newoptical/src/main/java/org/onosproject/newoptical/OpticalPathProvisioner.java
@@ -120,7 +120,7 @@
         extends AbstractListenerManager<OpticalPathEvent, OpticalPathListener>
         implements OpticalPathService {
 
-    protected static final Logger log = LoggerFactory.getLogger(OpticalPathProvisioner.class);
+    private static final Logger log = LoggerFactory.getLogger(OpticalPathProvisioner.class);
 
     /**
      * Bandwidth representing no bandwidth requirement specified.
diff --git a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingArpHandler.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingArpHandler.java
index 1031f19..a8bec5f 100644
--- a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingArpHandler.java
+++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingArpHandler.java
@@ -72,19 +72,19 @@
     private static final String GATEWAY_MAC = "gatewayMac";
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected CoreService coreService;
+    CoreService coreService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected PacketService packetService;
+    PacketService packetService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected ComponentConfigService configService;
+    ComponentConfigService configService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected InstancePortService instancePortService;
+    InstancePortService instancePortService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected OpenstackNetworkService osNetworkService;
+    OpenstackNetworkService osNetworkService;
 
     @Property(name = GATEWAY_MAC, value = DEFAULT_GATEWAY_MAC_STR,
             label = "Fake MAC address for virtual network subnet gateway")
@@ -98,7 +98,7 @@
     private ApplicationId appId;
 
     @Activate
-    protected void activate() {
+    void activate() {
         appId = coreService.registerApplication(OPENSTACK_NETWORKING_APP_ID);
         configService.registerProperties(getClass());
         osNetworkService.addListener(osNetworkListener);
@@ -110,7 +110,7 @@
     }
 
     @Deactivate
-    protected void deactivate() {
+    void deactivate() {
         packetService.removeProcessor(packetProcessor);
         osNetworkService.removeListener(osNetworkListener);
         configService.unregisterProperties(getClass(), false);
@@ -119,7 +119,7 @@
     }
 
     @Modified
-    protected void modified(ComponentContext context) {
+    void modified(ComponentContext context) {
         Dictionary<?, ?> properties = context.getProperties();
         String updatedMac;
 
diff --git a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingHandler.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingHandler.java
index 2749962..2e40769 100644
--- a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingHandler.java
+++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingHandler.java
@@ -85,31 +85,31 @@
     private static final String ERR_SET_FLOWS = "Failed to set flows for %s: ";
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected CoreService coreService;
+    CoreService coreService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected MastershipService mastershipService;
+    MastershipService mastershipService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected DeviceService deviceService;
+    DeviceService deviceService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected OpenstackFlowRuleService osFlowRuleService;
+    OpenstackFlowRuleService osFlowRuleService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected InstancePortService instancePortService;
+    InstancePortService instancePortService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected OpenstackNetworkService osNetworkService;
+    OpenstackNetworkService osNetworkService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected OpenstackNodeService osNodeService;
+    OpenstackNodeService osNodeService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected DriverService driverService;
+    DriverService driverService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected OpenstackSecurityGroupService securityGroupService;
+    OpenstackSecurityGroupService securityGroupService;
 
     private final ExecutorService eventExecutor = newSingleThreadExecutor(
             groupedThreads(this.getClass().getSimpleName(), "event-handler"));
@@ -119,7 +119,7 @@
     private ApplicationId appId;
 
     @Activate
-    protected void activate() {
+    void activate() {
         appId = coreService.registerApplication(OPENSTACK_NETWORKING_APP_ID);
         instancePortService.addListener(instancePortListener);
         osNetworkService.addListener(osNetworkListener);
@@ -128,7 +128,7 @@
     }
 
     @Deactivate
-    protected void deactivate() {
+    void deactivate() {
         instancePortService.removeListener(instancePortListener);
         osNetworkService.removeListener(osNetworkListener);
         eventExecutor.shutdown();
diff --git a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingHostProvider.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingHostProvider.java
index 9dfb229..0e4f7ab 100644
--- a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingHostProvider.java
+++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingHostProvider.java
@@ -78,25 +78,25 @@
     private static final String ANNOTATION_SEGMENT_ID = "segId";
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected CoreService coreService;
+    CoreService coreService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected DeviceService deviceService;
+    DeviceService deviceService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected HostProviderRegistry hostProviderRegistry;
+    HostProviderRegistry hostProviderRegistry;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected HostService hostService;
+    HostService hostService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected MastershipService mastershipService;
+    MastershipService mastershipService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected OpenstackNetworkService osNetworkService;
+    OpenstackNetworkService osNetworkService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected OpenstackNodeService osNodeService;
+    OpenstackNodeService osNodeService;
 
     private final ExecutorService deviceEventExecutor =
             Executors.newSingleThreadExecutor(groupedThreads("openstacknetworking", "device-event"));
@@ -115,7 +115,7 @@
     }
 
     @Activate
-    protected void activate() {
+    void activate() {
         coreService.registerApplication(OPENSTACK_NETWORKING_APP_ID);
         deviceService.addListener(internalDeviceListener);
         osNodeService.addListener(internalNodeListener);
@@ -125,7 +125,7 @@
     }
 
     @Deactivate
-    protected void deactivate() {
+    void deactivate() {
         hostProviderRegistry.unregister(this);
         osNodeService.removeListener(internalNodeListener);
         deviceService.removeListener(internalDeviceListener);
diff --git a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/RulePopulatorUtil.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/RulePopulatorUtil.java
index b569da1..07a808d 100644
--- a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/RulePopulatorUtil.java
+++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/RulePopulatorUtil.java
@@ -42,7 +42,7 @@
  */
 public final class RulePopulatorUtil {
 
-    protected static final Logger log = getLogger(RulePopulatorUtil.class);
+    private static final Logger log = getLogger(RulePopulatorUtil.class);
 
     private static final String TUNNEL_DST = "tunnelDst";
     private static final String CT_FLAGS = "flags";
diff --git a/apps/optical-model/src/main/java/org/onosproject/net/optical/intent/impl/compiler/OpticalConnectivityIntentCompiler.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/intent/impl/compiler/OpticalConnectivityIntentCompiler.java
index 9a2b6bf..e3794c2 100644
--- a/apps/optical-model/src/main/java/org/onosproject/net/optical/intent/impl/compiler/OpticalConnectivityIntentCompiler.java
+++ b/apps/optical-model/src/main/java/org/onosproject/net/optical/intent/impl/compiler/OpticalConnectivityIntentCompiler.java
@@ -75,7 +75,7 @@
 @Component(immediate = true)
 public class OpticalConnectivityIntentCompiler implements IntentCompiler<OpticalConnectivityIntent> {
 
-    protected static final Logger log = LoggerFactory.getLogger(OpticalConnectivityIntentCompiler.class);
+    private static final Logger log = LoggerFactory.getLogger(OpticalConnectivityIntentCompiler.class);
     // By default, allocate 50 GHz lambdas (4 slots of 12.5 GHz) for each intent.
     private static final int SLOT_COUNT = 4;
 
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java
index 6f56154..ab1363c 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java
@@ -75,7 +75,7 @@
  * whether the current device is an edge device or a transit device.
  */
 public class DefaultGroupHandler {
-    protected static final Logger log = getLogger(DefaultGroupHandler.class);
+    private static final Logger log = getLogger(DefaultGroupHandler.class);
 
     private static final long VERIFY_INTERVAL = 30; // secs
 
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/DestinationSet.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/DestinationSet.java
index 7b0864a..7f839cf 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/DestinationSet.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/DestinationSet.java
@@ -43,7 +43,7 @@
     private final int edgeLabel2;
 
 
-    protected static final Logger log = getLogger(DestinationSet.class);
+    private static final Logger log = getLogger(DestinationSet.class);
 
     /**
      * Constructor for a single destination with no Edge label.
diff --git a/apps/vpls/src/main/java/org/onosproject/vpls/intent/VplsIntentUtility.java b/apps/vpls/src/main/java/org/onosproject/vpls/intent/VplsIntentUtility.java
index 973465b..6b50731 100644
--- a/apps/vpls/src/main/java/org/onosproject/vpls/intent/VplsIntentUtility.java
+++ b/apps/vpls/src/main/java/org/onosproject/vpls/intent/VplsIntentUtility.java
@@ -131,7 +131,7 @@
      * @param resourceGroup resource group for this Intent
      * @return the generated single-point to multi-point intent
      */
-    protected static SinglePointToMultiPointIntent buildBrcIntent(Key key,
+    static SinglePointToMultiPointIntent buildBrcIntent(Key key,
                                                                   ApplicationId appId,
                                                                   FilteredConnectPoint src,
                                                                   Set<FilteredConnectPoint> dsts,
@@ -212,7 +212,7 @@
      * @param resourceGroup resource group for this Intent
      * @return the generated multi-point to single-point intent
      */
-    protected static MultiPointToSinglePointIntent buildUniIntent(Key key,
+    static MultiPointToSinglePointIntent buildUniIntent(Key key,
                                                                   ApplicationId appId,
                                                                   Set<FilteredConnectPoint> srcs,
                                                                   FilteredConnectPoint dst,
@@ -256,7 +256,7 @@
      * @param appId application ID for the key
      * @return the key to identify the intent
      */
-    protected static Key buildKey(String prefix,
+    static Key buildKey(String prefix,
                                   ConnectPoint cPoint,
                                   String vplsName,
                                   MacAddress hostMac,
@@ -310,7 +310,7 @@
      * @param iface the network interface
      * @return the filtered connected point of a given network interface
      */
-    protected static FilteredConnectPoint buildFilteredConnectedPoint(Interface iface) {
+    static FilteredConnectPoint buildFilteredConnectedPoint(Interface iface) {
         Objects.requireNonNull(iface);
         TrafficSelector.Builder trafficSelector = DefaultTrafficSelector.builder();
 
@@ -327,7 +327,7 @@
      * @param host the host
      * @return the filtered connected point of the given host
      */
-    protected static FilteredConnectPoint buildFilteredConnectedPoint(Host host) {
+    static FilteredConnectPoint buildFilteredConnectedPoint(Host host) {
         requireNonNull(host);
         TrafficSelector.Builder trafficSelector = DefaultTrafficSelector.builder();
 
diff --git a/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/TenantNetworkWebResource.java b/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/TenantNetworkWebResource.java
index c984c4f..fb64164 100644
--- a/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/TenantNetworkWebResource.java
+++ b/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/TenantNetworkWebResource.java
@@ -72,7 +72,7 @@
     public static final String DELETE_NETWORK = "delete network";
     public static final String JSON_NOT_NULL = "JsonNode can not be null";
 
-    protected static final Logger log = LoggerFactory
+    private static final Logger log = LoggerFactory
             .getLogger(TenantNetworkWebResource.class);
     private final ConcurrentMap<TenantNetworkId, TenantNetwork> networksMap = Maps
             .newConcurrentMap();
diff --git a/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/VirtualPortWebResource.java b/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/VirtualPortWebResource.java
index cb5b7d6..a26f2da 100644
--- a/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/VirtualPortWebResource.java
+++ b/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/VirtualPortWebResource.java
@@ -76,7 +76,7 @@
     public static final String VPORT_ID_EXIST = "VirtualPort id is exist";
     public static final String VPORT_ID_NOT_EXIST = "VirtualPort id is not exist";
     public static final String JSON_NOT_NULL = "JsonNode can not be null";
-    protected static final Logger log = LoggerFactory
+    private static final Logger log = LoggerFactory
             .getLogger(VirtualPortService.class);
 
     @GET
diff --git a/core/common/src/main/java/org/onosproject/codec/impl/ConstraintCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/ConstraintCodec.java
index 5aa6f35..5c99650 100644
--- a/core/common/src/main/java/org/onosproject/codec/impl/ConstraintCodec.java
+++ b/core/common/src/main/java/org/onosproject/codec/impl/ConstraintCodec.java
@@ -30,16 +30,16 @@
 
     protected static final String MISSING_MEMBER_MESSAGE =
             " member is required in Constraint";
-    protected static final String TYPE = "type";
-    protected static final String TYPES = "types";
-    protected static final String INCLUSIVE = "inclusive";
-    protected static final String KEY = "key";
-    protected static final String THRESHOLD = "threshold";
-    protected static final String BANDWIDTH = "bandwidth";
-    protected static final String LAMBDA = "lambda";
-    protected static final String LATENCY_MILLIS = "latencyMillis";
-    protected static final String OBSTACLES = "obstacles";
-    protected static final String WAYPOINTS = "waypoints";
+    static final String TYPE = "type";
+    static final String TYPES = "types";
+    static final String INCLUSIVE = "inclusive";
+    static final String KEY = "key";
+    static final String THRESHOLD = "threshold";
+    static final String BANDWIDTH = "bandwidth";
+    static final String LAMBDA = "lambda";
+    static final String LATENCY_MILLIS = "latencyMillis";
+    static final String OBSTACLES = "obstacles";
+    static final String WAYPOINTS = "waypoints";
 
     @Override
     public ObjectNode encode(Constraint constraint, CodecContext context) {
diff --git a/core/common/src/main/java/org/onosproject/codec/impl/CriterionCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/CriterionCodec.java
index 0e23e02..ec1b061 100644
--- a/core/common/src/main/java/org/onosproject/codec/impl/CriterionCodec.java
+++ b/core/common/src/main/java/org/onosproject/codec/impl/CriterionCodec.java
@@ -28,51 +28,51 @@
  */
 public final class CriterionCodec extends JsonCodec<Criterion> {
 
-    protected static final Logger log =
+    private static final Logger log =
             LoggerFactory.getLogger(CriterionCodec.class);
 
-    protected static final String TYPE = "type";
-    protected static final String ETH_TYPE = "ethType";
-    protected static final String MAC = "mac";
-    protected static final String PORT = "port";
-    protected static final String METADATA = "metadata";
+    static final String TYPE = "type";
+    static final String ETH_TYPE = "ethType";
+    static final String MAC = "mac";
+    static final String PORT = "port";
+    static final String METADATA = "metadata";
 
-    protected static final String VLAN_ID = "vlanId";
-    protected static final String INNER_VLAN_ID = "innerVlanId";
-    protected static final String INNER_PRIORITY = "innerPriority";
-    protected static final String PRIORITY = "priority";
-    protected static final String IP_DSCP = "ipDscp";
-    protected static final String IP_ECN = "ipEcn";
-    protected static final String PROTOCOL = "protocol";
-    protected static final String IP = "ip";
-    protected static final String TCP_PORT = "tcpPort";
-    protected static final String TCP_MASK = "tcpMask";
-    protected static final String UDP_PORT = "udpPort";
-    protected static final String UDP_MASK = "udpMask";
-    protected static final String SCTP_PORT = "sctpPort";
-    protected static final String SCTP_MASK = "sctpMask";
-    protected static final String ICMP_TYPE = "icmpType";
-    protected static final String ICMP_CODE = "icmpCode";
-    protected static final String FLOW_LABEL = "flowLabel";
-    protected static final String ICMPV6_TYPE = "icmpv6Type";
-    protected static final String ICMPV6_CODE = "icmpv6Code";
-    protected static final String TARGET_ADDRESS = "targetAddress";
-    protected static final String LABEL = "label";
-    protected static final String BOS = "bos";
-    protected static final String EXT_HDR_FLAGS = "exthdrFlags";
-    protected static final String LAMBDA = "lambda";
-    protected static final String GRID_TYPE = "gridType";
-    protected static final String CHANNEL_SPACING = "channelSpacing";
-    protected static final String SPACING_MULIPLIER = "spacingMultiplier";
-    protected static final String SLOT_GRANULARITY = "slotGranularity";
-    protected static final String OCH_SIGNAL_ID = "ochSignalId";
-    protected static final String TUNNEL_ID = "tunnelId";
-    protected static final String OCH_SIGNAL_TYPE = "ochSignalType";
-    protected static final String ODU_SIGNAL_ID = "oduSignalId";
-    protected static final String TRIBUTARY_PORT_NUMBER = "tributaryPortNumber";
-    protected static final String TRIBUTARY_SLOT_LEN = "tributarySlotLen";
-    protected static final String TRIBUTARY_SLOT_BITMAP = "tributarySlotBitmap";
-    protected static final String ODU_SIGNAL_TYPE = "oduSignalType";
+    static final String VLAN_ID = "vlanId";
+    static final String INNER_VLAN_ID = "innerVlanId";
+    static final String INNER_PRIORITY = "innerPriority";
+    static final String PRIORITY = "priority";
+    static final String IP_DSCP = "ipDscp";
+    static final String IP_ECN = "ipEcn";
+    static final String PROTOCOL = "protocol";
+    static final String IP = "ip";
+    static final String TCP_PORT = "tcpPort";
+    static final String TCP_MASK = "tcpMask";
+    static final String UDP_PORT = "udpPort";
+    static final String UDP_MASK = "udpMask";
+    static final String SCTP_PORT = "sctpPort";
+    static final String SCTP_MASK = "sctpMask";
+    static final String ICMP_TYPE = "icmpType";
+    static final String ICMP_CODE = "icmpCode";
+    static final String FLOW_LABEL = "flowLabel";
+    static final String ICMPV6_TYPE = "icmpv6Type";
+    static final String ICMPV6_CODE = "icmpv6Code";
+    static final String TARGET_ADDRESS = "targetAddress";
+    static final String LABEL = "label";
+    static final String BOS = "bos";
+    static final String EXT_HDR_FLAGS = "exthdrFlags";
+    static final String LAMBDA = "lambda";
+    static final String GRID_TYPE = "gridType";
+    static final String CHANNEL_SPACING = "channelSpacing";
+    static final String SPACING_MULIPLIER = "spacingMultiplier";
+    static final String SLOT_GRANULARITY = "slotGranularity";
+    static final String OCH_SIGNAL_ID = "ochSignalId";
+    static final String TUNNEL_ID = "tunnelId";
+    static final String OCH_SIGNAL_TYPE = "ochSignalType";
+    static final String ODU_SIGNAL_ID = "oduSignalId";
+    static final String TRIBUTARY_PORT_NUMBER = "tributaryPortNumber";
+    static final String TRIBUTARY_SLOT_LEN = "tributarySlotLen";
+    static final String TRIBUTARY_SLOT_BITMAP = "tributarySlotBitmap";
+    static final String ODU_SIGNAL_TYPE = "oduSignalType";
 
     @Override
     public ObjectNode encode(Criterion criterion, CodecContext context) {
diff --git a/core/common/src/main/java/org/onosproject/codec/impl/DecodeInstructionCodecHelper.java b/core/common/src/main/java/org/onosproject/codec/impl/DecodeInstructionCodecHelper.java
index ff55e49..e810274 100644
--- a/core/common/src/main/java/org/onosproject/codec/impl/DecodeInstructionCodecHelper.java
+++ b/core/common/src/main/java/org/onosproject/codec/impl/DecodeInstructionCodecHelper.java
@@ -63,7 +63,7 @@
  * Decoding portion of the instruction codec.
  */
 public final class DecodeInstructionCodecHelper {
-    protected static final Logger log = getLogger(DecodeInstructionCodecHelper.class);
+    private static final Logger log = getLogger(DecodeInstructionCodecHelper.class);
     private final ObjectNode json;
     private final CodecContext context;
     private static final Pattern ETHTYPE_PATTERN = Pattern.compile("0x([0-9a-fA-F]{4})");
diff --git a/core/common/src/main/java/org/onosproject/codec/impl/EncodeInstructionCodecHelper.java b/core/common/src/main/java/org/onosproject/codec/impl/EncodeInstructionCodecHelper.java
index 4b50700..65a6665 100644
--- a/core/common/src/main/java/org/onosproject/codec/impl/EncodeInstructionCodecHelper.java
+++ b/core/common/src/main/java/org/onosproject/codec/impl/EncodeInstructionCodecHelper.java
@@ -42,7 +42,7 @@
  * JSON encoding of Instructions.
  */
 public final class EncodeInstructionCodecHelper {
-    protected static final Logger log = getLogger(EncodeInstructionCodecHelper.class);
+    private static final Logger log = getLogger(EncodeInstructionCodecHelper.class);
     private final Instruction instruction;
     private final CodecContext context;
 
diff --git a/core/common/src/main/java/org/onosproject/codec/impl/EthernetCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/EthernetCodec.java
index 9d71b29..6d95519 100644
--- a/core/common/src/main/java/org/onosproject/codec/impl/EthernetCodec.java
+++ b/core/common/src/main/java/org/onosproject/codec/impl/EthernetCodec.java
@@ -30,7 +30,7 @@
  */
 public final class EthernetCodec extends JsonCodec<Ethernet> {
 
-    protected static final Logger log = LoggerFactory.getLogger(CriterionCodec.class);
+    private static final Logger log = LoggerFactory.getLogger(CriterionCodec.class);
 
     @Override
     public ObjectNode encode(Ethernet ethernet, CodecContext context) {
diff --git a/core/common/src/main/java/org/onosproject/codec/impl/InstructionCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/InstructionCodec.java
index 9762643..6e36ec0 100644
--- a/core/common/src/main/java/org/onosproject/codec/impl/InstructionCodec.java
+++ b/core/common/src/main/java/org/onosproject/codec/impl/InstructionCodec.java
@@ -29,45 +29,45 @@
  */
 public final class InstructionCodec extends JsonCodec<Instruction> {
 
-    protected static final Logger log = LoggerFactory.getLogger(InstructionCodec.class);
+    private static final Logger log = LoggerFactory.getLogger(InstructionCodec.class);
 
-    protected static final String TYPE = "type";
-    protected static final String SUBTYPE = "subtype";
-    protected static final String PORT = "port";
-    protected static final String MAC = "mac";
-    protected static final String VLAN_ID = "vlanId";
-    protected static final String VLAN_PCP = "vlanPcp";
-    protected static final String MPLS_LABEL = "label";
-    protected static final String MPLS_BOS = "bos";
-    protected static final String IP = "ip";
-    protected static final String FLOW_LABEL = "flowLabel";
-    protected static final String LAMBDA = "lambda";
-    protected static final String GRID_TYPE = "gridType";
-    protected static final String CHANNEL_SPACING = "channelSpacing";
-    protected static final String SPACING_MULTIPLIER = "spacingMultiplier";
-    protected static final String SLOT_GRANULARITY = "slotGranularity";
-    protected static final String ETHERNET_TYPE = "ethernetType";
-    protected static final String TUNNEL_ID = "tunnelId";
-    protected static final String TCP_PORT = "tcpPort";
-    protected static final String UDP_PORT = "udpPort";
-    protected static final String TABLE_ID = "tableId";
-    protected static final String GROUP_ID = "groupId";
-    protected static final String METER_ID = "meterId";
-    protected static final String QUEUE_ID = "queueId";
-    protected static final String TRIBUTARY_PORT_NUMBER = "tributaryPortNumber";
-    protected static final String TRIBUTARY_SLOT_LEN = "tributarySlotLength";
-    protected static final String TRIBUTARY_SLOT_BITMAP = "tributarySlotBitmap";
-    protected static final String EXTENSION = "extension";
-    protected static final String DEVICE_ID = "deviceId";
-    protected static final String STAT_TRIGGER_FLAG = "statTriggerFlag";
-    protected static final String STAT_THRESHOLDS = "statThreshold";
-    protected static final String STAT_BYTE_COUNT = "byteCount";
-    protected static final String STAT_PACKET_COUNT = "packetCount";
-    protected static final String STAT_DURATION = "duration";
+    static final String TYPE = "type";
+    static final String SUBTYPE = "subtype";
+    static final String PORT = "port";
+    static final String MAC = "mac";
+    static final String VLAN_ID = "vlanId";
+    static final String VLAN_PCP = "vlanPcp";
+    static final String MPLS_LABEL = "label";
+    static final String MPLS_BOS = "bos";
+    static final String IP = "ip";
+    static final String FLOW_LABEL = "flowLabel";
+    static final String LAMBDA = "lambda";
+    static final String GRID_TYPE = "gridType";
+    static final String CHANNEL_SPACING = "channelSpacing";
+    static final String SPACING_MULTIPLIER = "spacingMultiplier";
+    static final String SLOT_GRANULARITY = "slotGranularity";
+    static final String ETHERNET_TYPE = "ethernetType";
+    static final String TUNNEL_ID = "tunnelId";
+    static final String TCP_PORT = "tcpPort";
+    static final String UDP_PORT = "udpPort";
+    static final String TABLE_ID = "tableId";
+    static final String GROUP_ID = "groupId";
+    static final String METER_ID = "meterId";
+    static final String QUEUE_ID = "queueId";
+    static final String TRIBUTARY_PORT_NUMBER = "tributaryPortNumber";
+    static final String TRIBUTARY_SLOT_LEN = "tributarySlotLength";
+    static final String TRIBUTARY_SLOT_BITMAP = "tributarySlotBitmap";
+    static final String EXTENSION = "extension";
+    static final String DEVICE_ID = "deviceId";
+    static final String STAT_TRIGGER_FLAG = "statTriggerFlag";
+    static final String STAT_THRESHOLDS = "statThreshold";
+    static final String STAT_BYTE_COUNT = "byteCount";
+    static final String STAT_PACKET_COUNT = "packetCount";
+    static final String STAT_DURATION = "duration";
 
-    protected static final String MISSING_MEMBER_MESSAGE =
+    static final String MISSING_MEMBER_MESSAGE =
             " member is required in Instruction";
-    protected static final String ERROR_MESSAGE =
+    static final String ERROR_MESSAGE =
             " not specified in Instruction";
 
 
diff --git a/core/common/src/main/java/org/onosproject/codec/impl/IntentCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/IntentCodec.java
index ffe281b..4faced6 100644
--- a/core/common/src/main/java/org/onosproject/codec/impl/IntentCodec.java
+++ b/core/common/src/main/java/org/onosproject/codec/impl/IntentCodec.java
@@ -42,15 +42,15 @@
  */
 public final class IntentCodec extends JsonCodec<Intent> {
 
-    protected static final String TYPE = "type";
-    protected static final String ID = "id";
-    protected static final String KEY = "key";
-    protected static final String APP_ID = "appId";
-    protected static final String STATE = "state";
-    protected static final String PRIORITY = "priority";
-    protected static final String RESOURCES = "resources";
-    protected static final String RESOURCE_GROUP = "resourceGroup";
-    protected static final String MISSING_MEMBER_MESSAGE =
+    static final String TYPE = "type";
+    static final String ID = "id";
+    static final String KEY = "key";
+    static final String APP_ID = "appId";
+    static final String STATE = "state";
+    static final String PRIORITY = "priority";
+    static final String RESOURCES = "resources";
+    static final String RESOURCE_GROUP = "resourceGroup";
+    static final String MISSING_MEMBER_MESSAGE =
             " member is required in Intent";
     private static final String E_APP_ID_NOT_FOUND =
             "Application ID is not found";
diff --git a/core/net/src/main/java/org/onosproject/net/resource/impl/ResourceRegistrar.java b/core/net/src/main/java/org/onosproject/net/resource/impl/ResourceRegistrar.java
index f9b3202..9811d99 100644
--- a/core/net/src/main/java/org/onosproject/net/resource/impl/ResourceRegistrar.java
+++ b/core/net/src/main/java/org/onosproject/net/resource/impl/ResourceRegistrar.java
@@ -52,22 +52,22 @@
 public final class ResourceRegistrar {
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected ResourceAdminService adminService;
+    ResourceAdminService adminService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected ResourceService resourceService;
+    ResourceService resourceService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected DriverService driverService;
+    DriverService driverService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected DeviceService deviceService;
+    DeviceService deviceService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected MastershipService mastershipService;
+    MastershipService mastershipService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected NetworkConfigRegistry cfgRegistry;
+    NetworkConfigRegistry cfgRegistry;
 
     private final Logger log = getLogger(getClass());
 
diff --git a/core/security/src/main/java/org/onosproject/security/impl/DefaultPolicyBuilder.java b/core/security/src/main/java/org/onosproject/security/impl/DefaultPolicyBuilder.java
index 1879997..b79240a 100644
--- a/core/security/src/main/java/org/onosproject/security/impl/DefaultPolicyBuilder.java
+++ b/core/security/src/main/java/org/onosproject/security/impl/DefaultPolicyBuilder.java
@@ -111,11 +111,11 @@
 
 public final class DefaultPolicyBuilder {
 
-    protected static ConcurrentHashMap<AppPermission.Type,
+    static ConcurrentHashMap<AppPermission.Type,
             Set<String>> serviceDirectory = getServiceDirectory();
 
-    protected static List<Permission> defaultPermissions = getDefaultPerms();
-    protected static List<Permission> adminServicePermissions = getAdminDefaultPerms();
+    static List<Permission> defaultPermissions = getDefaultPerms();
+    static List<Permission> adminServicePermissions = getAdminDefaultPerms();
 
     private DefaultPolicyBuilder(){
     }
diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/OfdpaGroupHandlerUtility.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/OfdpaGroupHandlerUtility.java
index 7b8d8b2..f9cf3d0 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/OfdpaGroupHandlerUtility.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/OfdpaGroupHandlerUtility.java
@@ -65,28 +65,28 @@
      * L2 Flood Groups have <4bits-4><12bits-vlanId><16bits-index>
      * L3 VPN Groups have <4bits-9><4bits-2><24bits-index>
      */
-    protected static final int L2_INTERFACE_TYPE = 0x00000000;
-    protected static final int L3_INTERFACE_TYPE = 0x50000000;
-    protected static final int L3_UNICAST_TYPE = 0x20000000;
-    protected static final int L3_MULTICAST_TYPE = 0x60000000;
-    protected static final int MPLS_INTERFACE_TYPE = 0x90000000;
-    protected static final int MPLS_L3VPN_SUBTYPE = 0x92000000;
-    protected static final int L3_ECMP_TYPE = 0x70000000;
-    protected static final int L2_FLOOD_TYPE = 0x40000000;
+    static final int L2_INTERFACE_TYPE = 0x00000000;
+    static final int L3_INTERFACE_TYPE = 0x50000000;
+    static final int L3_UNICAST_TYPE = 0x20000000;
+    static final int L3_MULTICAST_TYPE = 0x60000000;
+    static final int MPLS_INTERFACE_TYPE = 0x90000000;
+    static final int MPLS_L3VPN_SUBTYPE = 0x92000000;
+    static final int L3_ECMP_TYPE = 0x70000000;
+    static final int L2_FLOOD_TYPE = 0x40000000;
 
-    protected static final int TYPE_MASK = 0x0fffffff;
-    protected static final int SUBTYPE_MASK = 0x00ffffff;
-    protected static final int TYPE_VLAN_MASK = 0x0000ffff;
+    static final int TYPE_MASK = 0x0fffffff;
+    static final int SUBTYPE_MASK = 0x00ffffff;
+    static final int TYPE_VLAN_MASK = 0x0000ffff;
 
-    protected static final int THREE_BIT_MASK = 0x0fff;
-    protected static final int FOUR_BIT_MASK = 0xffff;
-    protected static final int PORT_LEN = 16;
+    static final int THREE_BIT_MASK = 0x0fff;
+    static final int FOUR_BIT_MASK = 0xffff;
+    static final int PORT_LEN = 16;
 
-    protected static final int PORT_LOWER_BITS_MASK = 0x3f;
-    protected static final long PORT_HIGHER_BITS_MASK = ~PORT_LOWER_BITS_MASK;
+    static final int PORT_LOWER_BITS_MASK = 0x3f;
+    static final long PORT_HIGHER_BITS_MASK = ~PORT_LOWER_BITS_MASK;
 
-    protected static final String HEX_PREFIX = "0x";
-    protected static final Logger log = getLogger(OfdpaGroupHandlerUtility.class);
+    static final String HEX_PREFIX = "0x";
+    private static final Logger log = getLogger(OfdpaGroupHandlerUtility.class);
 
     private OfdpaGroupHandlerUtility() {
         // Utility classes should not have a public or default constructor.
@@ -98,7 +98,7 @@
      * @param tt the treatment
      * @return the PortNumber for the outport or null
      */
-    protected static PortNumber readOutPortFromTreatment(TrafficTreatment tt) {
+    static PortNumber readOutPortFromTreatment(TrafficTreatment tt) {
         for (Instruction ins : tt.allInstructions()) {
             if (ins.type() == Instruction.Type.OUTPUT) {
                 return ((Instructions.OutputInstruction) ins).port();
@@ -113,7 +113,7 @@
      * @param tt the traffic treatment
      * @return an integer representing the MPLS label-id, or -1 if not found
      */
-    protected static int readLabelFromTreatment(TrafficTreatment tt) {
+    static int readLabelFromTreatment(TrafficTreatment tt) {
         for (Instruction ins : tt.allInstructions()) {
             if (ins.type() == Instruction.Type.L2MODIFICATION) {
                 L2ModificationInstruction insl2 = (L2ModificationInstruction) ins;
@@ -295,7 +295,7 @@
      * @param bucketType group bucket type
      * @return list of group bucket generate from group information
      */
-    protected static List<GroupBucket> generateNextGroupBuckets(List<GroupInfo> groupInfos,
+    static List<GroupBucket> generateNextGroupBuckets(List<GroupInfo> groupInfos,
                                                        GroupDescription.Type bucketType) {
         List<GroupBucket> newBuckets = Lists.newArrayList();
 
@@ -525,7 +525,7 @@
     }
 
     public static class GroupChecker implements Runnable {
-        protected final Logger log = getLogger(getClass());
+        final Logger log = getLogger(getClass());
         private Ofdpa2GroupHandler groupHandler;
 
         public GroupChecker(Ofdpa2GroupHandler groupHandler) {
diff --git a/drivers/juniper/src/main/java/org/onosproject/drivers/juniper/JuniperUtils.java b/drivers/juniper/src/main/java/org/onosproject/drivers/juniper/JuniperUtils.java
index 89ec2e3..f8fb3e4 100644
--- a/drivers/juniper/src/main/java/org/onosproject/drivers/juniper/JuniperUtils.java
+++ b/drivers/juniper/src/main/java/org/onosproject/drivers/juniper/JuniperUtils.java
@@ -531,7 +531,7 @@
     /**
      * Device representation of the adjacency at the IP Layer.
      */
-    protected static final class LinkAbstraction {
+    static final class LinkAbstraction {
         protected String localPortName;
         protected ChassisId remoteChassisId;
         protected long remotePortIndex;
@@ -543,7 +543,7 @@
         }
     }
 
-    protected enum OperationType {
+    enum OperationType {
         ADD,
         REMOVE,
     }
diff --git a/drivers/lisp/src/main/java/org/onosproject/drivers/lisp/extensions/codec/LispAppDataAddressCodec.java b/drivers/lisp/src/main/java/org/onosproject/drivers/lisp/extensions/codec/LispAppDataAddressCodec.java
index c82b98f..d2482fd 100644
--- a/drivers/lisp/src/main/java/org/onosproject/drivers/lisp/extensions/codec/LispAppDataAddressCodec.java
+++ b/drivers/lisp/src/main/java/org/onosproject/drivers/lisp/extensions/codec/LispAppDataAddressCodec.java
@@ -28,13 +28,13 @@
  */
 public final class LispAppDataAddressCodec extends JsonCodec<LispAppDataAddress> {
 
-    protected static final String PROTOCOL = "protocol";
-    protected static final String IP_TOS = "ipTos";
-    protected static final String LOCAL_PORT_LOW = "localPortLow";
-    protected static final String LOCAL_PORT_HIGH = "localPortHigh";
-    protected static final String REMOTE_PORT_LOW = "remotePortLow";
-    protected static final String REMOTE_PORT_HIGH = "remotePortHigh";
-    protected static final String ADDRESS = "address";
+    static final String PROTOCOL = "protocol";
+    static final String IP_TOS = "ipTos";
+    static final String LOCAL_PORT_LOW = "localPortLow";
+    static final String LOCAL_PORT_HIGH = "localPortHigh";
+    static final String REMOTE_PORT_LOW = "remotePortLow";
+    static final String REMOTE_PORT_HIGH = "remotePortHigh";
+    static final String ADDRESS = "address";
 
     @Override
     public ObjectNode encode(LispAppDataAddress address, CodecContext context) {
diff --git a/drivers/lisp/src/main/java/org/onosproject/drivers/lisp/extensions/codec/LispAsAddressCodec.java b/drivers/lisp/src/main/java/org/onosproject/drivers/lisp/extensions/codec/LispAsAddressCodec.java
index 3e5739a..ca78cb7 100644
--- a/drivers/lisp/src/main/java/org/onosproject/drivers/lisp/extensions/codec/LispAsAddressCodec.java
+++ b/drivers/lisp/src/main/java/org/onosproject/drivers/lisp/extensions/codec/LispAsAddressCodec.java
@@ -29,8 +29,8 @@
  */
 public final class LispAsAddressCodec extends JsonCodec<LispAsAddress> {
 
-    protected static final String AS_NUMBER = "asNumber";
-    protected static final String ADDRESS = "address";
+    static final String AS_NUMBER = "asNumber";
+    static final String ADDRESS = "address";
     private static final String MISSING_MEMBER_MESSAGE =
                                 " member is required in LispAsAddress";
 
diff --git a/drivers/lisp/src/main/java/org/onosproject/drivers/lisp/extensions/codec/LispGcAddressCodec.java b/drivers/lisp/src/main/java/org/onosproject/drivers/lisp/extensions/codec/LispGcAddressCodec.java
index cbec44c..4baaa80 100644
--- a/drivers/lisp/src/main/java/org/onosproject/drivers/lisp/extensions/codec/LispGcAddressCodec.java
+++ b/drivers/lisp/src/main/java/org/onosproject/drivers/lisp/extensions/codec/LispGcAddressCodec.java
@@ -29,16 +29,16 @@
  */
 public final class LispGcAddressCodec extends JsonCodec<LispGcAddress> {
 
-    protected static final String NORTH = "north";
-    protected static final String LATITUDE_DEGREE = "latitudeDegree";
-    protected static final String LATITUDE_MINUTE = "latitudeMinute";
-    protected static final String LATITUDE_SECOND = "latitudeSecond";
-    protected static final String EAST = "east";
-    protected static final String LONGITUDE_DEGREE = "longitudeDegree";
-    protected static final String LONGITUDE_MINUTE = "longitudeMinute";
-    protected static final String LONGITUDE_SECOND = "longitudeSecond";
-    protected static final String ALTITUDE = "altitude";
-    protected static final String ADDRESS = "address";
+    static final String NORTH = "north";
+    static final String LATITUDE_DEGREE = "latitudeDegree";
+    static final String LATITUDE_MINUTE = "latitudeMinute";
+    static final String LATITUDE_SECOND = "latitudeSecond";
+    static final String EAST = "east";
+    static final String LONGITUDE_DEGREE = "longitudeDegree";
+    static final String LONGITUDE_MINUTE = "longitudeMinute";
+    static final String LONGITUDE_SECOND = "longitudeSecond";
+    static final String ALTITUDE = "altitude";
+    static final String ADDRESS = "address";
 
     private static final String MISSING_MEMBER_MESSAGE =
                                 " member is required in LispGcAddress";
diff --git a/drivers/lisp/src/main/java/org/onosproject/drivers/lisp/extensions/codec/LispNatAddressCodec.java b/drivers/lisp/src/main/java/org/onosproject/drivers/lisp/extensions/codec/LispNatAddressCodec.java
index 4ee2fe1..8fac849 100644
--- a/drivers/lisp/src/main/java/org/onosproject/drivers/lisp/extensions/codec/LispNatAddressCodec.java
+++ b/drivers/lisp/src/main/java/org/onosproject/drivers/lisp/extensions/codec/LispNatAddressCodec.java
@@ -34,12 +34,12 @@
  */
 public final class LispNatAddressCodec extends JsonCodec<LispNatAddress> {
 
-    protected static final String MS_UDP_PORT_NUMBER = "msUdpPortNumber";
-    protected static final String ETR_UDP_PORT_NUMBER = "etrUdpPortNumber";
-    protected static final String GLOBAL_ETR_RLOC_ADDRESS = "globalEtrRlocAddress";
-    protected static final String MS_RLOC_ADDRESS = "msRlocAddress";
-    protected static final String PRIVATE_ETR_RLOC_ADDRESS = "privateEtrRlocAddress";
-    protected static final String RTR_RLOC_ADDRESSES = "rtrRlocAddresses";
+    static final String MS_UDP_PORT_NUMBER = "msUdpPortNumber";
+    static final String ETR_UDP_PORT_NUMBER = "etrUdpPortNumber";
+    static final String GLOBAL_ETR_RLOC_ADDRESS = "globalEtrRlocAddress";
+    static final String MS_RLOC_ADDRESS = "msRlocAddress";
+    static final String PRIVATE_ETR_RLOC_ADDRESS = "privateEtrRlocAddress";
+    static final String RTR_RLOC_ADDRESSES = "rtrRlocAddresses";
 
     private static final String MISSING_MEMBER_MESSAGE =
                                 " member is required in LispListAddress";
diff --git a/drivers/lisp/src/main/java/org/onosproject/drivers/lisp/extensions/codec/LispNonceAddressCodec.java b/drivers/lisp/src/main/java/org/onosproject/drivers/lisp/extensions/codec/LispNonceAddressCodec.java
index 0c84628..54449c1 100644
--- a/drivers/lisp/src/main/java/org/onosproject/drivers/lisp/extensions/codec/LispNonceAddressCodec.java
+++ b/drivers/lisp/src/main/java/org/onosproject/drivers/lisp/extensions/codec/LispNonceAddressCodec.java
@@ -29,8 +29,8 @@
  */
 public final class LispNonceAddressCodec extends JsonCodec<LispNonceAddress> {
 
-    protected static final String NONCE = "nonce";
-    protected static final String ADDRESS = "address";
+    static final String NONCE = "nonce";
+    static final String ADDRESS = "address";
 
     private static final String MISSING_MEMBER_MESSAGE =
                                 " member is required in LispGcAddress";
diff --git a/drivers/lisp/src/main/java/org/onosproject/drivers/lisp/extensions/codec/LispSegmentAddressCodec.java b/drivers/lisp/src/main/java/org/onosproject/drivers/lisp/extensions/codec/LispSegmentAddressCodec.java
index be8a5f1..b760991 100644
--- a/drivers/lisp/src/main/java/org/onosproject/drivers/lisp/extensions/codec/LispSegmentAddressCodec.java
+++ b/drivers/lisp/src/main/java/org/onosproject/drivers/lisp/extensions/codec/LispSegmentAddressCodec.java
@@ -29,8 +29,8 @@
  */
 public final class LispSegmentAddressCodec extends JsonCodec<LispSegmentAddress> {
 
-    protected static final String INSTANCE_ID = "instanceId";
-    protected static final String ADDRESS = "address";
+    static final String INSTANCE_ID = "instanceId";
+    static final String ADDRESS = "address";
 
     private static final String MISSING_MEMBER_MESSAGE =
                                 " member is required in LispSegmentAddress";
diff --git a/drivers/lisp/src/main/java/org/onosproject/drivers/lisp/extensions/codec/LispSrcDstAddressCodec.java b/drivers/lisp/src/main/java/org/onosproject/drivers/lisp/extensions/codec/LispSrcDstAddressCodec.java
index 07a0fca..e9b54a8 100644
--- a/drivers/lisp/src/main/java/org/onosproject/drivers/lisp/extensions/codec/LispSrcDstAddressCodec.java
+++ b/drivers/lisp/src/main/java/org/onosproject/drivers/lisp/extensions/codec/LispSrcDstAddressCodec.java
@@ -29,10 +29,10 @@
  */
 public final class LispSrcDstAddressCodec extends JsonCodec<LispSrcDstAddress> {
 
-    protected static final String SRC_MASK_LENGTH = "srcMaskLength";
-    protected static final String DST_MASK_LENGTH = "dstMaskLength";
-    protected static final String SRC_PREFIX = "srcPrefix";
-    protected static final String DST_PREFIX = "dstPrefix";
+    static final String SRC_MASK_LENGTH = "srcMaskLength";
+    static final String DST_MASK_LENGTH = "dstMaskLength";
+    static final String SRC_PREFIX = "srcPrefix";
+    static final String DST_PREFIX = "dstPrefix";
 
     private static final String MISSING_MEMBER_MESSAGE =
                                 " member is required in LispSrcDstAddress";
diff --git a/drivers/lisp/src/main/java/org/onosproject/drivers/lisp/extensions/codec/LispTeRecordCodec.java b/drivers/lisp/src/main/java/org/onosproject/drivers/lisp/extensions/codec/LispTeRecordCodec.java
index dd60b2e..237a404 100644
--- a/drivers/lisp/src/main/java/org/onosproject/drivers/lisp/extensions/codec/LispTeRecordCodec.java
+++ b/drivers/lisp/src/main/java/org/onosproject/drivers/lisp/extensions/codec/LispTeRecordCodec.java
@@ -29,10 +29,10 @@
  */
 public final class LispTeRecordCodec extends JsonCodec<LispTeAddress.TeRecord> {
 
-    protected static final String LOOKUP = "lookup";
-    protected static final String RLOC_PROBE = "rlocProbe";
-    protected static final String STRICT = "strict";
-    protected static final String ADDRESS = "address";
+    static final String LOOKUP = "lookup";
+    static final String RLOC_PROBE = "rlocProbe";
+    static final String STRICT = "strict";
+    static final String ADDRESS = "address";
 
     private static final String MISSING_MEMBER_MESSAGE =
                                 " member is required in LispTeRecord";
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpFactories.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpFactories.java
index 6ddb307..c244c3d 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpFactories.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/BgpFactories.java
@@ -28,7 +28,7 @@
  */
 public final class BgpFactories {
 
-    protected static final Logger log = LoggerFactory.getLogger(BgpFactories.class);
+    private static final Logger log = LoggerFactory.getLogger(BgpFactories.class);
 
     private static final GenericReader GENERIC_READER = new GenericReader();
 
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/evpn/BgpEvpnNlriImpl.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/evpn/BgpEvpnNlriImpl.java
index cfe0530..74c1a51 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/evpn/BgpEvpnNlriImpl.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/evpn/BgpEvpnNlriImpl.java
@@ -42,7 +42,7 @@
                 Figure : The format of the EVPN NLRI
      */
 
-    protected static final Logger log = LoggerFactory
+    private static final Logger log = LoggerFactory
             .getLogger(BgpEvpnNlriImpl.class);
 
     // total length of route type and length
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/evpn/BgpEvpnRouteType2Nlri.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/evpn/BgpEvpnRouteType2Nlri.java
index 76fcbce..607ce38 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/evpn/BgpEvpnRouteType2Nlri.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/evpn/BgpEvpnRouteType2Nlri.java
@@ -59,7 +59,7 @@
      */
 
     public static final short TYPE = Constants.BGP_EVPN_MAC_IP_ADVERTISEMENT;
-    protected static final Logger log = LoggerFactory.getLogger(BgpEvpnRouteType2Nlri.class);
+    private static final Logger log = LoggerFactory.getLogger(BgpEvpnRouteType2Nlri.class);
     // unit of length is bit
     public static final short IPV4_ADDRESS_LENGTH = 32;
     public static final short MAC_ADDRESS_LENGTH = 48;
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/BgpNodeLSNlriVer4.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/BgpNodeLSNlriVer4.java
index e8088b1..cbe884f 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/BgpNodeLSNlriVer4.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/BgpNodeLSNlriVer4.java
@@ -48,7 +48,7 @@
                           Figure : The Node NLRI format
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(BgpNodeLSNlriVer4.class);
+    private static final Logger log = LoggerFactory.getLogger(BgpNodeLSNlriVer4.class);
 
     public static final int NODE_NLRITYPE = 1;
     public static final int IDENTIFIER_LENGTH = 16;
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/BgpPrefixIPv4LSNlriVer4.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/BgpPrefixIPv4LSNlriVer4.java
index bd33374..8ed830f 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/BgpPrefixIPv4LSNlriVer4.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/BgpPrefixIPv4LSNlriVer4.java
@@ -53,7 +53,7 @@
                 Figure : The IPv4/IPv6 Topology Prefix NLRI format
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(BgpPrefixIPv4LSNlriVer4.class);
+    private static final Logger log = LoggerFactory.getLogger(BgpPrefixIPv4LSNlriVer4.class);
 
     public static final int PREFIX_IPV4_NLRITYPE = 3;
     public static final int IDENTIFIER_LENGTH = 16;
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/BgpPrefixLSIdentifier.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/BgpPrefixLSIdentifier.java
index 1ee1c60..f9cf63f 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/BgpPrefixLSIdentifier.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/BgpPrefixLSIdentifier.java
@@ -40,7 +40,7 @@
  */
 public class BgpPrefixLSIdentifier implements Comparable<Object> {
 
-    protected static final Logger log = LoggerFactory.getLogger(BgpPrefixLSIdentifier.class);
+    private static final Logger log = LoggerFactory.getLogger(BgpPrefixLSIdentifier.class);
     public static final int TYPE_AND_LEN = 4;
     private NodeDescriptors localNodeDescriptors;
     private List<BgpValueType> prefixDescriptor;
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpKeepaliveMsgVer4.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpKeepaliveMsgVer4.java
index d243f71..1e27267 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpKeepaliveMsgVer4.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpKeepaliveMsgVer4.java
@@ -55,7 +55,7 @@
     REFERENCE : RFC 4271
     */
 
-    protected static final Logger log = LoggerFactory
+    private static final Logger log = LoggerFactory
             .getLogger(BgpKeepaliveMsgVer4.class);
 
     private BgpHeader bgpMsgHeader;
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpMessageVer4.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpMessageVer4.java
index 15aeb0d..278d817 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpMessageVer4.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpMessageVer4.java
@@ -32,7 +32,7 @@
  */
 public abstract class BgpMessageVer4 {
 
-    protected static final Logger log = LoggerFactory.getLogger(BgpFactories.class);
+    private static final Logger log = LoggerFactory.getLogger(BgpFactories.class);
 
     static final byte OPEN_MSG_TYPE = 0x1;
     static final byte KEEPALIVE_MSG_TYPE = 0x4;
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpOpenMsgVer4.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpOpenMsgVer4.java
index 3079972..44c5269 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpOpenMsgVer4.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpOpenMsgVer4.java
@@ -63,7 +63,7 @@
        REFERENCE : RFC 4271
     */
 
-    protected static final Logger log = LoggerFactory.getLogger(BgpOpenMsgVer4.class);
+    private static final Logger log = LoggerFactory.getLogger(BgpOpenMsgVer4.class);
 
     public static final byte PACKET_VERSION = 4;
     public static final int OPEN_MSG_MINIMUM_LENGTH = 10;
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpPathAttributes.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpPathAttributes.java
index f6f5fc5..6d6455b 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpPathAttributes.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpPathAttributes.java
@@ -57,7 +57,7 @@
            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
            REFERENCE : RFC 4271
     */
-    protected static final Logger log = LoggerFactory.getLogger(BgpPathAttributes.class);
+    private static final Logger log = LoggerFactory.getLogger(BgpPathAttributes.class);
 
     public static final int LINK_STATE_ATTRIBUTE_TYPE = 29;
     public static final int MPREACHNLRI_TYPE = 14;
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpUpdateMsgVer4.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpUpdateMsgVer4.java
index 0c12525..d6ce49a 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpUpdateMsgVer4.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/ver4/BgpUpdateMsgVer4.java
@@ -73,7 +73,7 @@
     REFERENCE : RFC 4271
     */
 
-    protected static final Logger log = LoggerFactory
+    private static final Logger log = LoggerFactory
             .getLogger(BgpUpdateMsgVer4.class);
 
     public static final byte PACKET_VERSION = 4;
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/BgpFsOperatorValue.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/BgpFsOperatorValue.java
index f9d0a42..088f68f 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/BgpFsOperatorValue.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/BgpFsOperatorValue.java
@@ -28,7 +28,7 @@
  */
 public class BgpFsOperatorValue {
 
-    protected static final Logger log = LoggerFactory.getLogger(BgpFsOperatorValue.class);
+    private static final Logger log = LoggerFactory.getLogger(BgpFsOperatorValue.class);
 
     private final byte option;
     private final byte[] value;
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/BgpHeader.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/BgpHeader.java
index a72317a..8c05424 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/BgpHeader.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/BgpHeader.java
@@ -40,7 +40,7 @@
           +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
     */
 
-    protected static final Logger log = LoggerFactory.getLogger(BgpHeader.class);
+    private static final Logger log = LoggerFactory.getLogger(BgpHeader.class);
 
     public static final int MARKER_LENGTH = 16;
     public static final short DEFAULT_HEADER_LENGTH = 19;
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/FourOctetAsNumCapabilityTlv.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/FourOctetAsNumCapabilityTlv.java
index f99ddcf..14d2c95 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/FourOctetAsNumCapabilityTlv.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/FourOctetAsNumCapabilityTlv.java
@@ -31,7 +31,7 @@
     /**
      * support to indicate its support for four-octet AS numbers -CAPABILITY TLV format.
      */
-    protected static final Logger log = LoggerFactory
+    private static final Logger log = LoggerFactory
             .getLogger(FourOctetAsNumCapabilityTlv.class);
 
     public static final byte TYPE = 65;
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/LinkStateAttributes.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/LinkStateAttributes.java
index 1dd914e..0e61062 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/LinkStateAttributes.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/LinkStateAttributes.java
@@ -54,7 +54,7 @@
  */
 public class LinkStateAttributes implements BgpValueType {
 
-    protected static final Logger log = LoggerFactory
+    private static final Logger log = LoggerFactory
             .getLogger(LinkStateAttributes.class);
 
     /* Node Attributes */
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/MultiProtocolExtnCapabilityTlv.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/MultiProtocolExtnCapabilityTlv.java
index c61ab8c..7ec1997 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/MultiProtocolExtnCapabilityTlv.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/MultiProtocolExtnCapabilityTlv.java
@@ -36,7 +36,7 @@
         Multiprotocol Extensions CAPABILITY TLV format
         REFERENCE : RFC 4760
      */
-    protected static final Logger log = LoggerFactory
+    private static final Logger log = LoggerFactory
             .getLogger(MultiProtocolExtnCapabilityTlv.class);
 
     public static final byte TYPE = 1;
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/RpdCapabilityTlv.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/RpdCapabilityTlv.java
index 8bdbf4c..a057eb2 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/RpdCapabilityTlv.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/RpdCapabilityTlv.java
@@ -29,7 +29,7 @@
  */
 public class RpdCapabilityTlv implements BgpValueType {
 
-    protected static final Logger log = LoggerFactory
+    private static final Logger log = LoggerFactory
             .getLogger(RpdCapabilityTlv.class);
 
     public static final byte TYPE = (byte) 129;
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrNodeFlagBitTlv.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrNodeFlagBitTlv.java
index 99468eb..a202c44 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrNodeFlagBitTlv.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrNodeFlagBitTlv.java
@@ -32,7 +32,7 @@
  */
 public final class BgpAttrNodeFlagBitTlv implements BgpValueType {
 
-    protected static final Logger log = LoggerFactory
+    private static final Logger log = LoggerFactory
             .getLogger(BgpAttrNodeFlagBitTlv.class);
 
     public static final int ATTRNODE_FLAGBIT = 1024;
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrNodeIsIsAreaId.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrNodeIsIsAreaId.java
index f4468f3..14f5a52 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrNodeIsIsAreaId.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrNodeIsIsAreaId.java
@@ -32,7 +32,7 @@
  */
 public class BgpAttrNodeIsIsAreaId implements BgpValueType {
 
-    protected static final Logger log = LoggerFactory
+    private static final Logger log = LoggerFactory
             .getLogger(BgpAttrNodeIsIsAreaId.class);
 
     public static final int ATTRNODE_ISISAREAID = 1027;
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrNodeName.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrNodeName.java
index 3571934..981ea77 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrNodeName.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrNodeName.java
@@ -32,7 +32,7 @@
  */
 public class BgpAttrNodeName implements BgpValueType {
 
-    protected static final Logger log = LoggerFactory
+    private static final Logger log = LoggerFactory
             .getLogger(BgpAttrNodeName.class);
 
     public static final int ATTRNODE_NAME = 1026;
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrOpaqueNode.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrOpaqueNode.java
index 9cec16b..89c8338 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrOpaqueNode.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrOpaqueNode.java
@@ -32,7 +32,7 @@
  */
 public class BgpAttrOpaqueNode implements BgpValueType {
 
-    protected static final Logger log = LoggerFactory
+    private static final Logger log = LoggerFactory
             .getLogger(BgpAttrOpaqueNode.class);
 
     public static final int ATTRNODE_OPAQUEDATA = 1025;
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrRouterIdV4.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrRouterIdV4.java
index cbe70d3..f16c348 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrRouterIdV4.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrRouterIdV4.java
@@ -33,7 +33,7 @@
  */
 public final class BgpAttrRouterIdV4 implements BgpValueType {
 
-    protected static final Logger log = LoggerFactory
+    private static final Logger log = LoggerFactory
             .getLogger(BgpAttrRouterIdV4.class);
 
     private final short sType;
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrRouterIdV6.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrRouterIdV6.java
index 47f2ef5..517e6fc 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrRouterIdV6.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpAttrRouterIdV6.java
@@ -33,7 +33,7 @@
  */
 public final class BgpAttrRouterIdV6 implements BgpValueType {
 
-    protected static final Logger log = LoggerFactory
+    private static final Logger log = LoggerFactory
             .getLogger(BgpAttrRouterIdV6.class);
 
     private final short sType;
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrIgpMetric.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrIgpMetric.java
index 7ccd715..5549a41 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrIgpMetric.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrIgpMetric.java
@@ -32,7 +32,7 @@
  */
 public class BgpLinkAttrIgpMetric implements BgpValueType {
 
-    protected static final Logger log = LoggerFactory
+    private static final Logger log = LoggerFactory
             .getLogger(BgpLinkAttrIgpMetric.class);
 
     public static final int ATTRLINK_IGPMETRIC = 1095;
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrIsIsAdminstGrp.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrIsIsAdminstGrp.java
index 753bc20..0e5e064 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrIsIsAdminstGrp.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrIsIsAdminstGrp.java
@@ -32,7 +32,7 @@
  */
 public final class BgpLinkAttrIsIsAdminstGrp implements BgpValueType {
 
-    protected static final Logger log = LoggerFactory
+    private static final Logger log = LoggerFactory
             .getLogger(BgpLinkAttrIsIsAdminstGrp.class);
 
     public static final int ATTRLINK_PROTECTIONTYPE = 1088;
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrMaxLinkBandwidth.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrMaxLinkBandwidth.java
index a3aae2b..c358fc5 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrMaxLinkBandwidth.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrMaxLinkBandwidth.java
@@ -32,7 +32,7 @@
  */
 public final class BgpLinkAttrMaxLinkBandwidth implements BgpValueType {
 
-    protected static final Logger log = LoggerFactory
+    private static final Logger log = LoggerFactory
             .getLogger(BgpLinkAttrMaxLinkBandwidth.class);
 
     public static final int MAX_BANDWIDTH_LEN = 4;
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrMplsProtocolMask.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrMplsProtocolMask.java
index ee77172..272c55f 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrMplsProtocolMask.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrMplsProtocolMask.java
@@ -32,7 +32,7 @@
  */
 public class BgpLinkAttrMplsProtocolMask implements BgpValueType {
 
-    protected static final Logger log = LoggerFactory
+    private static final Logger log = LoggerFactory
             .getLogger(BgpLinkAttrMplsProtocolMask.class);
 
     public static final int ATTRLINK_MPLSPROTOMASK = 1094;
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrName.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrName.java
index 857cb39..f2e10f1 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrName.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrName.java
@@ -32,7 +32,7 @@
  */
 public class BgpLinkAttrName implements BgpValueType {
 
-    protected static final Logger log = LoggerFactory
+    private static final Logger log = LoggerFactory
             .getLogger(BgpLinkAttrName.class);
 
     public static final int ATTRLINK_NAME = 1098;
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrOpaqLnkAttrib.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrOpaqLnkAttrib.java
index d57b519..7d9247c 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrOpaqLnkAttrib.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrOpaqLnkAttrib.java
@@ -32,7 +32,7 @@
  */
 public final class BgpLinkAttrOpaqLnkAttrib implements BgpValueType {
 
-    protected static final Logger log = LoggerFactory
+    private static final Logger log = LoggerFactory
             .getLogger(BgpLinkAttrOpaqLnkAttrib.class);
 
     public static final int ATTRNODE_OPAQUELNKATTRIB = 1097;
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrTeDefaultMetric.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrTeDefaultMetric.java
index d424da6..a58c563 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrTeDefaultMetric.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrTeDefaultMetric.java
@@ -32,7 +32,7 @@
  */
 public class BgpLinkAttrTeDefaultMetric implements BgpValueType {
 
-    protected static final Logger log = LoggerFactory
+    private static final Logger log = LoggerFactory
             .getLogger(BgpLinkAttrTeDefaultMetric.class);
 
     public static final int ATTRLINK_TEDEFAULTMETRIC = 1092;
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrUnRsrvdLinkBandwidth.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrUnRsrvdLinkBandwidth.java
index a97b7ef..b225d36 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrUnRsrvdLinkBandwidth.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpLinkAttrUnRsrvdLinkBandwidth.java
@@ -34,7 +34,7 @@
  */
 public class BgpLinkAttrUnRsrvdLinkBandwidth implements BgpValueType {
 
-    protected static final Logger log = LoggerFactory
+    private static final Logger log = LoggerFactory
             .getLogger(BgpLinkAttrUnRsrvdLinkBandwidth.class);
 
     public static final int MAX_BANDWIDTH_LEN = 4;
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrExtRouteTag.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrExtRouteTag.java
index 73ed07d..152a53d 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrExtRouteTag.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrExtRouteTag.java
@@ -36,7 +36,7 @@
  */
 public class BgpPrefixAttrExtRouteTag implements BgpValueType {
 
-    protected static final Logger log = LoggerFactory
+    private static final Logger log = LoggerFactory
             .getLogger(BgpPrefixAttrExtRouteTag.class);
 
     public static final int ATTR_PREFIX_EXTROUTETAG = 1154;
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrIgpFlags.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrIgpFlags.java
index 640ba4b..de822a4 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrIgpFlags.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrIgpFlags.java
@@ -31,7 +31,7 @@
  */
 public final class BgpPrefixAttrIgpFlags implements BgpValueType {
 
-    protected static final Logger log = LoggerFactory
+    private static final Logger log = LoggerFactory
             .getLogger(BgpPrefixAttrIgpFlags.class);
 
     public static final int ATTR_PREFIX_FLAGBIT = 1152;
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrMetric.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrMetric.java
index 89bce94..1b36c19 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrMetric.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrMetric.java
@@ -32,7 +32,7 @@
  */
 public class BgpPrefixAttrMetric implements BgpValueType {
 
-    protected static final Logger log = LoggerFactory
+    private static final Logger log = LoggerFactory
             .getLogger(BgpPrefixAttrMetric.class);
 
     public static final int ATTR_PREFIX_METRIC = 1155;
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrOpaqueData.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrOpaqueData.java
index f922764..c7190f9 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrOpaqueData.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrOpaqueData.java
@@ -32,7 +32,7 @@
  */
 public final class BgpPrefixAttrOpaqueData implements BgpValueType {
 
-    protected static final Logger log = LoggerFactory
+    private static final Logger log = LoggerFactory
             .getLogger(BgpPrefixAttrOpaqueData.class);
 
     public static final int ATTR_PREFIX_OPAQUEDATA = 1157;
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrOspfFwdAddr.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrOspfFwdAddr.java
index 22bffb3..63fcb88 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrOspfFwdAddr.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrOspfFwdAddr.java
@@ -34,7 +34,7 @@
  */
 public class BgpPrefixAttrOspfFwdAddr implements BgpValueType {
 
-    protected static final Logger log = LoggerFactory
+    private static final Logger log = LoggerFactory
             .getLogger(BgpPrefixAttrOspfFwdAddr.class);
 
     public static final int ATTR_PREFIX_OSPFFWDADDR = 1156;
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrRouteTag.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrRouteTag.java
index a1a46dc..9e5be8a 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrRouteTag.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrRouteTag.java
@@ -34,7 +34,7 @@
  */
 public class BgpPrefixAttrRouteTag implements BgpValueType {
 
-    protected static final Logger log = LoggerFactory
+    private static final Logger log = LoggerFactory
             .getLogger(BgpPrefixAttrRouteTag.class);
 
     public static final short ATTR_PREFIX_ROUTETAG = 1153;
diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/util/UnSupportedAttribute.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/util/UnSupportedAttribute.java
index 2fc3f28..08270106 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/util/UnSupportedAttribute.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/util/UnSupportedAttribute.java
@@ -24,7 +24,7 @@
  * Provides methods to handle UnSupportedAttribute.
  */
 public final class UnSupportedAttribute {
-    protected static final Logger log = LoggerFactory.getLogger(UnSupportedAttribute.class);
+    private static final Logger log = LoggerFactory.getLogger(UnSupportedAttribute.class);
 
     private UnSupportedAttribute() {
     }
diff --git a/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/protocol/BgpUpdateMsgTest.java b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/protocol/BgpUpdateMsgTest.java
index ed20d91..8fa369d 100644
--- a/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/protocol/BgpUpdateMsgTest.java
+++ b/protocols/bgp/bgpio/src/test/java/org/onosproject/bgpio/protocol/BgpUpdateMsgTest.java
@@ -65,7 +65,7 @@
  * Test cases for BGP update Message.
  */
 public class BgpUpdateMsgTest {
-    protected static final Logger log = LoggerFactory.getLogger(BgpUpdateMsgTest.class);
+    private static final Logger log = LoggerFactory.getLogger(BgpUpdateMsgTest.class);
     public static final byte[] MARKER = new byte[]{(byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff,
         (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff,
         (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff};
diff --git a/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpConfig.java b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpConfig.java
index b15cfb8..e6caee7 100644
--- a/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpConfig.java
+++ b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpConfig.java
@@ -39,7 +39,7 @@
  */
 public class BgpConfig implements BgpCfg {
 
-    protected static final Logger log = LoggerFactory.getLogger(BgpConfig.class);
+    private static final Logger log = LoggerFactory.getLogger(BgpConfig.class);
 
     private static final short DEFAULT_HOLD_TIMER = 120;
     private static final short DEFAULT_CONN_RETRY_TIME = 120;
diff --git a/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpMessageDecoder.java b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpMessageDecoder.java
index 3c64274..d6c4b59 100644
--- a/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpMessageDecoder.java
+++ b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpMessageDecoder.java
@@ -34,7 +34,7 @@
  */
 public class BgpMessageDecoder extends FrameDecoder {
 
-    protected static final Logger log = LoggerFactory.getLogger(BgpMessageDecoder.class);
+    private static final Logger log = LoggerFactory.getLogger(BgpMessageDecoder.class);
 
     @Override
     protected Object decode(ChannelHandlerContext ctx, Channel channel, ChannelBuffer buffer) throws Exception {
diff --git a/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpMessageEncoder.java b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpMessageEncoder.java
index 2e0ad30..15f9c6c 100644
--- a/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpMessageEncoder.java
+++ b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpMessageEncoder.java
@@ -31,7 +31,7 @@
  * netty pipeline.
  */
 public class BgpMessageEncoder extends OneToOneEncoder {
-    protected static final Logger log = LoggerFactory.getLogger(BgpMessageEncoder.class);
+    private static final Logger log = LoggerFactory.getLogger(BgpMessageEncoder.class);
 
     @Override
     protected Object encode(ChannelHandlerContext ctx, Channel channel, Object msg) throws Exception {
diff --git a/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/HexDump.java b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/HexDump.java
index dd3c61b..0ee620b 100644
--- a/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/HexDump.java
+++ b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/HexDump.java
@@ -23,7 +23,7 @@
  * HexDump class an utility to dump buffer in hex format.
  */
 public final class HexDump {
-    protected static final Logger log = LoggerFactory.getLogger(HexDump.class);
+    private static final Logger log = LoggerFactory.getLogger(HexDump.class);
 
     private HexDump() {
     }
diff --git a/protocols/bgp/ctl/src/test/java/org/onosproject/bgp/BgpControllerImplTest.java b/protocols/bgp/ctl/src/test/java/org/onosproject/bgp/BgpControllerImplTest.java
index cfbf077..252d7e8 100644
--- a/protocols/bgp/ctl/src/test/java/org/onosproject/bgp/BgpControllerImplTest.java
+++ b/protocols/bgp/ctl/src/test/java/org/onosproject/bgp/BgpControllerImplTest.java
@@ -80,7 +80,7 @@
 @Ignore("Tests are failing due to NPE and due to failure to bind port")
 public class BgpControllerImplTest {
 
-    protected static final Logger log = LoggerFactory
+    private static final Logger log = LoggerFactory
             .getLogger(BgpControllerImplTest.class);
 
     private static final String IP_LOOPBACK_ID1 = "127.0.0.1";
diff --git a/protocols/bgp/ctl/src/test/java/org/onosproject/bgp/BgpPeerChannelHandlerTest.java b/protocols/bgp/ctl/src/test/java/org/onosproject/bgp/BgpPeerChannelHandlerTest.java
index 3e0b4c4..ac50e1d 100644
--- a/protocols/bgp/ctl/src/test/java/org/onosproject/bgp/BgpPeerChannelHandlerTest.java
+++ b/protocols/bgp/ctl/src/test/java/org/onosproject/bgp/BgpPeerChannelHandlerTest.java
@@ -32,7 +32,7 @@
 import org.slf4j.LoggerFactory;
 
 public class BgpPeerChannelHandlerTest extends SimpleChannelHandler {
-    protected static final Logger log = LoggerFactory.getLogger(BgpPeerChannelHandlerTest.class);
+    private static final Logger log = LoggerFactory.getLogger(BgpPeerChannelHandlerTest.class);
     public static final int OPEN_MSG_MINIMUM_LENGTH = 29;
     public static final byte[] MARKER = new byte[] {(byte) 0xff, (byte) 0xff,
         (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff,
diff --git a/protocols/bgp/ctl/src/test/java/org/onosproject/bgp/BgpPeerFrameDecoderTest.java b/protocols/bgp/ctl/src/test/java/org/onosproject/bgp/BgpPeerFrameDecoderTest.java
index a8ed4f7..f375e65 100644
--- a/protocols/bgp/ctl/src/test/java/org/onosproject/bgp/BgpPeerFrameDecoderTest.java
+++ b/protocols/bgp/ctl/src/test/java/org/onosproject/bgp/BgpPeerFrameDecoderTest.java
@@ -36,7 +36,7 @@
     static final int MINIMUM_HEADER_MARKER_LENGTH = 16;
     static final int HEADER_AND_MSG_LEN = 18;
 
-    protected static final Logger log = LoggerFactory
+    private static final Logger log = LoggerFactory
             .getLogger(BgpPeerFrameDecoderTest.class);
     final CountDownLatch receivedOpenMessageLatch = new CountDownLatch(1);
     final CountDownLatch receivedKeepaliveMessageLatch = new CountDownLatch(1);
diff --git a/protocols/isis/ctl/src/main/java/org/onosproject/isis/controller/impl/DefaultIsisController.java b/protocols/isis/ctl/src/main/java/org/onosproject/isis/controller/impl/DefaultIsisController.java
index 60bb531..9cafc4c 100644
--- a/protocols/isis/ctl/src/main/java/org/onosproject/isis/controller/impl/DefaultIsisController.java
+++ b/protocols/isis/ctl/src/main/java/org/onosproject/isis/controller/impl/DefaultIsisController.java
@@ -45,7 +45,7 @@
 @Service
 public class DefaultIsisController implements IsisController {
 
-    protected static final Logger log = LoggerFactory.getLogger(DefaultIsisController.class);
+    private static final Logger log = LoggerFactory.getLogger(DefaultIsisController.class);
     private final Controller controller = new Controller();
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected DriverService driverService;
diff --git a/protocols/isis/isisio/src/main/java/org/onosproject/isis/io/isispacket/IsisMessageReader.java b/protocols/isis/isisio/src/main/java/org/onosproject/isis/io/isispacket/IsisMessageReader.java
index c21fd3b..c1d5f81 100644
--- a/protocols/isis/isisio/src/main/java/org/onosproject/isis/io/isispacket/IsisMessageReader.java
+++ b/protocols/isis/isisio/src/main/java/org/onosproject/isis/io/isispacket/IsisMessageReader.java
@@ -33,7 +33,7 @@
  */
 public class IsisMessageReader {
 
-    protected static final Logger log = LoggerFactory.getLogger(IsisMessageReader.class);
+    private static final Logger log = LoggerFactory.getLogger(IsisMessageReader.class);
 
     /**
      * Reads from ISIS packet from buffer.
diff --git a/protocols/isis/isisio/src/main/java/org/onosproject/isis/io/isispacket/tlv/TlvsToBytes.java b/protocols/isis/isisio/src/main/java/org/onosproject/isis/io/isispacket/tlv/TlvsToBytes.java
index 66b3292..659ef57 100644
--- a/protocols/isis/isisio/src/main/java/org/onosproject/isis/io/isispacket/tlv/TlvsToBytes.java
+++ b/protocols/isis/isisio/src/main/java/org/onosproject/isis/io/isispacket/tlv/TlvsToBytes.java
@@ -27,7 +27,7 @@
  */
 public final class TlvsToBytes {
 
-    protected static final Logger log = LoggerFactory.getLogger(TlvsToBytes.class);
+    private static final Logger log = LoggerFactory.getLogger(TlvsToBytes.class);
 
     /**
      * Creates an instance.
diff --git a/protocols/isis/isisio/src/main/java/org/onosproject/isis/io/isispacket/tlv/subtlv/SubTlvToBytes.java b/protocols/isis/isisio/src/main/java/org/onosproject/isis/io/isispacket/tlv/subtlv/SubTlvToBytes.java
index d052bfc..a7bb08f 100644
--- a/protocols/isis/isisio/src/main/java/org/onosproject/isis/io/isispacket/tlv/subtlv/SubTlvToBytes.java
+++ b/protocols/isis/isisio/src/main/java/org/onosproject/isis/io/isispacket/tlv/subtlv/SubTlvToBytes.java
@@ -27,7 +27,7 @@
  */
 public final class SubTlvToBytes {
 
-    protected static final Logger log = LoggerFactory.getLogger(SubTlvToBytes.class);
+    private static final Logger log = LoggerFactory.getLogger(SubTlvToBytes.class);
 
     /**
      * Creates an instance.
diff --git a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispChannelHandler.java b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispChannelHandler.java
index f954b91..d6e7b81 100644
--- a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispChannelHandler.java
+++ b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispChannelHandler.java
@@ -50,7 +50,7 @@
 
     private final LispRouterFactory routerFactory = LispRouterFactory.getInstance();
 
-    protected ExecutorService executorMessages =
+    ExecutorService executorMessages =
             Executors.newFixedThreadPool(32, groupedThreads("onos/lisp", "message-stats-%d", log));
 
     @Override
diff --git a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispControllerBootstrap.java b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispControllerBootstrap.java
index 231e871..9b05097 100644
--- a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispControllerBootstrap.java
+++ b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/impl/LispControllerBootstrap.java
@@ -38,7 +38,7 @@
  */
 public class LispControllerBootstrap {
 
-    protected static final Logger log = LoggerFactory.getLogger(LispControllerBootstrap.class);
+    private static final Logger log = LoggerFactory.getLogger(LispControllerBootstrap.class);
 
     private static final int LISP_DATA_PORT = 4341;
     private static final int LISP_CONTROL_PORT = 4342;
diff --git a/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/Controller.java b/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/Controller.java
index ba83f97..99f47f8 100644
--- a/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/Controller.java
+++ b/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/Controller.java
@@ -71,7 +71,7 @@
  */
 public class Controller {
 
-    protected static final Logger log = LoggerFactory.getLogger(Controller.class);
+    private static final Logger log = LoggerFactory.getLogger(Controller.class);
 
    /**
     * @deprecated in 1.10.0
diff --git a/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImpl.java b/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImpl.java
index b704e51..5c46d8e 100644
--- a/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImpl.java
+++ b/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImpl.java
@@ -817,8 +817,8 @@
      */
     protected final class OFMessageHandler implements Runnable {
 
-        protected final OFMessage msg;
-        protected final Dpid dpid;
+        final OFMessage msg;
+        final Dpid dpid;
 
         public OFMessageHandler(Dpid dpid, OFMessage msg) {
             this.msg = msg;
diff --git a/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/ControllerTest.java b/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/ControllerTest.java
index b3bb8b1..335ebfb 100644
--- a/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/ControllerTest.java
+++ b/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/ControllerTest.java
@@ -60,7 +60,7 @@
     public static TemporaryFolder testFolder = new TemporaryFolder();
 
     Controller controller;
-    protected static final Logger log = LoggerFactory.getLogger(ControllerTest.class);
+    private static final Logger log = LoggerFactory.getLogger(ControllerTest.class);
 
     private class TestDriver extends DriverAdapter {
         @SuppressWarnings("unchecked")
diff --git a/protocols/ospf/ctl/src/main/java/org/onosproject/ospf/controller/impl/OspfConfigUtil.java b/protocols/ospf/ctl/src/main/java/org/onosproject/ospf/controller/impl/OspfConfigUtil.java
index b64b110..2173496 100644
--- a/protocols/ospf/ctl/src/main/java/org/onosproject/ospf/controller/impl/OspfConfigUtil.java
+++ b/protocols/ospf/ctl/src/main/java/org/onosproject/ospf/controller/impl/OspfConfigUtil.java
@@ -47,7 +47,7 @@
     public static final String ROUTERDEADINTERVAL = "routerDeadIntervalTime";
     public static final String INTERFACETYPE = "interfaceType";
     public static final String EXTERNALROUTINGCAPABILITY = "externalRoutingCapability";
-    protected static final Logger log = LoggerFactory.getLogger(OspfConfigUtil.class);
+    private static final Logger log = LoggerFactory.getLogger(OspfConfigUtil.class);
     private static final String ISOPAQUE = "isOpaqueEnable";
 
     /**
diff --git a/protocols/ospf/ctl/src/main/java/org/onosproject/ospf/controller/impl/OspfControllerImpl.java b/protocols/ospf/ctl/src/main/java/org/onosproject/ospf/controller/impl/OspfControllerImpl.java
index ef09092..a9c3309 100644
--- a/protocols/ospf/ctl/src/main/java/org/onosproject/ospf/controller/impl/OspfControllerImpl.java
+++ b/protocols/ospf/ctl/src/main/java/org/onosproject/ospf/controller/impl/OspfControllerImpl.java
@@ -47,7 +47,7 @@
 @Service
 public class OspfControllerImpl implements OspfController {
 
-    protected static final Logger log = LoggerFactory.getLogger(OspfControllerImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(OspfControllerImpl.class);
     private final Controller ctrl = new Controller();
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected DriverService driverService;
diff --git a/protocols/ospf/protocol/src/main/java/org/onosproject/ospf/protocol/lsa/LsaHeader.java b/protocols/ospf/protocol/src/main/java/org/onosproject/ospf/protocol/lsa/LsaHeader.java
index 3de73fd..864a746 100644
--- a/protocols/ospf/protocol/src/main/java/org/onosproject/ospf/protocol/lsa/LsaHeader.java
+++ b/protocols/ospf/protocol/src/main/java/org/onosproject/ospf/protocol/lsa/LsaHeader.java
@@ -52,7 +52,7 @@
        LSA header format
        REFERENCE : RFC 2328
      */
-    protected static final Logger log = LoggerFactory.getLogger(LsaHeader.class);
+    public static final Logger log = LoggerFactory.getLogger(LsaHeader.class);
     private int age;
     private int options;
     private int lsType;
diff --git a/protocols/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/Controller.java b/protocols/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/Controller.java
index e2bb684..d49710d 100644
--- a/protocols/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/Controller.java
+++ b/protocols/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/Controller.java
@@ -65,7 +65,7 @@
  * distributed OVSDBClient.
  */
 public class Controller {
-    protected static final Logger log = LoggerFactory
+    private static final Logger log = LoggerFactory
             .getLogger(Controller.class);
 
     private int ovsdbPort = OvsdbConstant.OVSDBPORT;
diff --git a/protocols/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/OvsdbJsonRpcHandler.java b/protocols/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/OvsdbJsonRpcHandler.java
index c05bce4..3bf7bf6 100644
--- a/protocols/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/OvsdbJsonRpcHandler.java
+++ b/protocols/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/OvsdbJsonRpcHandler.java
@@ -31,7 +31,7 @@
  * ovsdb messages to the appropriate locations.
  */
 public final class OvsdbJsonRpcHandler extends ChannelInboundHandlerAdapter {
-    protected static final Logger log = LoggerFactory
+    private static final Logger log = LoggerFactory
             .getLogger(OvsdbJsonRpcHandler.class);
     private OvsdbNodeId ovsdbNodeId;
     private OvsdbProviderService ovsdbProviderService;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepFactories.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepFactories.java
index c37aec0..4f6f24e 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepFactories.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepFactories.java
@@ -28,7 +28,7 @@
  */
 public final class PcepFactories {
 
-    protected static final Logger log = LoggerFactory.getLogger(PcepFactories.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepFactories.class);
 
     private static final GenericReader GENERIC_READER = new GenericReader();
 
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcInitiatedLspRequestVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcInitiatedLspRequestVer1.java
index 140919e..11d6ffb 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcInitiatedLspRequestVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcInitiatedLspRequestVer1.java
@@ -45,7 +45,7 @@
                                              <LSP>
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(PcInitiatedLspRequestVer1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcInitiatedLspRequestVer1.class);
 
     //PCEP SRP Object
     private PcepSrpObject srpObject;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepAttributeVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepAttributeVer1.java
index 2a7a30b..cb07001 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepAttributeVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepAttributeVer1.java
@@ -46,7 +46,7 @@
      *
      *      <metric-list>                     ::=<METRIC>[<metric-list>]
      */
-    protected static final Logger log = LoggerFactory.getLogger(PcepAttributeVer1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepAttributeVer1.class);
 
     public static final int OBJECT_HEADER_LENGTH = 4;
 
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepBandwidthObjectVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepBandwidthObjectVer1.java
index aba398d..090c96f 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepBandwidthObjectVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepBandwidthObjectVer1.java
@@ -41,7 +41,7 @@
                          The BANDWIDTH Object format
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(PcepBandwidthObjectVer1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepBandwidthObjectVer1.class);
     /*
      *  Requested bandwidth: BANDWIDTH Object-Type is 1.
         Bandwidth of an existing TE LSP for which a re-optimization is
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepCloseMsgVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepCloseMsgVer1.java
index 16ec29b..fcf3421 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepCloseMsgVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepCloseMsgVer1.java
@@ -57,7 +57,7 @@
         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(PcepCloseMsgVer1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepCloseMsgVer1.class);
 
     // Pcep version: 1
     public static final byte PACKET_VERSION = 1;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepEndPointsObjectVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepEndPointsObjectVer1.java
index d72bc5e..4690626 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepEndPointsObjectVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepEndPointsObjectVer1.java
@@ -47,7 +47,7 @@
       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 
      */
-    protected static final Logger log = LoggerFactory.getLogger(PcepEndPointsObjectVer1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepEndPointsObjectVer1.class);
 
     static final byte END_POINTS_OBJ_TYPE = 1;
     static final byte END_POINTS_OBJ_CLASS = 4;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepEroObjectVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepEroObjectVer1.java
index afe9090..76dc1fa 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepEroObjectVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepEroObjectVer1.java
@@ -138,7 +138,7 @@
      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(PcepEroObjectVer1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepEroObjectVer1.class);
 
     public static final byte ERO_OBJ_TYPE = 1;
     public static final byte ERO_OBJ_CLASS = 7;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepErrorInfoVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepErrorInfoVer1.java
index 0f9bcf1..43c9f3c 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepErrorInfoVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepErrorInfoVer1.java
@@ -38,7 +38,7 @@
  */
 public class PcepErrorInfoVer1 implements PcepErrorInfo {
 
-    protected static final Logger log = LoggerFactory.getLogger(PcepErrorInfoVer1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepErrorInfoVer1.class);
     //Error list is optional
     private List<PcepError> errList;
 
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepErrorMsgVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepErrorMsgVer1.java
index e893693..036f1f4 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepErrorMsgVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepErrorMsgVer1.java
@@ -61,7 +61,7 @@
        <error-list>                   ::=<error>[<error-list>]
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(PcepOpenMsgVer1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepOpenMsgVer1.class);
     public static final byte PACKET_VERSION = 1;
     public static final int PACKET_MINIMUM_LENGTH = 12;
     public static final PcepType MSG_TYPE = PcepType.ERROR;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepErrorObjectVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepErrorObjectVer1.java
index 3d274de..b6b0a42 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepErrorObjectVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepErrorObjectVer1.java
@@ -46,7 +46,7 @@
     |                                                               |
     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      */
-    protected static final Logger log = LoggerFactory.getLogger(PcepErrorObjectVer1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepErrorObjectVer1.class);
 
     public static final byte ERROR_OBJ_TYPE = 1;
     public static final byte ERROR_OBJ_CLASS = 13;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepErrorVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepErrorVer1.java
index 6e43271..7eb711c 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepErrorVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepErrorVer1.java
@@ -46,7 +46,7 @@
            <ls-id-list>::=<LS>[<ls-id-list>]
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(PcepErrorVer1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepErrorVer1.class);
 
     private boolean isErroInfoSet;
     //PcepErrorObject list
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepFecObjectIPv4AdjacencyVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepFecObjectIPv4AdjacencyVer1.java
index f11002b..bde6596 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepFecObjectIPv4AdjacencyVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepFecObjectIPv4AdjacencyVer1.java
@@ -44,7 +44,7 @@
 
                       FEC Object-Type is 3 IPv4 Adjacency
      */
-    protected static final Logger log = LoggerFactory.getLogger(PcepFecObjectIPv4AdjacencyVer1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepFecObjectIPv4AdjacencyVer1.class);
 
     public static final byte FEC_OBJ_TYPE = 3;
     public static final byte FEC_OBJ_CLASS = (byte) 226;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepFecObjectIPv4UnnumberedAdjacencyVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepFecObjectIPv4UnnumberedAdjacencyVer1.java
index dce64a6..e66b2fd 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepFecObjectIPv4UnnumberedAdjacencyVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepFecObjectIPv4UnnumberedAdjacencyVer1.java
@@ -48,7 +48,7 @@
 
              FEC Object-Type is 5, Unnumbered Adjacency with IPv4 NodeIDs
      */
-    protected static final Logger log = LoggerFactory.getLogger(PcepFecObjectIPv4UnnumberedAdjacencyVer1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepFecObjectIPv4UnnumberedAdjacencyVer1.class);
 
     public static final byte FEC_OBJ_TYPE = 5;
     public static final byte FEC_OBJ_CLASS = (byte) 226;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepFecObjectIPv4Ver1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepFecObjectIPv4Ver1.java
index cddbaf9..63265f6 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepFecObjectIPv4Ver1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepFecObjectIPv4Ver1.java
@@ -42,7 +42,7 @@
 
                        FEC Object-Type is 1 IPv4 Node ID
      */
-    protected static final Logger log = LoggerFactory.getLogger(PcepFecObjectIPv4Ver1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepFecObjectIPv4Ver1.class);
 
     public static final byte FEC_OBJ_TYPE = 1;
     public static final byte FEC_OBJ_CLASS = (byte) 226;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepFecObjectIPv6AdjacencyVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepFecObjectIPv6AdjacencyVer1.java
index e981a38..cd60d92 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepFecObjectIPv6AdjacencyVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepFecObjectIPv6AdjacencyVer1.java
@@ -48,7 +48,7 @@
 
                       FEC Object-Type is 4 IPv6 Adjacency
      */
-    protected static final Logger log = LoggerFactory.getLogger(PcepFecObjectIPv6AdjacencyVer1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepFecObjectIPv6AdjacencyVer1.class);
 
     public static final byte FEC_OBJ_TYPE = 4;
     public static final byte FEC_OBJ_CLASS = (byte) 226;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepFecObjectIPv6Ver1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepFecObjectIPv6Ver1.java
index 67e2afa..1975b04 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepFecObjectIPv6Ver1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepFecObjectIPv6Ver1.java
@@ -44,7 +44,7 @@
 
                        FEC Object-Type is 2 IPv6 Node ID
      */
-    protected static final Logger log = LoggerFactory.getLogger(PcepFecObjectIPv6Ver1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepFecObjectIPv6Ver1.class);
 
     public static final byte FEC_OBJ_TYPE = 2;
     public static final byte FEC_OBJ_CLASS = (byte) 226;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepInitiateMsgVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepInitiateMsgVer1.java
index 0818645..f50a8d4 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepInitiateMsgVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepInitiateMsgVer1.java
@@ -42,7 +42,7 @@
  */
 class PcepInitiateMsgVer1 implements PcepInitiateMsg {
 
-    protected static final Logger log = LoggerFactory.getLogger(PcepInitiateMsgVer1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepInitiateMsgVer1.class);
 
     // Ref : PCE initiated tunnel setup draft-ietf-pce-pce-initiated-lsp-03, section 5.1
     /*      <PCInitiate Message>             ::= <Common Header>
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepInterLayerObjectVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepInterLayerObjectVer1.java
index 4602393..f88fa14 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepInterLayerObjectVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepInterLayerObjectVer1.java
@@ -36,7 +36,7 @@
         |    Reserved                                               |N|I|
         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      */
-    protected static final Logger log = LoggerFactory.getLogger(PcepInterLayerObjectVer1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepInterLayerObjectVer1.class);
 
     public static final byte INTER_LAYER_OBJ_TYPE = 1;
     public static final byte INTER_LAYER_OBJ_CLASS = 18;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepIroObjectVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepIroObjectVer1.java
index e39f35b..78df1a9 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepIroObjectVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepIroObjectVer1.java
@@ -56,7 +56,7 @@
         | IPv4 address (continued)      | Prefix Length |      Resvd    |
         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      */
-    protected static final Logger log = LoggerFactory.getLogger(PcepIroObjectVer1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepIroObjectVer1.class);
 
     public static final byte IRO_OBJ_TYPE = 1;
     public static final byte IRO_OBJ_CLASS = 10;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepKeepaliveMsgVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepKeepaliveMsgVer1.java
index df53007..ff930a4 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepKeepaliveMsgVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepKeepaliveMsgVer1.java
@@ -42,7 +42,7 @@
     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(PcepKeepaliveMsgVer1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepKeepaliveMsgVer1.class);
     // Pcep version: 1
     public static final byte PACKET_VERSION = 1;
     public static final int PACKET_MINIMUM_LENGTH = 4;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLSObjectVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLSObjectVer1.java
index 666e5f6..f902cc6 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLSObjectVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLSObjectVer1.java
@@ -69,7 +69,7 @@
       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(PcepLSObjectVer1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepLSObjectVer1.class);
 
     public static final byte LS_OBJ_TYPE_NODE_VALUE = 1;
     public static final byte LS_OBJ_TYPE_LINK_VALUE = 2;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLabelObjectVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLabelObjectVer1.java
index 7ec2899..7e3e554 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLabelObjectVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLabelObjectVer1.java
@@ -53,7 +53,7 @@
    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
                      The LABEL Object format
      */
-    protected static final Logger log = LoggerFactory.getLogger(PcepLspObjectVer1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepLspObjectVer1.class);
 
     public static final byte LABEL_OBJ_TYPE = 1;
     public static final byte LABEL_OBJ_CLASS = (byte) 225;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLabelRangeObjectVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLabelRangeObjectVer1.java
index 00f61ae..ea62367 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLabelRangeObjectVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLabelRangeObjectVer1.java
@@ -51,7 +51,7 @@
 
                                LABEL-RANGE Object
      */
-    protected static final Logger log = LoggerFactory.getLogger(PcepLabelRangeObjectVer1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepLabelRangeObjectVer1.class);
 
     public static final byte LABEL_RANGE_OBJ_TYPE = 1;
     public static final byte LABEL_RANGE_OBJ_CLASS = 60; //to be defined
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLabelRangeResvMsgVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLabelRangeResvMsgVer1.java
index b8e2f6b..b5789be 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLabelRangeResvMsgVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLabelRangeResvMsgVer1.java
@@ -49,7 +49,7 @@
           Where
                <labelrange-list>::=<LABEL-RANGE>[<labelrange-list>]
      */
-    protected static final Logger log = LoggerFactory.getLogger(PcepLabelRangeResvMsgVer1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepLabelRangeResvMsgVer1.class);
 
     public static final byte PACKET_VERSION = 1;
     // LabelRangeResvMsgMinLength = COMMON-HEADER(4)+SrpObjMinLentgh(12)+LABEL-RANGE-MIN-LENGTH(12)
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLabelRangeVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLabelRangeVer1.java
index 89d1c90..83ec8aa 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLabelRangeVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLabelRangeVer1.java
@@ -34,7 +34,7 @@
  */
 public class PcepLabelRangeVer1 implements PcepLabelRange {
 
-    protected static final Logger log = LoggerFactory.getLogger(PcepLabelRangeVer1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepLabelRangeVer1.class);
 
     /*
         <label-range> ::= <SRP>
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLabelUpdateMsgVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLabelUpdateMsgVer1.java
index 9a7e48c..0651c0b 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLabelUpdateMsgVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLabelUpdateMsgVer1.java
@@ -63,7 +63,7 @@
                                                         [<label-list>]
 
      */
-    protected static final Logger log = LoggerFactory.getLogger(PcepLabelUpdateMsgVer1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepLabelUpdateMsgVer1.class);
 
     public static final byte PACKET_VERSION = 1;
 
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLabelUpdateVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLabelUpdateVer1.java
index 5623c25..8603146 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLabelUpdateVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLabelUpdateVer1.java
@@ -55,7 +55,7 @@
              <label-list >           ::= <LABEL>
                                          [<label-list>]
      */
-    protected static final Logger log = LoggerFactory.getLogger(PcepLabelUpdateVer1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepLabelUpdateVer1.class);
 
     //Either PceLabelDownload or PceLabelMap is mandatory.
     //label Download
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLspObjectVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLspObjectVer1.java
index 2deacdc..2cf184d 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLspObjectVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLspObjectVer1.java
@@ -56,7 +56,7 @@
 
                      The LSP Object format
      */
-    protected static final Logger log = LoggerFactory.getLogger(PcepLspObjectVer1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepLspObjectVer1.class);
 
     public static final byte LSP_OBJ_TYPE = 1;
     public static final byte LSP_OBJ_CLASS = 32;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLspaObjectVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLspaObjectVer1.java
index eb5b68c..67e0942 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLspaObjectVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLspaObjectVer1.java
@@ -53,7 +53,7 @@
     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(PcepLspaObjectVer1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepLspaObjectVer1.class);
 
     public static final byte LSPA_OBJ_TYPE = 1;
     public static final byte LSPA_OBJ_CLASS = 9;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepMessageVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepMessageVer1.java
index cddfa91..c2be8e5 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepMessageVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepMessageVer1.java
@@ -32,7 +32,7 @@
  */
 public abstract class PcepMessageVer1 {
 
-    protected static final Logger log = LoggerFactory.getLogger(PcepFactories.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepFactories.class);
 
     // version: 1.0
     public static final byte WIRE_VERSION = 1;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepMetricObjectVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepMetricObjectVer1.java
index 8bbdd8d..d149189 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepMetricObjectVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepMetricObjectVer1.java
@@ -42,7 +42,7 @@
     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(PcepMetricObjectVer1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepMetricObjectVer1.class);
 
     public static final byte METRIC_OBJ_TYPE = 1;
     public static final byte METRIC_OBJ_CLASS = 6;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepMsgPathVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepMsgPathVer1.java
index 98a3b4e..9b2f5aa 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepMsgPathVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepMsgPathVer1.java
@@ -35,7 +35,7 @@
      *  <path>         ::= <ERO><attribute-list>
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(PcepMsgPathVer1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepMsgPathVer1.class);
     //PcepEroObject
     private PcepEroObject eroObj;
     private boolean isEroObjectSet;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepOpenMsgVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepOpenMsgVer1.java
index 5c9b947..0d5dc11 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepOpenMsgVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepOpenMsgVer1.java
@@ -52,7 +52,7 @@
     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(PcepOpenMsgVer1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepOpenMsgVer1.class);
 
     public static final byte PACKET_VERSION = 1;
     public static final int PACKET_MINIMUM_LENGTH = 12;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepOpenObjectVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepOpenObjectVer1.java
index e8d504f..51a8eaf 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepOpenObjectVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepOpenObjectVer1.java
@@ -60,7 +60,7 @@
 
                      The OPEN Object format
      */
-    protected static final Logger log = LoggerFactory.getLogger(PcepOpenObjectVer1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepOpenObjectVer1.class);
 
     public static final PcepType MSG_TYPE = PcepType.OPEN;
     public static final byte OPEN_OBJECT_VERSION = 1;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepRPObjectVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepRPObjectVer1.java
index f7ce77f..0106299 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepRPObjectVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepRPObjectVer1.java
@@ -48,7 +48,7 @@
     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(PcepRPObjectVer1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepRPObjectVer1.class);
 
     public static final byte RP_OBJ_TYPE = 1;
     public static final byte RP_OBJ_CLASS = 2;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepReportMsgVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepReportMsgVer1.java
index 11b3bc3..ad2cc47 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepReportMsgVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepReportMsgVer1.java
@@ -62,7 +62,7 @@
      *                             [<IRO>]
      *    <metric-list>       ::=<METRIC>[<metric-list>]
      */
-    protected static final Logger log = LoggerFactory.getLogger(PcepReportMsgVer1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepReportMsgVer1.class);
 
     public static final byte PACKET_VERSION = 1;
     //PACKET_MINIMUM_LENGTH = CommonHeaderLen(4)+LspObjMinLen(8)
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepRroObjectVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepRroObjectVer1.java
index b192ba9..ae8ec34 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepRroObjectVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepRroObjectVer1.java
@@ -94,7 +94,7 @@
            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 
      */
-    protected static final Logger log = LoggerFactory.getLogger(PcepRroObjectVer1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepRroObjectVer1.class);
 
     public static final byte RRO_OBJ_TYPE = 1;
     public static final byte RRO_OBJ_CLASS = 8;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepSrpObjectVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepSrpObjectVer1.java
index cd4f085..ca0a317 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepSrpObjectVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepSrpObjectVer1.java
@@ -53,7 +53,7 @@
     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 
      */
-    protected static final Logger log = LoggerFactory.getLogger(PcepSrpObjectVer1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepSrpObjectVer1.class);
 
     public static final byte SRP_OBJ_TYPE = 1;
     public static final byte SRP_OBJ_CLASS = 33;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepStateReportVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepStateReportVer1.java
index 124bde9..4ebe8a8 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepStateReportVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepStateReportVer1.java
@@ -45,7 +45,7 @@
                <path>     ::= <ERO><attribute-list>[<RRO>]
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(PcepStateReport.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepStateReport.class);
 
     public static final int OBJECT_HEADER_LENGTH = 4;
 
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepUpdateMsgVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepUpdateMsgVer1.java
index 0af7ffa..fdc6e1f 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepUpdateMsgVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepUpdateMsgVer1.java
@@ -75,7 +75,7 @@
      *          Reference:Internet-Draft-PCEP Extensions-for-Stateful-PCE-10
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(PcepUpdateMsgVer1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepUpdateMsgVer1.class);
 
     public static final byte PACKET_VERSION = 1;
     // UpdateMsgMinLength = SrpObjMinLentgh(12)+LspObjMinLength(8)+EroObjMinLength(12)+ CommonHeaderLength(4)
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepUpdateRequestVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepUpdateRequestVer1.java
index 6c8edb8..836b47d 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepUpdateRequestVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepUpdateRequestVer1.java
@@ -43,7 +43,7 @@
      * <attribute-list> is defined in [RFC5440] and extended by PCEP extensions.
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(PcepUpdateRequestVer1.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepUpdateRequestVer1.class);
 
     //PCEP SRP Object
     private PcepSrpObject srpObject;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/AdministrativeGroupSubTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/AdministrativeGroupSubTlv.java
index 6c59130..373e5db 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/AdministrativeGroupSubTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/AdministrativeGroupSubTlv.java
@@ -39,7 +39,7 @@
      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(AdministrativeGroupSubTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(AdministrativeGroupSubTlv.class);
 
     public static final short TYPE = 22;
     public static final short LENGTH = 4;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/AutonomousSystemNumberSubObject.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/AutonomousSystemNumberSubObject.java
index 5c6b3b7..9bf392d 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/AutonomousSystemNumberSubObject.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/AutonomousSystemNumberSubObject.java
@@ -41,7 +41,7 @@
     |L|    Type     |     Length    |      AS number (2-octet)      |
     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      */
-    protected static final Logger log = LoggerFactory.getLogger(AutonomousSystemNumberSubObject.class);
+    private static final Logger log = LoggerFactory.getLogger(AutonomousSystemNumberSubObject.class);
 
     public static final byte TYPE = (byte) 0x32;
     public static final byte LENGTH = 4;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/AutonomousSystemSubTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/AutonomousSystemSubTlv.java
index 9595ad6..7d50842 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/AutonomousSystemSubTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/AutonomousSystemSubTlv.java
@@ -39,7 +39,7 @@
      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(AutonomousSystemSubTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(AutonomousSystemSubTlv.class);
 
     public static final short TYPE = 1;
     public static final short LENGTH = 4;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/BgpLsIdentifierSubTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/BgpLsIdentifierSubTlv.java
index 4f874e3..a36e846 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/BgpLsIdentifierSubTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/BgpLsIdentifierSubTlv.java
@@ -39,7 +39,7 @@
      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(BgpLsIdentifierSubTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(BgpLsIdentifierSubTlv.class);
 
     public static final short TYPE = 2;
     public static final short LENGTH = 4;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/ErrorObjListWithOpen.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/ErrorObjListWithOpen.java
index 4cd0d9a..1876215 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/ErrorObjListWithOpen.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/ErrorObjListWithOpen.java
@@ -38,7 +38,7 @@
     private PcepOpenObject openObject;
     // flag to check if open object is set or not
     private boolean isOpenObjectSet;
-    protected static final Logger log = LoggerFactory.getLogger(ErrorObjListWithOpen.class);
+    private static final Logger log = LoggerFactory.getLogger(ErrorObjListWithOpen.class);
 
     /**
      * Constructor to initialize Error and OPEN object.
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/GmplsCapabilityTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/GmplsCapabilityTlv.java
index 676eec4..2125185 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/GmplsCapabilityTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/GmplsCapabilityTlv.java
@@ -41,7 +41,7 @@
     |                             Flags                             |
     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      */
-    protected static final Logger log = LoggerFactory.getLogger(GmplsCapabilityTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(GmplsCapabilityTlv.class);
 
     public static final short TYPE = 14;
     public static final short LENGTH = 4;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv4InterfaceAddressSubTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv4InterfaceAddressSubTlv.java
index f3672ac..3821daa 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv4InterfaceAddressSubTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv4InterfaceAddressSubTlv.java
@@ -40,7 +40,7 @@
      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(IPv4InterfaceAddressSubTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(IPv4InterfaceAddressSubTlv.class);
 
     public static final short TYPE = 7;
     public static final short LENGTH = 4;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv4NeighborAddressSubTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv4NeighborAddressSubTlv.java
index a9fcf4c..1142209 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv4NeighborAddressSubTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv4NeighborAddressSubTlv.java
@@ -39,7 +39,7 @@
      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(IPv4NeighborAddressSubTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(IPv4NeighborAddressSubTlv.class);
 
     public static final short TYPE = 8;
     public static final short LENGTH = 4;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv4RouterIdOfLocalNodeSubTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv4RouterIdOfLocalNodeSubTlv.java
index de0cb92..81b48d0 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv4RouterIdOfLocalNodeSubTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv4RouterIdOfLocalNodeSubTlv.java
@@ -39,7 +39,7 @@
      +-+-+-+-+-+-+-+-+-++-+-+-+-+-+-+-+-+-++-+-+-+-+-+-+-+-+-++-+-+-+-
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(IPv4RouterIdOfLocalNodeSubTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(IPv4RouterIdOfLocalNodeSubTlv.class);
 
     public static final short TYPE = 17;
     public static final short LENGTH = 4;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv4RouterIdOfRemoteNodeSubTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv4RouterIdOfRemoteNodeSubTlv.java
index 0d7d000..f5b6daa 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv4RouterIdOfRemoteNodeSubTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv4RouterIdOfRemoteNodeSubTlv.java
@@ -39,7 +39,7 @@
      +-+-+-+-+-+-+-+-+-++-+-+-+-+-+-+-+-+-++-+-+-+-+-+-+-+-+-++-+-+-+-
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(IPv4RouterIdOfRemoteNodeSubTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(IPv4RouterIdOfRemoteNodeSubTlv.class);
 
     public static final short TYPE = 19;
     public static final short LENGTH = 4;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv4SubObject.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv4SubObject.java
index 3d0d3f8..45fa2b3 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv4SubObject.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv4SubObject.java
@@ -43,7 +43,7 @@
     | IPv4 address (continued)      | Prefix Length |      Resvd    |
     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      */
-    protected static final Logger log = LoggerFactory.getLogger(IPv4SubObject.class);
+    private static final Logger log = LoggerFactory.getLogger(IPv4SubObject.class);
 
     public static final byte TYPE = 0x01;
     public static final byte LENGTH = 8;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv6InterfaceAddressSubTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv6InterfaceAddressSubTlv.java
index 657a553..934c786 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv6InterfaceAddressSubTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv6InterfaceAddressSubTlv.java
@@ -29,7 +29,7 @@
  */
 public class IPv6InterfaceAddressSubTlv implements PcepValueType {
 
-    protected static final Logger log = LoggerFactory.getLogger(IPv6InterfaceAddressSubTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(IPv6InterfaceAddressSubTlv.class);
 
     public static final short TYPE = 9;
     public static final short LENGTH = 20;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv6NeighborAddressSubTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv6NeighborAddressSubTlv.java
index a318024..6eedfa5 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv6NeighborAddressSubTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv6NeighborAddressSubTlv.java
@@ -28,7 +28,7 @@
  * Provides IPv6 Neighbor Address. Reference :[RFC6119]/4.3.
  */
 public class IPv6NeighborAddressSubTlv implements PcepValueType {
-    protected static final Logger log = LoggerFactory.getLogger(IPv6NeighborAddressSubTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(IPv6NeighborAddressSubTlv.class);
 
     public static final short TYPE = 10;
     public static final short LENGTH = 20;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv6RouterIdofLocalNodeSubTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv6RouterIdofLocalNodeSubTlv.java
index fc34f99..b269803 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv6RouterIdofLocalNodeSubTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv6RouterIdofLocalNodeSubTlv.java
@@ -28,7 +28,7 @@
  * Provides IPv6 TE Router Id of Local Node. Reference :[RFC6119]/4.1.
  */
 public class IPv6RouterIdofLocalNodeSubTlv implements PcepValueType {
-    protected static final Logger log = LoggerFactory.getLogger(IPv6RouterIdofLocalNodeSubTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(IPv6RouterIdofLocalNodeSubTlv.class);
 
     public static final short TYPE = 18;
     public static final short LENGTH = 20;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv6RouterIdofRemoteNodeSubTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv6RouterIdofRemoteNodeSubTlv.java
index 03291a7..1512aa2 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv6RouterIdofRemoteNodeSubTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv6RouterIdofRemoteNodeSubTlv.java
@@ -28,7 +28,7 @@
  * Provides IPv6 TE Router Id of Remote Node.  Reference :[RFC6119]/4.1.
  */
 public class IPv6RouterIdofRemoteNodeSubTlv implements PcepValueType {
-    protected static final Logger log = LoggerFactory.getLogger(IPv6RouterIdofRemoteNodeSubTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(IPv6RouterIdofRemoteNodeSubTlv.class);
 
     public static final short TYPE = 20;
     public static final short LENGTH = 20;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv6SubObject.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv6SubObject.java
index 2ef1309..e570255 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv6SubObject.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IPv6SubObject.java
@@ -80,7 +80,7 @@
                maintain this tunnel (usually in the face of an outage
                of the link it was previously routed over).
      */
-    protected static final Logger log = LoggerFactory.getLogger(IPv6SubObject.class);
+    private static final Logger log = LoggerFactory.getLogger(IPv6SubObject.class);
 
     public static final short TYPE = 0x02;
     public static final short LENGTH = 20;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IgpMetricSubTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IgpMetricSubTlv.java
index d0a85c1..93199c5 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IgpMetricSubTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IgpMetricSubTlv.java
@@ -39,7 +39,7 @@
      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(IgpMetricSubTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(IgpMetricSubTlv.class);
 
     public static final short TYPE = 29;
     private short hLength;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IgpRouterIdSubTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IgpRouterIdSubTlv.java
index a6e0a79..f57dafb 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IgpRouterIdSubTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IgpRouterIdSubTlv.java
@@ -40,7 +40,7 @@
      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(IgpRouterIdSubTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(IgpRouterIdSubTlv.class);
 
     public static final short TYPE = 4;
     private final short hLength;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IsisAreaIdentifierSubTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IsisAreaIdentifierSubTlv.java
index 097202b..b9256cc 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IsisAreaIdentifierSubTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/IsisAreaIdentifierSubTlv.java
@@ -40,7 +40,7 @@
      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(IsisAreaIdentifierSubTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(IsisAreaIdentifierSubTlv.class);
 
     public static final short TYPE = 16;
     private short hLength;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LabelSubObject.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LabelSubObject.java
index 7287957..aadb4be 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LabelSubObject.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LabelSubObject.java
@@ -41,7 +41,7 @@
     |       Contents of Label Object                                |
     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      */
-    protected static final Logger log = LoggerFactory.getLogger(LabelSubObject.class);
+    private static final Logger log = LoggerFactory.getLogger(LabelSubObject.class);
 
     public static final short TYPE = 0x03;
     public static final short LENGTH = 8;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LinkAttributesTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LinkAttributesTlv.java
index 5b3c9d0..2c172f9 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LinkAttributesTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LinkAttributesTlv.java
@@ -47,7 +47,7 @@
      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(LinkAttributesTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(LinkAttributesTlv.class);
 
     public static final short TYPE = (short) 65286;
     short hLength;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LinkDescriptorsTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LinkDescriptorsTlv.java
index a80922f..1505a42 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LinkDescriptorsTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LinkDescriptorsTlv.java
@@ -48,7 +48,7 @@
 
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(LinkDescriptorsTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(LinkDescriptorsTlv.class);
 
     public static final short TYPE = (short) 65284;
     public short hLength;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LinkLocalRemoteIdentifiersSubTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LinkLocalRemoteIdentifiersSubTlv.java
index 5ad0c45..bf55f44 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LinkLocalRemoteIdentifiersSubTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LinkLocalRemoteIdentifiersSubTlv.java
@@ -41,7 +41,7 @@
      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 
      */
-    protected static final Logger log = LoggerFactory.getLogger(LinkLocalRemoteIdentifiersSubTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(LinkLocalRemoteIdentifiersSubTlv.class);
 
     public static final short TYPE = 6;
     public static final short LENGTH = 8;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LinkNameAttributeSubTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LinkNameAttributeSubTlv.java
index 4e6da4d..ce3902f 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LinkNameAttributeSubTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LinkNameAttributeSubTlv.java
@@ -40,7 +40,7 @@
      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(LinkNameAttributeSubTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(LinkNameAttributeSubTlv.class);
 
     public static final short TYPE = 32;
     private short hLength;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LinkProtectionTypeSubTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LinkProtectionTypeSubTlv.java
index bcdad30..3f992c4 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LinkProtectionTypeSubTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LinkProtectionTypeSubTlv.java
@@ -39,7 +39,7 @@
      |Protection Cap | Reserved      |
      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      */
-    protected static final Logger log = LoggerFactory.getLogger(LinkProtectionTypeSubTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(LinkProtectionTypeSubTlv.class);
 
     public static final short TYPE = 27;
     public static final short LENGTH = 2;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LocalNodeDescriptorsTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LocalNodeDescriptorsTlv.java
index e256227..ea7f277 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LocalNodeDescriptorsTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LocalNodeDescriptorsTlv.java
@@ -47,7 +47,7 @@
      Note: Length is including header here. Refer Routing Universe TLV.
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(LocalNodeDescriptorsTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(LocalNodeDescriptorsTlv.class);
 
     public static final short TYPE = (short) 65282;
     short hLength;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LsCapabilityTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LsCapabilityTlv.java
index 81cdf5f..566717d 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LsCapabilityTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LsCapabilityTlv.java
@@ -40,7 +40,7 @@
        +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(LsCapabilityTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(LsCapabilityTlv.class);
 
     public static final short TYPE = (short) 65280;
     public static final short LENGTH = 4;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/MaximumLinkBandwidthSubTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/MaximumLinkBandwidthSubTlv.java
index aaa9408..288ab4d 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/MaximumLinkBandwidthSubTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/MaximumLinkBandwidthSubTlv.java
@@ -39,7 +39,7 @@
      +-+-+-+-+-+-+-+-+-++-+-+-+-+-+-+-+-+-++-+-+-+-+-+-+-+-+-++-+-+-+-
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(MaximumLinkBandwidthSubTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(MaximumLinkBandwidthSubTlv.class);
 
     public static final short TYPE = 23;
     public static final short LENGTH = 4;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/MaximumReservableLinkBandwidthSubTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/MaximumReservableLinkBandwidthSubTlv.java
index c4c71ad..1a74340 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/MaximumReservableLinkBandwidthSubTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/MaximumReservableLinkBandwidthSubTlv.java
@@ -39,7 +39,7 @@
      +-+-+-+-+-+-+-+-+-++-+-+-+-+-+-+-+-+-++-+-+-+-+-+-+-+-+-++-+-+-+-
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(MaximumReservableLinkBandwidthSubTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(MaximumReservableLinkBandwidthSubTlv.class);
 
     public static final short TYPE = 24;
     public static final short LENGTH = 4;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/MplsProtocolMaskSubTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/MplsProtocolMaskSubTlv.java
index de26781..0ca4fed 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/MplsProtocolMaskSubTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/MplsProtocolMaskSubTlv.java
@@ -38,7 +38,7 @@
      |L|R|  Reserved |
      +-+-+-+-+-+-+-+-+
      */
-    protected static final Logger log = LoggerFactory.getLogger(MplsProtocolMaskSubTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(MplsProtocolMaskSubTlv.class);
 
     public static final short TYPE = 28;
     public static final short LENGTH = 1;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/NexthopIPv4addressTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/NexthopIPv4addressTlv.java
index f99d5f3..1848bf5 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/NexthopIPv4addressTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/NexthopIPv4addressTlv.java
@@ -44,7 +44,7 @@
                       NEXTHOP-IPV4-ADDRESS TLV
 
      */
-    protected static final Logger log = LoggerFactory.getLogger(NexthopIPv4addressTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(NexthopIPv4addressTlv.class);
 
     public static final short TYPE = (short) 65289; //to be defined
     //Length is header + value
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/NexthopIPv6addressTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/NexthopIPv6addressTlv.java
index d662b14..fdcf9e7 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/NexthopIPv6addressTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/NexthopIPv6addressTlv.java
@@ -46,7 +46,7 @@
                      NEXTHOP-IPV6-ADDRESS TLV:
 
      */
-    protected static final Logger log = LoggerFactory.getLogger(NexthopIPv6addressTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(NexthopIPv6addressTlv.class);
 
     public static final short TYPE = 100; //to be defined
     //Length is header + value
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/NexthopUnnumberedIPv4IDTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/NexthopUnnumberedIPv4IDTlv.java
index b64e735..8f03277 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/NexthopUnnumberedIPv4IDTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/NexthopUnnumberedIPv4IDTlv.java
@@ -46,7 +46,7 @@
                       NEXTHOP-UNNUMBERED-IPV4-ID TLV
 
      */
-    protected static final Logger log = LoggerFactory.getLogger(NexthopUnnumberedIPv4IDTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(NexthopUnnumberedIPv4IDTlv.class);
 
     public static final short TYPE = 1; //to be defined
     //Length is header + value
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/NodeAttributesTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/NodeAttributesTlv.java
index 57491cb..633c46d 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/NodeAttributesTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/NodeAttributesTlv.java
@@ -49,7 +49,7 @@
 
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(NodeAttributesTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(NodeAttributesTlv.class);
 
     public static final short TYPE = (short) 65285;
     short hLength;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/NodeFlagBitsSubTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/NodeFlagBitsSubTlv.java
index 78c90c9..5b0cc78 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/NodeFlagBitsSubTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/NodeFlagBitsSubTlv.java
@@ -38,7 +38,7 @@
      +-+-+-+-+-+-+-+-+-+
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(NodeFlagBitsSubTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(NodeFlagBitsSubTlv.class);
 
     public static final short TYPE = 13;
     public static final short LENGTH = 1;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/NodeNameSubTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/NodeNameSubTlv.java
index 58ebc0c..fc7648c 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/NodeNameSubTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/NodeNameSubTlv.java
@@ -39,7 +39,7 @@
      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(NodeNameSubTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(NodeNameSubTlv.class);
 
     public static final short TYPE = 15;
     public final short hLength;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/OpaqueLinkAttributeSubTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/OpaqueLinkAttributeSubTlv.java
index 94ed39a..cec7292 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/OpaqueLinkAttributeSubTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/OpaqueLinkAttributeSubTlv.java
@@ -41,7 +41,7 @@
      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(OpaqueLinkAttributeSubTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(OpaqueLinkAttributeSubTlv.class);
 
     public static final short TYPE = 31;
     private final short hLength;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/OpaqueNodePropertiesSubTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/OpaqueNodePropertiesSubTlv.java
index 11b3c99..a03e3de 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/OpaqueNodePropertiesSubTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/OpaqueNodePropertiesSubTlv.java
@@ -39,7 +39,7 @@
      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(OpaqueNodePropertiesSubTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(OpaqueNodePropertiesSubTlv.class);
 
     public static final short TYPE = 14;
     private final short hLength;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/OspfAreaIdSubTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/OspfAreaIdSubTlv.java
index 09a6836..5e77e2f 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/OspfAreaIdSubTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/OspfAreaIdSubTlv.java
@@ -38,7 +38,7 @@
      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(OspfAreaIdSubTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(OspfAreaIdSubTlv.class);
 
     public static final short TYPE = 3;
     public static final short LENGTH = 4;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PathKeySubObject.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PathKeySubObject.java
index 826a9ef..dd177b4 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PathKeySubObject.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PathKeySubObject.java
@@ -44,7 +44,7 @@
     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(PathKeySubObject.class);
+    private static final Logger log = LoggerFactory.getLogger(PathKeySubObject.class);
 
     public static final byte TYPE = 0x40;
     public static final byte LENGTH = 8;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PathSetupTypeTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PathSetupTypeTlv.java
index dc95a92..1f993de 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PathSetupTypeTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PathSetupTypeTlv.java
@@ -43,7 +43,7 @@
                      Figure 1: PATH-SETUP-TYPE TLV
 
      */
-    protected static final Logger log = LoggerFactory.getLogger(PathSetupTypeTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(PathSetupTypeTlv.class);
 
     public static final short TYPE = 28;
     public static final short LENGTH = 4;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PceccCapabilityTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PceccCapabilityTlv.java
index 3b51e3d..0f29c53 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PceccCapabilityTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PceccCapabilityTlv.java
@@ -40,7 +40,7 @@
    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 
      */
-    protected static final Logger log = LoggerFactory.getLogger(PceccCapabilityTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(PceccCapabilityTlv.class);
 
     public static final short TYPE = (short) 65287;
     public static final short LENGTH = 4;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PcepLabelDbVerTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PcepLabelDbVerTlv.java
index ba0c8ad..b3ace4b 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PcepLabelDbVerTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PcepLabelDbVerTlv.java
@@ -41,7 +41,7 @@
     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 
      */
-    protected static final Logger log = LoggerFactory.getLogger(PcepLabelDbVerTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepLabelDbVerTlv.class);
 
     public static final short TYPE = 34;
     public static final short LENGTH = 8;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PcepLabelDownload.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PcepLabelDownload.java
index fbe6038..90c665b 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PcepLabelDownload.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PcepLabelDownload.java
@@ -31,7 +31,7 @@
  */
 public class PcepLabelDownload {
 
-    protected static final Logger log = LoggerFactory.getLogger(PcepLabelDownload.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepLabelDownload.class);
 
     //PCEP SPR Object
     private PcepSrpObject srpObject;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PcepLabelMap.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PcepLabelMap.java
index 5ec500c..00fec74 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PcepLabelMap.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PcepLabelMap.java
@@ -30,7 +30,7 @@
  */
 public class PcepLabelMap {
 
-    protected static final Logger log = LoggerFactory.getLogger(PcepLabelMap.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepLabelMap.class);
     //PCEP SRP Object
     private PcepSrpObject srpObject;
     //PCEP Label Object
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PcepObjectHeader.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PcepObjectHeader.java
index 22c3f14..ad4615c 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PcepObjectHeader.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PcepObjectHeader.java
@@ -45,7 +45,7 @@
                       PCEP Common Object Header
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(PcepObjectHeader.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepObjectHeader.class);
 
     public static final boolean REQ_OBJ_MUST_PROCESS = true;
     public static final boolean REQ_OBJ_OPTIONAL_PROCESS = false;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PcepRsvpObjectHeader.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PcepRsvpObjectHeader.java
index a9400cd..1a47c3c 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PcepRsvpObjectHeader.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PcepRsvpObjectHeader.java
@@ -40,7 +40,7 @@
               ERROR_SPEC object Header
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(PcepRsvpObjectHeader.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepRsvpObjectHeader.class);
 
     public static final boolean REQ_OBJ_MUST_PROCESS = true;
     public static final boolean REQ_OBJ_OPTIONAL_PROCESS = false;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PcepRsvpSpecObjHeader.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PcepRsvpSpecObjHeader.java
index b1e0317..50c4699 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PcepRsvpSpecObjHeader.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PcepRsvpSpecObjHeader.java
@@ -40,7 +40,7 @@
               ERROR_SPEC object Header
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(PcepRsvpSpecObjHeader.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepRsvpSpecObjHeader.class);
 
     private short objLen;
     private byte objClassNum;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/RemoteNodeDescriptorsTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/RemoteNodeDescriptorsTlv.java
index 7c73253..5c9751d 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/RemoteNodeDescriptorsTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/RemoteNodeDescriptorsTlv.java
@@ -47,7 +47,7 @@
          +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(RemoteNodeDescriptorsTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(RemoteNodeDescriptorsTlv.class);
 
     public static final short TYPE = (short) 65283;
     short hLength;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/RoutingUniverseTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/RoutingUniverseTlv.java
index 166f0b2..c555da1 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/RoutingUniverseTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/RoutingUniverseTlv.java
@@ -50,7 +50,7 @@
                    +------------+---------------------+
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(RoutingUniverseTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(RoutingUniverseTlv.class);
 
     public static final short TYPE = (short) 65281;
     public static final short LENGTH = 8;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/SharedRiskLinkGroupSubTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/SharedRiskLinkGroupSubTlv.java
index e713169..6ff5639 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/SharedRiskLinkGroupSubTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/SharedRiskLinkGroupSubTlv.java
@@ -46,7 +46,7 @@
      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(SharedRiskLinkGroupSubTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(SharedRiskLinkGroupSubTlv.class);
 
     public static final short TYPE = 30;
 
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/SrEroSubObject.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/SrEroSubObject.java
index d39792b..77c803d 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/SrEroSubObject.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/SrEroSubObject.java
@@ -82,7 +82,7 @@
            NAI for Unnumbered adjacency with IPv4 Node IDs
 
      */
-    protected static final Logger log = LoggerFactory.getLogger(SrEroSubObject.class);
+    private static final Logger log = LoggerFactory.getLogger(SrEroSubObject.class);
 
     public static final short TYPE = 0x24; //TODO : type to be defined
     public static final short LENGTH = 12;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/SrPceCapabilityTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/SrPceCapabilityTlv.java
index fe17862..7208785 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/SrPceCapabilityTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/SrPceCapabilityTlv.java
@@ -43,7 +43,7 @@
       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
                fig: SR-PCE-CAPABILITY TLV format
      */
-    protected static final Logger log = LoggerFactory.getLogger(SrPceCapabilityTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(SrPceCapabilityTlv.class);
 
     public static final short TYPE = 26;
     public static final short LENGTH = 4;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/StatefulIPv4LspIdentifiersTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/StatefulIPv4LspIdentifiersTlv.java
index 86a8e86..a05b4e5 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/StatefulIPv4LspIdentifiersTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/StatefulIPv4LspIdentifiersTlv.java
@@ -50,7 +50,7 @@
     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 
      */
-    protected static final Logger log = LoggerFactory.getLogger(StatefulIPv4LspIdentifiersTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(StatefulIPv4LspIdentifiersTlv.class);
 
     public static final short TYPE = 18;
     public static final short LENGTH = 16;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/StatefulLspDbVerTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/StatefulLspDbVerTlv.java
index 6db58f8..b5dfeea 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/StatefulLspDbVerTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/StatefulLspDbVerTlv.java
@@ -47,7 +47,7 @@
     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 
      */
-    protected static final Logger log = LoggerFactory.getLogger(StatefulLspDbVerTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(StatefulLspDbVerTlv.class);
 
     public static final short TYPE = 23;
     public static final short LENGTH = 8;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/StatefulLspErrorCodeTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/StatefulLspErrorCodeTlv.java
index 214eebe..3899d73 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/StatefulLspErrorCodeTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/StatefulLspErrorCodeTlv.java
@@ -45,7 +45,7 @@
 
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(StatefulLspErrorCodeTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(StatefulLspErrorCodeTlv.class);
 
     public static final short TYPE = 20;
     public static final short LENGTH = 4;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/StatefulPceCapabilityTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/StatefulPceCapabilityTlv.java
index 673dcb2..d184142 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/StatefulPceCapabilityTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/StatefulPceCapabilityTlv.java
@@ -43,7 +43,7 @@
     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 
      */
-    protected static final Logger log = LoggerFactory.getLogger(StatefulPceCapabilityTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(StatefulPceCapabilityTlv.class);
 
     public static final short TYPE = 16;
     public static final short LENGTH = 4;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/StatefulRsvpErrorSpecTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/StatefulRsvpErrorSpecTlv.java
index 0b28828..ce2ed6c 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/StatefulRsvpErrorSpecTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/StatefulRsvpErrorSpecTlv.java
@@ -31,7 +31,7 @@
  */
 public class StatefulRsvpErrorSpecTlv implements PcepValueType {
 
-    protected static final Logger log = LoggerFactory.getLogger(StatefulRsvpErrorSpecTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(StatefulRsvpErrorSpecTlv.class);
 
     /*                  RSVP-ERROR-SPEC TLV format
      * Reference :PCEP Extensions for Stateful PCE draft-ietf-pce-stateful-pce-10
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/SymbolicPathNameTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/SymbolicPathNameTlv.java
index abbf365..faad33a 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/SymbolicPathNameTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/SymbolicPathNameTlv.java
@@ -44,7 +44,7 @@
          |                                                               |
          +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      */
-    protected static final Logger log = LoggerFactory.getLogger(SymbolicPathNameTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(SymbolicPathNameTlv.class);
 
     public static final short TYPE = 17;
     private short hLength;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/TEDefaultMetricSubTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/TEDefaultMetricSubTlv.java
index 0e9186f..ab6f814 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/TEDefaultMetricSubTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/TEDefaultMetricSubTlv.java
@@ -40,7 +40,7 @@
      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 
      */
-    protected static final Logger log = LoggerFactory.getLogger(TEDefaultMetricSubTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(TEDefaultMetricSubTlv.class);
 
     public static final short TYPE = 26;
     public static final short LENGTH = 4;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/UnreservedBandwidthSubTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/UnreservedBandwidthSubTlv.java
index 0d95ed9..6f3b065 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/UnreservedBandwidthSubTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/UnreservedBandwidthSubTlv.java
@@ -39,7 +39,7 @@
     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
      */
 
-    protected static final Logger log = LoggerFactory.getLogger(UnreservedBandwidthSubTlv.class);
+    private static final Logger log = LoggerFactory.getLogger(UnreservedBandwidthSubTlv.class);
 
     public static final short TYPE = 25;
     public static final short LENGTH = 4;
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/util/HexDump.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/util/HexDump.java
index 7a29b71..b5897d5 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/util/HexDump.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/util/HexDump.java
@@ -23,7 +23,7 @@
  * Provides Hex Dump for debugging.
  */
 public final class HexDump {
-    protected static final Logger log = LoggerFactory.getLogger(HexDump.class);
+    private static final Logger log = LoggerFactory.getLogger(HexDump.class);
 
     private HexDump() {
     }
diff --git a/protocols/pcep/server/ctl/src/main/java/org/onosproject/pcep/server/impl/PcepConfig.java b/protocols/pcep/server/ctl/src/main/java/org/onosproject/pcep/server/impl/PcepConfig.java
index e6b5fe1..b5b93e4 100644
--- a/protocols/pcep/server/ctl/src/main/java/org/onosproject/pcep/server/impl/PcepConfig.java
+++ b/protocols/pcep/server/ctl/src/main/java/org/onosproject/pcep/server/impl/PcepConfig.java
@@ -25,7 +25,7 @@
 
 public class PcepConfig implements PcepCfg {
 
-    protected static final Logger log = LoggerFactory.getLogger(PcepConfig.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepConfig.class);
 
     private State state = State.INIT;
     private PccId pccId;
diff --git a/protocols/pcep/server/ctl/src/main/java/org/onosproject/pcep/server/impl/PcepMessageDecoder.java b/protocols/pcep/server/ctl/src/main/java/org/onosproject/pcep/server/impl/PcepMessageDecoder.java
index 2c21b73..bd831a8 100644
--- a/protocols/pcep/server/ctl/src/main/java/org/onosproject/pcep/server/impl/PcepMessageDecoder.java
+++ b/protocols/pcep/server/ctl/src/main/java/org/onosproject/pcep/server/impl/PcepMessageDecoder.java
@@ -35,7 +35,7 @@
  */
 public class PcepMessageDecoder extends FrameDecoder {
 
-    protected static final Logger log = LoggerFactory.getLogger(PcepMessageDecoder.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepMessageDecoder.class);
 
     @Override
     protected Object decode(ChannelHandlerContext ctx, Channel channel,
diff --git a/protocols/pcep/server/ctl/src/main/java/org/onosproject/pcep/server/impl/PcepMessageEncoder.java b/protocols/pcep/server/ctl/src/main/java/org/onosproject/pcep/server/impl/PcepMessageEncoder.java
index 4c26f88..7c5b14b 100644
--- a/protocols/pcep/server/ctl/src/main/java/org/onosproject/pcep/server/impl/PcepMessageEncoder.java
+++ b/protocols/pcep/server/ctl/src/main/java/org/onosproject/pcep/server/impl/PcepMessageEncoder.java
@@ -32,7 +32,7 @@
  * netty pipeline.
  */
 public class PcepMessageEncoder extends OneToOneEncoder {
-    protected static final Logger log = LoggerFactory.getLogger(PcepMessageEncoder.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepMessageEncoder.class);
 
     @Override
     protected Object encode(ChannelHandlerContext ctx, Channel channel, Object msg) throws Exception {
diff --git a/providers/pcep/tunnel/src/main/java/org/onosproject/provider/pcep/tunnel/impl/PcepTunnelApiMapper.java b/providers/pcep/tunnel/src/main/java/org/onosproject/provider/pcep/tunnel/impl/PcepTunnelApiMapper.java
index 4945c2c..ee55362 100644
--- a/providers/pcep/tunnel/src/main/java/org/onosproject/provider/pcep/tunnel/impl/PcepTunnelApiMapper.java
+++ b/providers/pcep/tunnel/src/main/java/org/onosproject/provider/pcep/tunnel/impl/PcepTunnelApiMapper.java
@@ -28,7 +28,7 @@
  * and PCEP to PCC.
  */
 public class PcepTunnelApiMapper {
-    protected static final Logger log = LoggerFactory.getLogger(PcepTunnelApiMapper.class);
+    private static final Logger log = LoggerFactory.getLogger(PcepTunnelApiMapper.class);
 
     static final String PROVIDER_ID = "org.onosproject.provider.tunnel.pcep";
     // Map to store all the tunnel requests.
diff --git a/utils/misc/src/main/java/org/onlab/packet/IGMP.java b/utils/misc/src/main/java/org/onlab/packet/IGMP.java
index 3395f66..c8b5f85 100644
--- a/utils/misc/src/main/java/org/onlab/packet/IGMP.java
+++ b/utils/misc/src/main/java/org/onlab/packet/IGMP.java
@@ -32,7 +32,7 @@
  * Implements IGMP control packet format.
  */
 public abstract class IGMP extends BasePacket {
-    protected static final Logger log = getLogger(IGMP.class);
+    private static final Logger log = getLogger(IGMP.class);
 
     public static final byte TYPE_IGMPV3_MEMBERSHIP_QUERY = 0x11;
     public static final byte TYPE_IGMPV1_MEMBERSHIP_REPORT = 0x12;
diff --git a/utils/misc/src/main/java/org/onlab/util/BoundedThreadPool.java b/utils/misc/src/main/java/org/onlab/util/BoundedThreadPool.java
index a1f3e94..de5e1bd 100644
--- a/utils/misc/src/main/java/org/onlab/util/BoundedThreadPool.java
+++ b/utils/misc/src/main/java/org/onlab/util/BoundedThreadPool.java
@@ -39,7 +39,7 @@
 
     private static final org.slf4j.Logger log = LoggerFactory.getLogger(BoundedThreadPool.class);
 
-    protected static int maxQueueSize = 80_000; //TODO tune this value
+    static int maxQueueSize = 80_000; //TODO tune this value
     //private static final RejectedExecutionHandler DEFAULT_HANDLER = new CallerFeedbackPolicy();
     private static final long STATS_INTERVAL = 5_000; //ms
 
diff --git a/utils/misc/src/main/java/org/onlab/util/DefaultHashMap.java b/utils/misc/src/main/java/org/onlab/util/DefaultHashMap.java
index 6523d56..ed5cf49 100644
--- a/utils/misc/src/main/java/org/onlab/util/DefaultHashMap.java
+++ b/utils/misc/src/main/java/org/onlab/util/DefaultHashMap.java
@@ -24,7 +24,7 @@
 public final class DefaultHashMap<K, V> extends HashMap<K, V> {
 
     /** Default value to return when no key binding exists. */
-    protected final V defaultValue;
+    private final V defaultValue;
 
     /**
      * Constructs an empty map with the given default value.
diff --git a/utils/misc/src/main/java/org/onlab/util/HexDump.java b/utils/misc/src/main/java/org/onlab/util/HexDump.java
index b6759ed..692d688 100644
--- a/utils/misc/src/main/java/org/onlab/util/HexDump.java
+++ b/utils/misc/src/main/java/org/onlab/util/HexDump.java
@@ -26,7 +26,7 @@
  */
 @Deprecated
 public final class HexDump {
-    protected static final Logger log = LoggerFactory.getLogger(HexDump.class);
+    private static final Logger log = LoggerFactory.getLogger(HexDump.class);
 
     private HexDump() {
     }
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java
index 967c34a..d84fbda 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java
@@ -179,7 +179,7 @@
     private static final String LINK_GLYPH = "m_ports";
 
 
-    protected static final Logger log =
+    static final Logger log =
             LoggerFactory.getLogger(TopologyViewMessageHandlerBase.class);
 
     private static final ProviderId PID =
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/model/UiSharedTopologyModel.java b/web/gui/src/main/java/org/onosproject/ui/impl/topo/model/UiSharedTopologyModel.java
index da056c0..f9f4436 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/topo/model/UiSharedTopologyModel.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/topo/model/UiSharedTopologyModel.java
@@ -146,7 +146,7 @@
 
 
     @Activate
-    protected void activate() {
+    void activate() {
         cache = new ModelCache(new DefaultServiceBundle(), eventDispatcher);
         eventHandler = newSingleThreadExecutor(groupedThreads("onos/ui/topo", "event-handler", log));
 
@@ -167,7 +167,7 @@
     }
 
     @Deactivate
-    protected void deactivate() {
+    void deactivate() {
         eventDispatcher.removeSink(UiModelEvent.class);
 
         clusterService.removeListener(clusterListener);
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/util/IntentSelection.java b/web/gui/src/main/java/org/onosproject/ui/impl/topo/util/IntentSelection.java
index 725fc7c..ebd5c28 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/topo/util/IntentSelection.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/topo/util/IntentSelection.java
@@ -33,7 +33,7 @@
 
     private static final int ALL = -1;
 
-    protected static final Logger log =
+    private static final Logger log =
             LoggerFactory.getLogger(IntentSelection.class);
 
     private final NodeSelection nodes;