Fix issues found by FindBugs: MS_SHOULD_BE_FINAL
http://findbugs.sourceforge.net/bugDescriptions.html#MS_SHOULD_BE_FINAL
Change-Id: I9c08c8002722eb93b4f7bab8f47737a6a6aea38d
diff --git a/src/main/java/net/onrc/onos/core/packet/Ethernet.java b/src/main/java/net/onrc/onos/core/packet/Ethernet.java
index aad27a5..93ae2a6 100644
--- a/src/main/java/net/onrc/onos/core/packet/Ethernet.java
+++ b/src/main/java/net/onrc/onos/core/packet/Ethernet.java
@@ -38,15 +38,15 @@
public static final short TYPE_BSN = (short) 0x8942;
public static final short VLAN_UNTAGGED = (short) 0xffff;
public static final short DATALAYER_ADDRESS_LENGTH = 6; // bytes
- public static Map<Short, Class<? extends IPacket>> etherTypeClassMap;
+ public static final Map<Short, Class<? extends IPacket>> ETHER_TYPE_CLASS_MAP;
static {
- etherTypeClassMap = new HashMap<Short, Class<? extends IPacket>>();
- etherTypeClassMap.put(TYPE_ARP, ARP.class);
- etherTypeClassMap.put(TYPE_RARP, ARP.class);
- etherTypeClassMap.put(TYPE_IPV4, IPv4.class);
- etherTypeClassMap.put(TYPE_LLDP, LLDP.class);
- etherTypeClassMap.put(TYPE_BSN, BSN.class);
+ ETHER_TYPE_CLASS_MAP = new HashMap<Short, Class<? extends IPacket>>();
+ ETHER_TYPE_CLASS_MAP.put(TYPE_ARP, ARP.class);
+ ETHER_TYPE_CLASS_MAP.put(TYPE_RARP, ARP.class);
+ ETHER_TYPE_CLASS_MAP.put(TYPE_IPV4, IPv4.class);
+ ETHER_TYPE_CLASS_MAP.put(TYPE_LLDP, LLDP.class);
+ ETHER_TYPE_CLASS_MAP.put(TYPE_BSN, BSN.class);
}
protected MACAddress destinationMACAddress;
@@ -260,8 +260,8 @@
this.etherType = etherType;
IPacket payload;
- if (Ethernet.etherTypeClassMap.containsKey(this.etherType)) {
- Class<? extends IPacket> clazz = Ethernet.etherTypeClassMap.get(this.etherType);
+ if (Ethernet.ETHER_TYPE_CLASS_MAP.containsKey(this.etherType)) {
+ Class<? extends IPacket> clazz = Ethernet.ETHER_TYPE_CLASS_MAP.get(this.etherType);
try {
payload = clazz.newInstance();
} catch (Exception e) {