diff --git a/apps/iptopology-api/src/main/java/org/onosproject/iptopology/api/IpDevice.java b/apps/iptopology-api/src/main/java/org/onosproject/iptopology/api/IpDevice.java
index d5892379b9..aae1ffa837 100644
--- a/apps/iptopology-api/src/main/java/org/onosproject/iptopology/api/IpDevice.java
+++ b/apps/iptopology-api/src/main/java/org/onosproject/iptopology/api/IpDevice.java
@@ -34,7 +34,7 @@ public interface IpDevice extends Element {
         /**
          * Signifies that the device is non-pseudo device.
          */
-        NONPSEUDO;
+        NONPSEUDO
     }
 
     /**
diff --git a/apps/kafka-integration/api/src/main/java/org/onosproject/kafkaintegration/api/dto/OnosEvent.java b/apps/kafka-integration/api/src/main/java/org/onosproject/kafkaintegration/api/dto/OnosEvent.java
index 72fa028116..3f4993aa56 100644
--- a/apps/kafka-integration/api/src/main/java/org/onosproject/kafkaintegration/api/dto/OnosEvent.java
+++ b/apps/kafka-integration/api/src/main/java/org/onosproject/kafkaintegration/api/dto/OnosEvent.java
@@ -45,6 +45,6 @@ public class OnosEvent extends AbstractEvent<OnosEvent.Type, byte[]> {
         /**
          * Signifies Link events.
          */
-        LINK;
+        LINK
     }
 }
diff --git a/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/instructions/ActionMappingInstruction.java b/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/instructions/ActionMappingInstruction.java
index 8c4998833d..9a17f9dd60 100644
--- a/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/instructions/ActionMappingInstruction.java
+++ b/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/instructions/ActionMappingInstruction.java
@@ -45,7 +45,7 @@ public abstract class ActionMappingInstruction implements MappingInstruction {
         /**
          * Signifies that the traffic should be dropped.
          */
-        DROP;
+        DROP
     }
 
     public abstract ActionType subtype();
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/L2Mode.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/L2Mode.java
index fe0a6b3462..9e34100f3b 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/L2Mode.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/L2Mode.java
@@ -28,5 +28,5 @@ public enum L2Mode {
      * Tagged mode. In this case the packet need
      * the sd tag.
      */
-    TAGGED;
+    TAGGED
 }
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/L2TunnelHandler.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/L2TunnelHandler.java
index dc6bcfc326..74ddae5df1 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/L2TunnelHandler.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/L2TunnelHandler.java
@@ -1280,7 +1280,7 @@ public class L2TunnelHandler {
         /**
          * The reverse direction of the pseudo wire.
          */
-        REV;
+        REV
     }
 
 }
diff --git a/apps/tetopology/api/src/main/java/org/onosproject/tetopology/management/api/TeTopologyEvent.java b/apps/tetopology/api/src/main/java/org/onosproject/tetopology/management/api/TeTopologyEvent.java
index 25bca396b8..7d44f755c5 100644
--- a/apps/tetopology/api/src/main/java/org/onosproject/tetopology/management/api/TeTopologyEvent.java
+++ b/apps/tetopology/api/src/main/java/org/onosproject/tetopology/management/api/TeTopologyEvent.java
@@ -130,7 +130,7 @@ public class TeTopologyEvent
         /**
          * Designates removal of a TE link.
          */
-        TE_LINK_REMOVED;
+        TE_LINK_REMOVED
     }
 
     /**
diff --git a/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/VirtualPort.java b/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/VirtualPort.java
index 7d70cfde30..99787cb6c3 100644
--- a/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/VirtualPort.java
+++ b/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/VirtualPort.java
@@ -37,7 +37,7 @@ public interface VirtualPort {
         /**
          * Signifies that a virtualPort is currently unavailable.
          */
