Remove unnecessary modifiers

Change-Id: I890c9b33ae8e8402520230860fa575a9ec757b2d

@@ -27,7 +27,7 @@ public interface Subnet {
     /**
     /**
      * Coarse classification of the type of the ipV6Mode.
      * Coarse classification of the type of the ipV6Mode.
      */
      */
-    public enum Mode {
+    enum Mode {
         DHCPV6_STATEFUL, DHCPV6_STATELESS, SLAAC
         DHCPV6_STATEFUL, DHCPV6_STATELESS, SLAAC
     }
     }
 
 

@@ -23,7 +23,7 @@ public interface TenantNetwork {
     /**
     /**
      * Coarse classification of the state of the tenantNetwork.
      * Coarse classification of the state of the tenantNetwork.
      */
      */
-    public enum State {
+    enum State {
         /**
         /**
          * Signifies that a tenantNetwork is currently active.This state means
          * Signifies that a tenantNetwork is currently active.This state means
          * that this network is available.
          * that this network is available.
@@ -46,7 +46,7 @@ public interface TenantNetwork {
     /**
     /**
      * Coarse classification of the type of the tenantNetwork.
      * Coarse classification of the type of the tenantNetwork.
      */
      */
-    public enum Type {
+    enum Type {
         /**
         /**
          * Signifies that a tenantNetwork is local.
          * Signifies that a tenantNetwork is local.
          */
          */

@@ -28,7 +28,7 @@ public interface VirtualPort {
     /**
     /**
      * Coarse classification of the type of the virtual port.
      * Coarse classification of the type of the virtual port.
      */
      */
-    public enum State {
+    enum State {
         /**
         /**
          * Signifies that a virtualPort is currently active,This state mean that
          * Signifies that a virtualPort is currently active,This state mean that
          * this virtualPort is available.
          * this virtualPort is available.
@@ -37,7 +37,7 @@ public interface VirtualPort {
         /**
         /**
          * Signifies that a virtualPort is currently unavailable.
          * Signifies that a virtualPort is currently unavailable.
          */
          */
-        DOWN
+        DOWN;
     }
     }
 
 
     /**
     /**

@@ -23,7 +23,7 @@ import org.onlab.packet.IpAddress;
 public interface ControllerNode {
 public interface ControllerNode {
 
 
     /** Represents the operational state of the instance. */
     /** Represents the operational state of the instance. */
-    public enum State {
+    enum State {
         /**
         /**
          * Signifies that the instance is active and operating normally.
          * Signifies that the instance is active and operating normally.
          */
          */

@@ -27,12 +27,12 @@ public interface CoreService {
     /**
     /**
      * Name of the core "application".
      * Name of the core "application".
      */
      */
-    static final String CORE_APP_NAME = "org.onosproject.core";
+    String CORE_APP_NAME = "org.onosproject.core";
 
 
     /**
     /**
      * Identifier of the core "provider".
      * Identifier of the core "provider".
      */
      */
-    static final ProviderId CORE_PROVIDER_ID = new ProviderId("core", CORE_APP_NAME);
+    ProviderId CORE_PROVIDER_ID = new ProviderId("core", CORE_APP_NAME);
 
 
     /**
     /**
      * Returns the product version.
      * Returns the product version.

@@ -32,7 +32,7 @@ public interface MetricsHelper {
      *
      *
      * @return MetricService instance
      * @return MetricService instance
      */
      */
-    abstract MetricsService metricsService();
+    MetricsService metricsService();
 
 
 
 
     /**
     /**

@@ -25,7 +25,7 @@ public interface Device extends Element {
     /**
     /**
      * Coarse classification of the type of the infrastructure device.
      * Coarse classification of the type of the infrastructure device.
      */
      */
-    public enum Type {
+    enum Type {
         SWITCH, ROUTER, ROADM, OTN, ROADM_OTN, FIREWALL, BALANCER, IPS, IDS, CONTROLLER,
         SWITCH, ROUTER, ROADM, OTN, ROADM_OTN, FIREWALL, BALANCER, IPS, IDS, CONTROLLER,
         VIRTUAL, FIBER_SWITCH, MICROWAVE, OTHER
         VIRTUAL, FIBER_SWITCH, MICROWAVE, OTHER
     }
     }

@@ -25,8 +25,8 @@ import org.onosproject.net.DeviceId;
  */
  */
 public interface FlowRule {
 public interface FlowRule {
 
 
-    static final int MAX_TIMEOUT = 60;
-    static final int MIN_PRIORITY = 0;
+    int MAX_TIMEOUT = 60;
+    int MIN_PRIORITY = 0;
 
 
     /**
     /**
      * The FlowRule type is used to determine in which table the flow rule needs
      * The FlowRule type is used to determine in which table the flow rule needs
@@ -36,7 +36,7 @@ public interface FlowRule {
      * @deprecated in Cardinal Release
      * @deprecated in Cardinal Release
      */
      */
     @Deprecated
     @Deprecated
-    static enum Type {
+    enum Type {
         /*
         /*
          * Default type - used in flow rule for single table switch NOTE: this
          * Default type - used in flow rule for single table switch NOTE: this
          * setting should not be used as Table 0 in a multi-table pipeline
          * setting should not be used as Table 0 in a multi-table pipeline

@@ -32,7 +32,7 @@ public interface FlowRuleService
     /**
     /**
      * The topic used for obtaining globally unique ids.
      * The topic used for obtaining globally unique ids.
      */
      */
-    static String FLOW_OP_TOPIC = "flow-ops-ids";
+    String FLOW_OP_TOPIC = "flow-ops-ids";
 
 
     /**
     /**
      * Returns the number of flow rules in the system.
      * Returns the number of flow rules in the system.

@@ -26,9 +26,9 @@ import java.util.Optional;
 @Beta
 @Beta
 public interface Objective {
 public interface Objective {
 
 
-    static final boolean DEFAULT_PERMANENT = true;
-    static final int DEFAULT_TIMEOUT = 0;
-    static final int DEFAULT_PRIORITY = 32768;
+    boolean DEFAULT_PERMANENT = true;
+    int DEFAULT_TIMEOUT = 0;
+    int DEFAULT_PRIORITY = 32768;
 
 
     /**
     /**
      * Type of operation.
      * Type of operation.

@@ -34,7 +34,7 @@ public enum PacketPriority {
 
 
     private final int priorityValue;
     private final int priorityValue;
 
 
-    private PacketPriority(int priorityValue) {
+    PacketPriority(int priorityValue) {
         this.priorityValue = priorityValue;
         this.priorityValue = priorityValue;
     }
     }
 
 
@@ -50,4 +50,4 @@ public enum PacketPriority {
     public String toString() {
     public String toString() {
         return String.valueOf(priorityValue);
         return String.valueOf(priorityValue);
     }
     }
-}
\ No newline at end of file
+}

@@ -22,8 +22,8 @@ import static com.google.common.base.Preconditions.checkArgument;
  */
  */
 public interface PacketProcessor {
 public interface PacketProcessor {
 
 
-    static final int ADVISOR_MAX = Integer.MAX_VALUE / 3;
-    static final int DIRECTOR_MAX = (Integer.MAX_VALUE / 3) * 2;
+    int ADVISOR_MAX = Integer.MAX_VALUE / 3;
+    int DIRECTOR_MAX = (Integer.MAX_VALUE / 3) * 2;
     static final int OBSERVER_MAX = Integer.MAX_VALUE;
     static final int OBSERVER_MAX = Integer.MAX_VALUE;
 
 
     /**
     /**

@@ -31,7 +31,7 @@ public final class DatabaseUpdate {
     /**
     /**
      * Type of database update operation.
      * Type of database update operation.
      */
      */
-    public static enum Type {
+    public enum Type {
         /**
         /**
          * Insert/Update entry without any checks.
          * Insert/Update entry without any checks.
          */
          */