SONAR Suggestion - protected members in final classes are pointless
Change-Id: Ie34d86aecf181e73867a14864d75e0db8a8f48f3
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