-        DOWN;
+        DOWN
     }
 
     /**
diff --git a/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraEncapEthDst.java b/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraEncapEthDst.java
index 1f98825830..e72d35936b 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraEncapEthDst.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraEncapEthDst.java
@@ -35,7 +35,7 @@ public class NiciraEncapEthDst extends AbstractExtension implements ExtensionTre
     private MacAddress encapEthDst;
 
     private final KryoNamespace appKryo = new KryoNamespace.Builder()
-    .register(new MacAddressSerializer(), MacAddress.class).register(byte[].class).build();;
+    .register(new MacAddressSerializer(), MacAddress.class).register(byte[].class).build();
 
     /**
      * Creates a new nshEncapEthDst instruction.
diff --git a/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraEncapEthSrc.java b/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraEncapEthSrc.java
index 7ecc1e86cd..a7a85fe6fb 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraEncapEthSrc.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraEncapEthSrc.java
@@ -35,7 +35,7 @@ public class NiciraEncapEthSrc extends AbstractExtension implements ExtensionTre
     private MacAddress encapEthSrc;
 
     private final KryoNamespace appKryo = new KryoNamespace.Builder()
-    .register(new MacAddressSerializer(), MacAddress.class).register(byte[].class).build();;
+    .register(new MacAddressSerializer(), MacAddress.class).register(byte[].class).build();
 
     /**
      * Creates a new nshEncapEthSrc instruction.
diff --git a/incubator/api/src/main/java/org/onosproject/incubator/elasticcfg/TraversalMode.java b/incubator/api/src/main/java/org/onosproject/incubator/elasticcfg/TraversalMode.java
index bbdb2bce54..2f1b37db00 100644
--- a/incubator/api/src/main/java/org/onosproject/incubator/elasticcfg/TraversalMode.java
+++ b/incubator/api/src/main/java/org/onosproject/incubator/elasticcfg/TraversalMode.java
@@ -28,5 +28,5 @@ public enum TraversalMode {
     /**
      * Tree will NOT be traversed.
      */
-    NON_RECURSIVE;
+    NON_RECURSIVE
 }
\ No newline at end of file
diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/faultmanagement/alarm/Alarm.java b/incubator/api/src/main/java/org/onosproject/incubator/net/faultmanagement/alarm/Alarm.java
index 8257082bc3..301e8d39cc 100644
--- a/incubator/api/src/main/java/org/onosproject/incubator/net/faultmanagement/alarm/Alarm.java
+++ b/incubator/api/src/main/java/org/onosproject/incubator/net/faultmanagement/alarm/Alarm.java
@@ -204,7 +204,7 @@ public interface Alarm {
          * correct the problem in order to prevent it from becoming a more
          * serious service affecting fault.
          */
-        WARNING;
+        WARNING
 
     }
 
diff --git a/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpPeerImpl.java b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpPeerImpl.java
index 40048bc998..44c3bffeea 100644
--- a/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpPeerImpl.java
+++ b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpPeerImpl.java
@@ -449,7 +449,7 @@ public class BgpPeerImpl implements BgpPeer {
     @Override
     public final void setConnected(boolean connected) {
         this.connected = connected;
-    };
+    }
 
     @Override
     public final void setChannel(Channel channel) {
@@ -464,12 +464,12 @@ public class BgpPeerImpl implements BgpPeer {
                 channelId = '[' + ipAddress.toString() + "]:" + inetAddress.getPort();
             }
         }
-    };
+    }
 
     @Override
     public final Channel getChannel() {
         return this.channel;
-    };
+    }
 
     @Override
     public String channelId() {
diff --git a/protocols/bmv2/api/src/main/java/org/onosproject/bmv2/api/runtime/Bmv2MatchParam.java b/protocols/bmv2/api/src/main/java/org/onosproject/bmv2/api/runtime/Bmv2MatchParam.java
index 15c750fea8..5ff13168cc 100644
--- a/protocols/bmv2/api/src/main/java/org/onosproject/bmv2/api/runtime/Bmv2MatchParam.java
+++ b/protocols/bmv2/api/src/main/java/org/onosproject/bmv2/api/runtime/Bmv2MatchParam.java
@@ -50,6 +50,6 @@ public interface Bmv2MatchParam {
         /**
          * Valid match type.
          */
-        VALID;
+        VALID
     }
 }
