Cleanup: remove redundant modifiers 70/48170/3
authorStephen Kitt <skitt@redhat.com>
Wed, 9 Nov 2016 16:07:57 +0000 (17:07 +0100)
committerStephen Kitt <skitt@redhat.com>
Thu, 10 Nov 2016 17:13:19 +0000 (18:13 +0100)
* Replace <? extends Object> with <?>
* Remove public from interface members (they're public by default).
* Remove static and final from interface attributes (they're static
  final by default).
* Remove unnecessary semi-colons.
* Remove private from enum constructors (they're private by default).
* Remove static from enum declarations (they're static by default).

Change-Id: I863d0cc1bba35562bf461b2f7a75abbe01a1ca33
Signed-off-by: Stephen Kitt <skitt@redhat.com>
43 files changed:
alivenessmonitor/alivenessmonitor-impl/src/main/java/org/opendaylight/genius/alivenessmonitor/internal/AlivenessMonitor.java
fcapsapplication/fcapsapplication-impl/src/main/java/org/opendaylight/genius/fcapsapp/portinfo/PortNameMappingMBean.java
fcapsapplication/fcapsapplication-jmxapi/src/main/java/org/opendaylight/genius/fcapsappjmx/ControlPathFailureAlarmMBean.java
fcapsapplication/fcapsapplication-jmxapi/src/main/java/org/opendaylight/genius/fcapsappjmx/NumberOfOFPortsMBean.java
fcapsapplication/fcapsapplication-jmxapi/src/main/java/org/opendaylight/genius/fcapsappjmx/NumberOfOFSwitchCounterMBean.java
fcapsapplication/fcapsapplication-jmxapi/src/main/java/org/opendaylight/genius/fcapsappjmx/PacketInCounterMBean.java
fcapsmanager/fcaps-api/src/main/java/org/opendaylight/genius/fcapsmanager/AlarmServiceFacade.java
fcapsmanager/fcaps-api/src/main/java/org/opendaylight/genius/fcapsmanager/PMServiceFacade.java
idmanager/idmanager-impl/src/main/java/org/opendaylight/genius/idmanager/IdHolder.java
interfacemanager/interfacemanager-api/src/main/java/org/opendaylight/genius/interfacemanager/globals/InterfaceInfo.java
interfacemanager/interfacemanager-api/src/main/java/org/opendaylight/genius/interfacemanager/interfaces/IInterfaceManager.java
interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/commons/AlivenessMonitorUtils.java
interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/pmcounters/CounterForEntriesPerOFTableMBean.java
interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/pmcounters/CounterForOFPortBytesReceiveMBean.java
interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/pmcounters/CounterForOFPortBytesSentMBean.java
interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/pmcounters/CounterForOFPortDurationMBean.java
interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/pmcounters/CounterForOFPortPacketReceiveMBean.java
interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/pmcounters/CounterForOFPortPacketSentMBean.java
interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/pmcounters/CounterForOFPortReceiveDropMBean.java
interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/pmcounters/CounterForOFPortReceiveErrorMBean.java
interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/ovs/statehelpers/OvsInterfaceTopologyStateRemoveHelper.java
interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/config/factory/FlowBasedServicesConfigAddable.java
interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/config/factory/FlowBasedServicesConfigRemovable.java
interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/state/factory/FlowBasedServicesStateAddable.java
interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/state/factory/FlowBasedServicesStateRemovable.java
interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/utilities/FlowBasedServicesUtils.java
interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/statusanddiag/InterfaceStatusMonitorMBean.java
itm/itm-api/src/main/java/org/opendaylight/genius/itm/api/IITMProvider.java
itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmExternalTunnelAddWorker.java
itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmInternalTunnelAddWorker.java
itm/itm-impl/src/main/java/org/opendaylight/genius/itm/monitoring/DataPathAlarmMBean.java
itm/itm-impl/src/main/java/org/opendaylight/genius/itm/snd/ITMStatusMonitorMBean.java
itm/itm-impl/src/main/java/org/opendaylight/genius/itm/validator/TransportZoneValidator.java
itm/itm-impl/src/main/java/org/opendaylight/genius/itm/validator/ValidatorErrorCode.java
mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/MDSALUtil.java
mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/MatchInfoBase.java
mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/NwConstants.java
mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/interfaces/IMdsalApiManager.java
mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/packet/IPProtocols.java
mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/batching/ActionableResource.java
mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/batching/SubTransaction.java
mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/hwvtep/NodeEvent.java
mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/genius/mdsalutil/internal/MDSALUtilProvider.java

index f01ac72a7ff0b1992b76f16adb8576aac8506ae3..f095039f6ee75bd9a323bde27f2e8891d40b3910 100644 (file)
@@ -938,8 +938,8 @@ public class AlivenessMonitor implements AlivenessMonitorService, PacketProcessi
         LOG.debug("Sending notification for id {}  - state {}", monitorId, state);
         EventData data = new EventDataBuilder().setMonitorId(monitorId)
                                                .setMonitorState(state).build();
-        MonitorEvent event = new MonitorEventBuilder().setEventData(data).build();;
-        final ListenableFuture<? extends Object> eventFuture = notificationPublishService.offerNotification(event);
+        MonitorEvent event = new MonitorEventBuilder().setEventData(data).build();
+        final ListenableFuture<?> eventFuture = notificationPublishService.offerNotification(event);
         Futures.addCallback(eventFuture, new FutureCallback<Object>() {
             @Override
             public void onFailure(Throwable error) {
index 63df82d4b6b45ab7540f5b17b472b351cfaa958f..8e8c959f87eeca6142765d10a21c690b480452b9 100644 (file)
@@ -11,6 +11,6 @@ import java.lang.String;
 import java.util.Map;
 
 public interface PortNameMappingMBean {
-    public Map<String,String> getPortIdtoPortNameMap();
-    public String getPortName(String portId);
+    Map<String,String> getPortIdtoPortNameMap();
+    String getPortName(String portId);
 }
\ No newline at end of file
index ec615f3029faeaef8b4443345a62d4534cddb622..2c2c740f7eea24fecbcbc5dd3b1efc19abcd774c 100644 (file)
@@ -11,10 +11,10 @@ package org.opendaylight.genius.fcapsappjmx;
 import java.util.ArrayList;
 
 public interface ControlPathFailureAlarmMBean {
-    public void setRaiseAlarmObject(ArrayList<String> raiseAlarmObject);
-    public ArrayList<String> getRaiseAlarmObject();
-    public void setClearAlarmObject(ArrayList<String> clearAlarmObject);
-    public ArrayList<String> getClearAlarmObject();
-    public void raiseAlarm(String alarmName, String additionalText, String source);
-    public void clearAlarm(String alarmName, String additionalText, String source);
+    void setRaiseAlarmObject(ArrayList<String> raiseAlarmObject);
+    ArrayList<String> getRaiseAlarmObject();
+    void setClearAlarmObject(ArrayList<String> clearAlarmObject);
+    ArrayList<String> getClearAlarmObject();
+    void raiseAlarm(String alarmName, String additionalText, String source);
+    void clearAlarm(String alarmName, String additionalText, String source);
 }
index a53fb8f82b35af13150941b51bc136eedb35a1e3..c09d8f6e6592191b2f28d1878eadfc10a7a787a5 100644 (file)
@@ -13,6 +13,6 @@ public interface NumberOfOFPortsMBean {
     //-----------
     // operations
     //-----------
-    public void updateCounter(Map<String, String> map);
-    public Map<String, String> retrieveCounterMap();
+    void updateCounter(Map<String, String> map);
+    Map<String, String> retrieveCounterMap();
 }
index 7dda639b6b6feb5277fc56d5cce62500245aba0c..6aa44ce4da2f16fca132cba185e402cc421667dc 100644 (file)
@@ -13,6 +13,6 @@ public interface NumberOfOFSwitchCounterMBean {
     //-----------
     // operations
     //-----------
-    public void updateCounter(Map<String, String> map);
-    public Map<String, String> retrieveCounterMap();
+    void updateCounter(Map<String, String> map);
+    Map<String, String> retrieveCounterMap();
 }
index 182b8ae94c0518777e0b89e812fe5c0581b7cbe4..4875506ab640244758fb8d17d8f618bf6146ae7c 100644 (file)
@@ -13,6 +13,6 @@ public interface PacketInCounterMBean {
     //-----------
     // operations
     //-----------
-    public void updateCounter(Map<String, String> map);
-    public Map<String, String> retrieveCounterMap();
+    void updateCounter(Map<String, String> map);
+    Map<String, String> retrieveCounterMap();
 }
index 7a604220019e3e20e239260757dbe6530de5ac34..c503654fe74b13056242680034ba5d0f5068ee07 100644 (file)
@@ -19,7 +19,7 @@ public interface AlarmServiceFacade {
      *            Source of the alarm ex: dpnId=openflow:1
      *            the source node that caused this alarm
      */
-    public void raiseAlarm(String alarmName, String additionalText, String source);
+    void raiseAlarm(String alarmName, String additionalText, String source);
 
     /**
      * Clears the given alarm in platform environment
@@ -32,5 +32,5 @@ public interface AlarmServiceFacade {
      *            Source of the alarm ex:  dpnId=openflow:1
      *            the source node that caused this alarm
      */
-    public void clearAlarm(String alarmName, String additionalText, String source);
+    void clearAlarm(String alarmName, String additionalText, String source);
 }
\ No newline at end of file
index 31785dd44a9423d910e2e51aeab897c85abd8847..65d83a5a70527dc83d7df367bd6ee85adf2432cb 100644 (file)
@@ -10,5 +10,5 @@ package org.opendaylight.genius.fcapsmanager;
 import java.util.Map;
 
 public interface PMServiceFacade {
-    public void connectToPMFactory(Map map);
+    void connectToPMFactory(Map map);
 }
index 78f54f6341a7f0717ef388c9e51187fbb949aa53..62997b033d28cbc6e9a4ef88c0f7f5cbffff8faf 100644 (file)
@@ -13,8 +13,8 @@ import com.google.common.base.Optional;
 
 public interface IdHolder {
     Optional<Long> allocateId();
-    public void addId(long id);
-    public boolean isIdAvailable();
-    public long getAvailableIdCount();
-    public void refreshDataStore(IdPoolBuilder idPoolBuilder);
+    void addId(long id);
+    boolean isIdAvailable();
+    long getAvailableIdCount();
+    void refreshDataStore(IdPoolBuilder idPoolBuilder);
 }
\ No newline at end of file
index e5e81a64cc1fdb1d585a716a3bb20accdadc7680..6a7cd4a26f395cef0b8bf613506c0cc31e417af2 100644 (file)
@@ -25,7 +25,7 @@ public class InterfaceInfo implements Serializable {
         MPLS_OVER_GRE,
         MPLS_OVER_UDP,
         LOGICAL_GROUP_INTERFACE,
-        UNKNOWN_INTERFACE;
+        UNKNOWN_INTERFACE
     }
 
     public enum InterfaceAdminState {
index fd8420bdf20919a096045d31a77d0493bd4e3d80..26ffc9a35b425d8e0e9b14bbabb2962efe3e3281 100644 (file)
@@ -21,41 +21,42 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev
 
 public interface IInterfaceManager {
     @Deprecated
-    public Long getPortForInterface(String ifName);
+    Long getPortForInterface(String ifName);
 
     @Deprecated
-    public BigInteger getDpnForInterface(String ifName);
+    BigInteger getDpnForInterface(String ifName);
 
     @Deprecated
-    public BigInteger getDpnForInterface(Interface intrf);
+    BigInteger getDpnForInterface(Interface intrf);
 
     @Deprecated
-    public String getEndpointIpForDpn(BigInteger dpnId);
+    String getEndpointIpForDpn(BigInteger dpnId);
 
     @Deprecated
-    public List<ActionInfo> getInterfaceEgressActions(String ifName);
+    List<ActionInfo> getInterfaceEgressActions(String ifName);
 
     @Deprecated
-    public Long getPortForInterface(Interface intf);
+    Long getPortForInterface(Interface intf);
 
-    public InterfaceInfo getInterfaceInfo(String intInfo);
+    InterfaceInfo getInterfaceInfo(String intInfo);
 
-    public InterfaceInfo getInterfaceInfoFromOperationalDataStore(String interfaceName, InterfaceInfo.InterfaceType interfaceType);
-    public InterfaceInfo getInterfaceInfoFromOperationalDataStore(String interfaceName);
+    InterfaceInfo getInterfaceInfoFromOperationalDataStore(String interfaceName,
+            InterfaceInfo.InterfaceType interfaceType);
+    InterfaceInfo getInterfaceInfoFromOperationalDataStore(String interfaceName);
 
-    public Interface getInterfaceInfoFromConfigDataStore(String interfaceName);
+    Interface getInterfaceInfoFromConfigDataStore(String interfaceName);
 
-    public void createVLANInterface(String interfaceName, String portName, BigInteger dpId,  Integer vlanId,
-                             String description, IfL2vlan.L2vlanMode l2vlanMode) throws InterfaceAlreadyExistsException;
+    void createVLANInterface(String interfaceName, String portName, BigInteger dpId, Integer vlanId,
+            String description, IfL2vlan.L2vlanMode l2vlanMode) throws InterfaceAlreadyExistsException;
 
-    public void createVLANInterface(String interfaceName, String portName, BigInteger dpId,  Integer vlanId,
+    void createVLANInterface(String interfaceName, String portName, BigInteger dpId, Integer vlanId,
             String description, IfL2vlan.L2vlanMode l2vlanMode, boolean isExternal) throws InterfaceAlreadyExistsException;
 
-    public void bindService(String interfaceName, Class<? extends ServiceModeBase> serviceMode, BoundServices serviceInfo);
-    public void unbindService(String interfaceName, Class<? extends ServiceModeBase> serviceMode, BoundServices serviceInfo);
+    void bindService(String interfaceName, Class<? extends ServiceModeBase> serviceMode, BoundServices serviceInfo);
+    void unbindService(String interfaceName, Class<? extends ServiceModeBase> serviceMode, BoundServices serviceInfo);
     List<Interface> getVlanInterfaces();
     List<Interface> getVxlanInterfaces();
 
-    public boolean isExternalInterface(String interfaceName);
+    boolean isExternalInterface(String interfaceName);
 
 }
\ No newline at end of file
index 3b7acf36955ec9624762982e152f184f72f2f928..e27d91567f4be9b59aaa8ebd08ba97187ef1a567 100644 (file)
@@ -261,7 +261,7 @@ public class AlivenessMonitorUtils {
         profileBuilder.setProtocolType(protocolType);
         buildGetProfile.setProfile(profileBuilder.build());
         return (buildGetProfile.build());
-    };
+    }
 
     public static long allocateProfile(AlivenessMonitorService alivenessMonitor, long FAILURE_THRESHOLD, long MONITORING_INTERVAL,
                                        long MONITORING_WINDOW, EtherTypes etherTypes) {
index b163bf94201ddaa456ac127c6604698e56ed3871..6b6a2aaae84cfd557fdd81bce78bfa3d78b9f3b4 100644 (file)
@@ -13,11 +13,11 @@ public interface CounterForEntriesPerOFTableMBean {
     //-----------
     // operations
     //-----------
-    public void setCounterDetails(Map<String, Integer> map);
-    public Map<String, Integer> getCounterDetails();
+    void setCounterDetails(Map<String, Integer> map);
+    Map<String, Integer> getCounterDetails();
     //-----------
     // attributes
     //-----------
-    public void invokePMManagedObjects(Map<String, Integer> map);
-    public Map<String, String> retrieveCounterMap();
+    void invokePMManagedObjects(Map<String, Integer> map);
+    Map<String, String> retrieveCounterMap();
 }
index e432b87e43cdad7236419c1b3f605f2ae38c6e38..06c47b1b3660e59fd5112ff914febd127f4b0b7d 100644 (file)
@@ -13,11 +13,11 @@ public interface CounterForOFPortBytesReceiveMBean {
     //-----------
     // operations
     //-----------
-    public void setCounterDetails(Map<String, Integer> map);
-    public Map<String, Integer> getCounterDetails();
+    void setCounterDetails(Map<String, Integer> map);
+    Map<String, Integer> getCounterDetails();
     //-----------
     // attributes
     //-----------
-    public void invokePMManagedObjects(Map<String, Integer> map);
-    public Map<String, String> retrieveCounterMap();
+    void invokePMManagedObjects(Map<String, Integer> map);
+    Map<String, String> retrieveCounterMap();
 }
index 25ff434907aa293eacf3a32573a3a307785249db..a85e476b7e4089d573a44adf31e01e443e1b9b9f 100644 (file)
@@ -13,11 +13,11 @@ public interface CounterForOFPortBytesSentMBean {
     //-----------
     // operations
     //-----------
-    public void setCounterDetails(Map<String, Integer> map);
-    public Map<String, Integer> getCounterDetails();
+    void setCounterDetails(Map<String, Integer> map);
+    Map<String, Integer> getCounterDetails();
     //-----------
     // attributes
     //-----------
-    public void invokePMManagedObjects(Map<String, Integer> map);
-    public Map<String, String> retrieveCounterMap();
+    void invokePMManagedObjects(Map<String, Integer> map);
+    Map<String, String> retrieveCounterMap();
 }
index 57d95e3cfab3b0d90794a2567e2cbbf95f9aa0fa..95f16f617b3df55ade99d011e2dcb43418cbe510 100644 (file)
@@ -13,11 +13,11 @@ public interface CounterForOFPortDurationMBean {
     //-----------
     // operations
     //-----------
-    public void setCounterDetails(Map<String, Integer> map);
-    public Map<String, Integer> getCounterDetails();
+    void setCounterDetails(Map<String, Integer> map);
+    Map<String, Integer> getCounterDetails();
     //-----------
     // attributes
     //-----------
-    public void invokePMManagedObjects(Map<String, Integer> map);
-    public Map<String, String> retrieveCounterMap();
+    void invokePMManagedObjects(Map<String, Integer> map);
+    Map<String, String> retrieveCounterMap();
 }
index 09236082c4597f6ca887ecda6f409dad403925c1..22e0609c47bd00ea92686eb56d07e740300571ff 100644 (file)
@@ -13,11 +13,11 @@ public interface CounterForOFPortPacketReceiveMBean {
     //-----------
     // operations
     //-----------
-    public void setCounterDetails(Map<String, Integer> map);
-    public Map<String, Integer> getCounterDetails();
+    void setCounterDetails(Map<String, Integer> map);
+    Map<String, Integer> getCounterDetails();
     //-----------
     // attributes
     //-----------
-    public void invokePMManagedObjects(Map<String, Integer> map);
-    public Map<String, String> retrieveCounterMap();
+    void invokePMManagedObjects(Map<String, Integer> map);
+    Map<String, String> retrieveCounterMap();
 }
index 94f9311d0604c079cb10e776cbb4568e46e96bfa..96830df6ed2077612273181d9b9db02f7ed4790c 100644 (file)
@@ -13,11 +13,11 @@ public interface CounterForOFPortPacketSentMBean {
     //-----------
     // operations
     //-----------
-    public void setCounterDetails(Map<String, Integer> map);
-    public Map<String, Integer> getCounterDetails();
+    void setCounterDetails(Map<String, Integer> map);
+    Map<String, Integer> getCounterDetails();
     //-----------
     // attributes
     //-----------
-    public void invokePMManagedObjects(Map<String, Integer> map);
-    public Map<String, String> retrieveCounterMap();
+    void invokePMManagedObjects(Map<String, Integer> map);
+    Map<String, String> retrieveCounterMap();
 }
\ No newline at end of file
index f1ed34dc3cc257dc5c449fdbb7ba3db8b9f95e5c..53693ceebccd2eefd82401a176335386e6029ba3 100644 (file)
@@ -13,11 +13,11 @@ public interface CounterForOFPortReceiveDropMBean {
     //-----------
     // operations
     //-----------
-    public void setCounterDetails(Map<String, Integer> map);
-    public Map<String, Integer> getCounterDetails();
+    void setCounterDetails(Map<String, Integer> map);
+    Map<String, Integer> getCounterDetails();
     //-----------
     // attributes
     //-----------
-    public void invokePMManagedObjects(Map<String, Integer> map);
-    public Map<String, String> retrieveCounterMap();
+    void invokePMManagedObjects(Map<String, Integer> map);
+    Map<String, String> retrieveCounterMap();
 }
index 54523d0aba046de3e89aa5d1581d875c976f8feb..567c44e81702ac351e52a292f3bb4fcf7068cd50 100644 (file)
@@ -13,11 +13,11 @@ public interface CounterForOFPortReceiveErrorMBean {
     //-----------
     // operations
     //-----------
-    public void setCounterDetails(Map<String, Integer> map);
-    public Map<String, Integer> getCounterDetails();
+    void setCounterDetails(Map<String, Integer> map);
+    Map<String, Integer> getCounterDetails();
     //-----------
     // attributes
     //-----------
-    public void invokePMManagedObjects(Map<String, Integer> map);
-    public Map<String, String> retrieveCounterMap();
+    void invokePMManagedObjects(Map<String, Integer> map);
+    Map<String, String> retrieveCounterMap();
 }
index 06d73d252d20b257d176cb3ead7ff75b7d56607d..2e39e7f7f4cd252d1a11beff13eaf5cf347ca2a9 100644 (file)
@@ -32,7 +32,7 @@ public class OvsInterfaceTopologyStateRemoveHelper {
     public static List<ListenableFuture<Void>> removePortFromBridge(InstanceIdentifier<OvsdbBridgeAugmentation> bridgeIid,
                                                                     OvsdbBridgeAugmentation bridgeOld, DataBroker dataBroker) {
         List<ListenableFuture<Void>> futures = new ArrayList<>();
-        WriteTransaction transaction = dataBroker.newWriteOnlyTransaction();;
+        WriteTransaction transaction = dataBroker.newWriteOnlyTransaction();
         BigInteger dpnId = IfmUtil.getDpnId(bridgeOld.getDatapathId());
 
         if (dpnId == null) {
index 5fe3fff478edfb129c251cbc6191a649ccdb9570..6148db97aee112a7933c060a5a03644ca5f1fb9c 100644 (file)
@@ -15,6 +15,6 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import java.util.List;
 
 public interface FlowBasedServicesConfigAddable {
-    public List<ListenableFuture<Void>> bindService(InstanceIdentifier<BoundServices> instanceIdentifier,
-                                                    BoundServices boundServiceNew);
+    List<ListenableFuture<Void>> bindService(InstanceIdentifier<BoundServices> instanceIdentifier,
+            BoundServices boundServiceNew);
 }
index e35bc3bf12872613441652cbf8813bf316ad958e..904c2238076ac789dee2b12bf04eedfc30660e47 100644 (file)
@@ -15,6 +15,6 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import java.util.List;
 
 public interface FlowBasedServicesConfigRemovable {
-    public List<ListenableFuture<Void>> unbindService(InstanceIdentifier<BoundServices> instanceIdentifier,
-                                                    BoundServices boundServiceNew);
+    List<ListenableFuture<Void>> unbindService(InstanceIdentifier<BoundServices> instanceIdentifier,
+            BoundServices boundServiceNew);
 }
index 7699e034b38eb647af847479c3b69188c29ab029..005c78d18b21494a21b4d6e6e4e18290796d0751 100644 (file)
@@ -17,5 +17,5 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import java.util.List;
 
 public interface FlowBasedServicesStateAddable {
-    public List<ListenableFuture<Void>> bindServicesOnInterface(Interface ifaceState);
+    List<ListenableFuture<Void>> bindServicesOnInterface(Interface ifaceState);
 }
index af6c582862398ac2d55e74436d666d2e95963930..31a0b4a36a2ee427eb3e2aedf54aa0d168049b48 100644 (file)
@@ -17,5 +17,5 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import java.util.List;
 
 public interface FlowBasedServicesStateRemovable {
-    public List<ListenableFuture<Void>> unbindServicesFromInterface(Interface ifaceState);
+    List<ListenableFuture<Void>> unbindServicesFromInterface(Interface ifaceState);
 }
index d67daa9f770c82d3d6762ed8034cd90018b9ea9a..91b4ebe623df39e2e68f7b374886e4cccf134d0c 100644 (file)
@@ -23,22 +23,23 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.op.rev160406.tun
 
 public interface IITMProvider {
     // APIs used by i
-    public void createLocalCache(BigInteger dpnId, String portName, Integer vlanId, String ipAddress, String subnetMask, String gatewayIp, String transportZone, CommandSession session);
+    void createLocalCache(BigInteger dpnId, String portName, Integer vlanId, String ipAddress, String subnetMask,
+            String gatewayIp, String transportZone, CommandSession session);
 
-    public void commitTeps();
+    void commitTeps();
 
-    public DataBroker getDataBroker();
+    DataBroker getDataBroker();
 
-    public void showTeps(CommandSession session);
+    void showTeps(CommandSession session);
 
-    public void showState(List<StateTunnelList> tunnels, CommandSession session);
+    void showState(List<StateTunnelList> tunnels, CommandSession session);
 
-    public void showCache(String cacheName);
+    void showCache(String cacheName);
 
-    public void deleteVtep(BigInteger dpnId, String portName, Integer vlanId, String ipAddress, String subnetMask,
-                           String gatewayIp, String transportZone, CommandSession session);
+    void deleteVtep(BigInteger dpnId, String portName, Integer vlanId, String ipAddress, String subnetMask,
+            String gatewayIp, String transportZone, CommandSession session);
     // public void showState(TunnelsState tunnelsState);
-    public void configureTunnelType(String transportZone, String tunnelType);
+    void configureTunnelType(String transportZone, String tunnelType);
 
 
     /**
@@ -47,7 +48,7 @@ public interface IITMProvider {
      * @param vtepConfigSchema
      *            the vtep config schema
      */
-    public void addVtepConfigSchema(VtepConfigSchema vtepConfigSchema);
+    void addVtepConfigSchema(VtepConfigSchema vtepConfigSchema);
 
     /**
      * Gets the vtep config schema.
@@ -56,14 +57,14 @@ public interface IITMProvider {
      *            the schema name
      * @return the vtep config schema
      */
-    public VtepConfigSchema getVtepConfigSchema(String schemaName);
+    VtepConfigSchema getVtepConfigSchema(String schemaName);
 
     /**
      * Gets the all vtep config schemas.
      *
      * @return the all vtep config schemas
      */
-    public List<VtepConfigSchema> getAllVtepConfigSchemas();
+    List<VtepConfigSchema> getAllVtepConfigSchemas();
 
     /**
      * Update VTEP schema.
@@ -75,20 +76,20 @@ public interface IITMProvider {
      * @param lstDpnsForDelete
      *            the lst dpns for delete
      */
-    public void updateVtepSchema(String schemaName, List<BigInteger> lstDpnsForAdd, List<BigInteger> lstDpnsForDelete);
+    void updateVtepSchema(String schemaName, List<BigInteger> lstDpnsForAdd, List<BigInteger> lstDpnsForDelete);
 
     /**
      * Delete all vtep schemas.
      */
-    public void deleteAllVtepSchemas();
+    void deleteAllVtepSchemas();
 
-    public void configureTunnelMonitorParams(boolean monitorEnabled, String monitorProtocol);
+    void configureTunnelMonitorParams(boolean monitorEnabled, String monitorProtocol);
 
-    public void configureTunnelMonitorInterval(int interval);
+    void configureTunnelMonitorInterval(int interval);
 
-    public void addExternalEndpoint(java.lang.Class<? extends TunnelTypeBase> tunType, IpAddress dcgwIP);
+    void addExternalEndpoint(java.lang.Class<? extends TunnelTypeBase> tunType, IpAddress dcgwIP);
 
-    public void remExternalEndpoint(java.lang.Class<? extends TunnelTypeBase> tunType, IpAddress dcgwIP);
+    void remExternalEndpoint(java.lang.Class<? extends TunnelTypeBase> tunType, IpAddress dcgwIP);
 
-    public boolean validateIP (final String ip);
+    boolean validateIP(final String ip);
 }
index a2a438e9fc4d0c4c045035cb075c12c34c436bf3..d0b639b7546d92dc5b3d69672542ec852902ad39 100644 (file)
@@ -61,7 +61,6 @@ public class ItmExternalTunnelAddWorker {
                     logger.error("Error in Datastore operation", error);
                 }
 
-                ;
             };
 
     public static List<ListenableFuture<Void>> buildTunnelsToExternalEndPoint(DataBroker dataBroker, IdManagerService idManagerService,
index 8868d0b193e294834d42923ca796e0a28cf8177b..0e96ffb7385c165dfd7f67a849925aef465c2cc8 100644 (file)
@@ -49,8 +49,8 @@ public class ItmInternalTunnelAddWorker {
 
                 public void onFailure(Throwable error) {
                     logger.error("Error in Datastore operation", error);
-                };
-            };
+                }
+             };
 
 
     public static List<ListenableFuture<Void>> build_all_tunnels(DataBroker dataBroker, IdManagerService idManagerService,IMdsalApiManager mdsalManager,
index 157f1143e2da45053673155b53d84bc385f0e14e..627722f3fda9f7a2731d17785fae8cfdf3e1a518 100644 (file)
@@ -10,10 +10,10 @@ package org.opendaylight.genius.itm.monitoring;
 import java.util.ArrayList;
 
 public interface DataPathAlarmMBean {
-    public void setRaiseAlarmObject(ArrayList<String> raiseAlarmObject);
-    public ArrayList<String> getRaiseAlarmObject();
-    public void setClearAlarmObject(ArrayList<String> clearAlarmObject);
-    public ArrayList<String> getClearAlarmObject();
-    public void raiseAlarm(String alarmName, String additionalText, String source);
-    public void clearAlarm(String alarmName, String additionalText, String source);
+    void setRaiseAlarmObject(ArrayList<String> raiseAlarmObject);
+    ArrayList<String> getRaiseAlarmObject();
+    void setClearAlarmObject(ArrayList<String> clearAlarmObject);
+    ArrayList<String> getClearAlarmObject();
+    void raiseAlarm(String alarmName, String additionalText, String source);
+    void clearAlarm(String alarmName, String additionalText, String source);
 }
index 259e8a5a460099ff05d987012cacbc6fe6af32fc..150439d9498f8b96c3779fe3fa4936471a1e01bc 100644 (file)
@@ -9,6 +9,6 @@ package org.opendaylight.genius.itm.snd;
 
 public interface ITMStatusMonitorMBean {
 
-    public String acquireServiceStatus();
+    String acquireServiceStatus();
 
 }
index 8a185bcd65ba84c48eb4609f4361a97feaae30b0..840ad5f8878d31d0ed8cd4b02c8d10fda7e853ff 100644 (file)
@@ -10,5 +10,5 @@ package org.opendaylight.genius.itm.validator;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.rev160406.transport.zones.TransportZone;
 
 public interface TransportZoneValidator {
-    public ValidatorErrorCode validate(TransportZone zone);
+    ValidatorErrorCode validate(TransportZone zone);
 }
index 3647823aae5a0d9b61930d94f88ed342e1d01c5c..e3e4106e6e6e694f3369b1a2acc22a06c7387dee 100644 (file)
@@ -35,7 +35,7 @@ public enum ValidatorErrorCode {
         return message;
     }
 
-    private ValidatorErrorCode(int val, String msg) {
+    ValidatorErrorCode(int val, String msg) {
         this.value = val;
         this.message = msg;
     }
index a15a756b7c0028ba18c9c080cf9a174a5526186c..1baa355f363ed2649391e4660c85da5af03c2a05 100644 (file)
@@ -96,7 +96,7 @@ import com.google.common.util.concurrent.CheckedFuture;
 
 public class MDSALUtil {
 
-    public enum MdsalOp {  CREATION_OP, UPDATE_OP, REMOVAL_OP };
+    public enum MdsalOp {  CREATION_OP, UPDATE_OP, REMOVAL_OP }
 
     public static final String NODE_PREFIX = "openflow";
     public static final int GROUP_WEIGHT = 0;
index cdcd47f3a65e641e3c7855430eb91fef0ee235c8..e5715ca3e42485eb6d4ca77911371cb57d58000b 100644 (file)
@@ -22,13 +22,13 @@ public interface MatchInfoBase {
      *
      * @param mapMatchBuilder the map which holds the matches.
      */
-    public void createInnerMatchBuilder(Map<Class<?>, Object> mapMatchBuilder);
+    void createInnerMatchBuilder(Map<Class<?>, Object> mapMatchBuilder);
 
     /**
      * Set the match to the match builder.
      * @param matchBuilder the matchbuilder to set the match
      * @param mapMatchBuilder the map containing the matches
      */
-    public void setMatch(MatchBuilder matchBuilder, Map<Class<?>, Object> mapMatchBuilder);
+    void setMatch(MatchBuilder matchBuilder, Map<Class<?>, Object> mapMatchBuilder);
 
 }
index 93d6a5b0e085b02a065e645428841405e857af68..8a655a405788e37dcbb6a0e95bdee06e7be9f042 100644 (file)
@@ -184,6 +184,6 @@ public final class NwConstants {
     }
 
     public enum LearnFlowModsType {
-        MATCH_FROM_FIELD, MATCH_FROM_VALUE, COPY_FROM_FIELD, COPY_FROM_VALUE, OUTPUT_TO_PORT;
+        MATCH_FROM_FIELD, MATCH_FROM_VALUE, COPY_FROM_FIELD, COPY_FROM_VALUE, OUTPUT_TO_PORT
     }
 }
index 5a9c0f23e3132a28d853bf656de20108a2b0fcd6..d5b0da5efc58d12e7b17c3ab2fcc7a78856e2f61 100644 (file)
@@ -21,7 +21,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group
 
 public interface IMdsalApiManager {
 
-    public void installFlow(FlowEntity flowEntity);
+    void installFlow(FlowEntity flowEntity);
 
     /**
      * Add a Flow to batched transaction.
@@ -32,9 +32,9 @@ public interface IMdsalApiManager {
      * @param tx
      *            batched transaction
      */
-    public void addFlowToTx(FlowEntity flowEntity, WriteTransaction tx);
+    void addFlowToTx(FlowEntity flowEntity, WriteTransaction tx);
 
-    public CheckedFuture<Void,TransactionCommitFailedException> installFlow(BigInteger dpId, Flow flowEntity);
+    CheckedFuture<Void,TransactionCommitFailedException> installFlow(BigInteger dpId, Flow flowEntity);
 
     /**
      * Add a Flow to batched transaction
@@ -47,11 +47,11 @@ public interface IMdsalApiManager {
      * @param tx
      *            batched transaction
      */
-    public void addFlowToTx(BigInteger dpId, Flow flow, WriteTransaction tx);
+    void addFlowToTx(BigInteger dpId, Flow flow, WriteTransaction tx);
 
-    public CheckedFuture<Void,TransactionCommitFailedException> removeFlow(BigInteger dpId, Flow flowEntity);
+    CheckedFuture<Void,TransactionCommitFailedException> removeFlow(BigInteger dpId, Flow flowEntity);
 
-    public CheckedFuture<Void,TransactionCommitFailedException> removeFlow(BigInteger dpId, FlowEntity flowEntity);
+    CheckedFuture<Void,TransactionCommitFailedException> removeFlow(BigInteger dpId, FlowEntity flowEntity);
 
     /**
      * Remove a Flow using batched transaction.
@@ -64,11 +64,11 @@ public interface IMdsalApiManager {
      * @param tx
      *            batched transaction
      */
-    public void removeFlowToTx(BigInteger dpId, Flow flow, WriteTransaction tx);
+    void removeFlowToTx(BigInteger dpId, Flow flow, WriteTransaction tx);
 
-    public CheckedFuture<Void,TransactionCommitFailedException> installFlow(BigInteger dpId, FlowEntity flowEntity);
+    CheckedFuture<Void,TransactionCommitFailedException> installFlow(BigInteger dpId, FlowEntity flowEntity);
 
-    public void removeFlow(FlowEntity flowEntity);
+    void removeFlow(FlowEntity flowEntity);
 
     /**
      *  Remove a Flow using batched transaction.
@@ -79,9 +79,9 @@ public interface IMdsalApiManager {
      * @param tx
      *            batched transaction
      */
-    public void removeFlowToTx(FlowEntity flowEntity, WriteTransaction tx);
+    void removeFlowToTx(FlowEntity flowEntity, WriteTransaction tx);
 
-    public void installGroup(GroupEntity groupEntity);
+    void installGroup(GroupEntity groupEntity);
 
     /**
      * Add a Group using batched transaction
@@ -92,7 +92,7 @@ public interface IMdsalApiManager {
      * @param tx
      *            batched transaction
      */
-    public void addGroupToTx(GroupEntity groupEntity, WriteTransaction tx);
+    void addGroupToTx(GroupEntity groupEntity, WriteTransaction tx);
 
     /**
      * Add a Group using batched transaction
@@ -105,11 +105,11 @@ public interface IMdsalApiManager {
      * @param tx
      *            batched transaction
      */
-    public void addGroupToTx(BigInteger dpId, Group group, WriteTransaction tx);
+    void addGroupToTx(BigInteger dpId, Group group, WriteTransaction tx);
 
-    public void modifyGroup(GroupEntity groupEntity);
+    void modifyGroup(GroupEntity groupEntity);
 
-    public void removeGroup(GroupEntity groupEntity);
+    void removeGroup(GroupEntity groupEntity);
 
     /**
      * Remove a Group using batched transaction
@@ -120,7 +120,7 @@ public interface IMdsalApiManager {
      * @param tx
      *            batched transaction
      */
-    public void removeGroupToTx(GroupEntity groupEntity, WriteTransaction tx);
+    void removeGroupToTx(GroupEntity groupEntity, WriteTransaction tx);
 
     /**
      * Remove a Group using batched transaction
@@ -133,13 +133,13 @@ public interface IMdsalApiManager {
      * @param tx
      *            batched transaction
      */
-    public void removeGroupToTx(BigInteger dpId, Group group, WriteTransaction tx);
+    void removeGroupToTx(BigInteger dpId, Group group, WriteTransaction tx);
 
-    public void sendPacketOut(BigInteger dpnId, int groupId, byte[] payload);
+    void sendPacketOut(BigInteger dpnId, int groupId, byte[] payload);
 
-    public void sendPacketOutWithActions(BigInteger dpnId, long groupId, byte[] payload, List<ActionInfo> actionInfos);
+    void sendPacketOutWithActions(BigInteger dpnId, long groupId, byte[] payload, List<ActionInfo> actionInfos);
 
-    public void sendARPPacketOutWithActions(BigInteger dpnId, byte[] payload, List<ActionInfo> action_info);
+    void sendARPPacketOutWithActions(BigInteger dpnId, byte[] payload, List<ActionInfo> action_info);
 
     /**
      * API to remove the flow on Data Plane Node synchronously. It internally waits for
@@ -148,8 +148,8 @@ public interface IMdsalApiManager {
      * @param flowEntity
      * @param delayTime
      */
-    public void syncRemoveFlow(FlowEntity flowEntity, long delayTime);
-    public void syncInstallFlow(FlowEntity flowEntity, long delayTime);
+    void syncRemoveFlow(FlowEntity flowEntity, long delayTime);
+    void syncInstallFlow(FlowEntity flowEntity, long delayTime);
 
     /**
      * API to install the Group on Data Plane Node synchronously. It internally waits for
@@ -158,9 +158,9 @@ public interface IMdsalApiManager {
      * @param groupEntity
      * @param delayTime
      */
-    public void syncInstallGroup(GroupEntity groupEntity, long delayTime);
+    void syncInstallGroup(GroupEntity groupEntity, long delayTime);
 
-    public void syncInstallGroup(BigInteger dpId, Group group, long delayTime);
+    void syncInstallGroup(BigInteger dpId, Group group, long delayTime);
 
     /**
      * API to remove the Group on Data Plane Node synchronously. It internally waits for
@@ -168,7 +168,7 @@ public interface IMdsalApiManager {
      *
      * @param groupEntity
      */
-    public void syncRemoveGroup(GroupEntity groupEntity);
+    void syncRemoveGroup(GroupEntity groupEntity);
 
-    public void syncRemoveGroup(BigInteger dpId, Group groupEntity);
+    void syncRemoveGroup(BigInteger dpId, Group groupEntity);
 }
index 28a42dd210140a6f16f09e3403bf1fd9bbc1a851..71f030207d881d7fe8e540bc203a829f84513f68 100644 (file)
@@ -178,7 +178,7 @@ public enum IPProtocols {
     private String protocolName;
     private int protocolNumber;
 
-    private IPProtocols(String name, int number) {
+    IPProtocols(String name, int number) {
         protocolName = name;
         protocolNumber = number;
     }
index e7f36981a9952d5d1713af3b612bebfbbbe69938..a111abd01a3fdf0d77491b5a6faa42f466860a54 100644 (file)
@@ -10,9 +10,9 @@ package org.opendaylight.genius.utils.batching;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 public interface ActionableResource {
-    static final short CREATE = 1;
-    static final short UPDATE = 2;
-    static final short DELETE = 3;
+    short CREATE = 1;
+    short UPDATE = 2;
+    short DELETE = 3;
 
     InstanceIdentifier getInstanceIdentifier();
     void setInstanceIdentifier(InstanceIdentifier identifier);
index eb037259c31b38c124cbf3178f809dcd2c1cc95d..7eb5a995423a9ca9207a1026c2103c1ec199b074 100644 (file)
@@ -10,9 +10,9 @@ package org.opendaylight.genius.utils.batching;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 public interface SubTransaction {
-    static final short CREATE = 1;
-    static final short UPDATE = 2;
-    static final short DELETE = 3;
+    short CREATE = 1;
+    short UPDATE = 2;
+    short DELETE = 3;
 
     InstanceIdentifier getInstanceIdentifier();
     void setInstanceIdentifier(InstanceIdentifier identifier);
index de4bc81d5f32edbfad79ac6ae4595aaa0d4482ec..2535bcf89886382c8568bf73d0cd28093381b8fc 100644 (file)
@@ -39,8 +39,8 @@ public abstract class NodeEvent extends DebugEvent {
         return nodeId != null ? nodeId.hashCode() : 0;
     }
 
-    static enum NodeStatus {
-        Connected,Disconnected;
+    enum NodeStatus {
+        Connected,Disconnected
     }
 
     public static class NodeConnectedEvent extends NodeEvent {
index d3d6879da0457cbaa99b169cd39065e85da24fe1..1c2bc18ac28a239311bb30606ae5a121952a0e59 100644 (file)
@@ -178,7 +178,7 @@ public class MDSALUtilProvider implements BindingAwareConsumer, IMdsalApiManager
 
     @Override
     public void addGroupToTx(BigInteger dpId, Group group, WriteTransaction tx) {
-        mdSalMgr.writeGroup(dpId, group, tx);;
+        mdSalMgr.writeGroup(dpId, group, tx);
     }
 
     @Override