diff --git a/protocols/ospf/ctl/src/main/java/org/onosproject/ospf/controller/util/OspfLinkType.java b/protocols/ospf/ctl/src/main/java/org/onosproject/ospf/controller/util/OspfLinkType.java
index 1d229fb74b..ce3d3e12a5 100644
--- a/protocols/ospf/ctl/src/main/java/org/onosproject/ospf/controller/util/OspfLinkType.java
+++ b/protocols/ospf/ctl/src/main/java/org/onosproject/ospf/controller/util/OspfLinkType.java
@@ -38,5 +38,5 @@ public enum OspfLinkType {
     /**
      * Indicates a Virtual link to another area border router.
      */
-    VIRTUAL_LINK;
+    VIRTUAL_LINK
 }
\ No newline at end of file
diff --git a/protocols/pcep/ctl/src/main/java/org/onosproject/pcep/controller/impl/PcepClientImpl.java b/protocols/pcep/ctl/src/main/java/org/onosproject/pcep/controller/impl/PcepClientImpl.java
index 927b4c7e5a..b3bc3d4e42 100644
--- a/protocols/pcep/ctl/src/main/java/org/onosproject/pcep/controller/impl/PcepClientImpl.java
+++ b/protocols/pcep/ctl/src/main/java/org/onosproject/pcep/controller/impl/PcepClientImpl.java
@@ -132,7 +132,7 @@ public class PcepClientImpl implements PcepClientDriver {
     @Override
     public final void setConnected(boolean connected) {
         this.connected = connected;
-    };
+    }
 
     @Override
     public final void setChannel(Channel channel) {
@@ -147,7 +147,7 @@ public class PcepClientImpl implements PcepClientDriver {
                 channelId = '[' + ipAddress.toString() + "]:" + inetAddress.getPort();
             }
         }
-    };
+    }
 
     @Override
     public String channelId() {
diff --git a/utils/misc/src/main/java/org/onlab/packet/Ethernet.java b/utils/misc/src/main/java/org/onlab/packet/Ethernet.java
index a0e07e9c26..e31781873b 100644
--- a/utils/misc/src/main/java/org/onlab/packet/Ethernet.java
+++ b/utils/misc/src/main/java/org/onlab/packet/Ethernet.java
@@ -48,7 +48,7 @@ public class Ethernet extends BasePacket {
     public static final short TYPE_VLAN = EthType.EtherType.VLAN.ethType().toShort();
     public static final short TYPE_BSN = EthType.EtherType.BDDP.ethType().toShort();
 
-    public static final short MPLS_UNICAST = EthType.EtherType.MPLS_UNICAST.ethType().toShort();;
+    public static final short MPLS_UNICAST = EthType.EtherType.MPLS_UNICAST.ethType().toShort();
     public static final short MPLS_MULTICAST = EthType.EtherType.MPLS_MULTICAST.ethType().toShort();
 
 
diff --git a/utils/misc/src/main/java/org/onlab/packet/IpAddress.java b/utils/misc/src/main/java/org/onlab/packet/IpAddress.java
index d992e52075..10ccf8f00b 100644
--- a/utils/misc/src/main/java/org/onlab/packet/IpAddress.java
+++ b/utils/misc/src/main/java/org/onlab/packet/IpAddress.java
@@ -35,7 +35,7 @@ public class IpAddress implements Comparable<IpAddress> {
     private static final int BIT_MASK = 0x000000ff;
 
     // IP Versions
-    public enum Version { INET, INET6 };
+    public enum Version { INET, INET6 }
 
     // lengths of address, in bytes
     public static final int INET_BYTE_LENGTH = 4;