Remove "public" to follow our convention
Change-Id: Ic5fa8744cbcb4c704780c8467ae0f31fce3327ce
diff --git a/apps/metrics/src/main/java/org/onosproject/metrics/intent/IntentMetricsService.java b/apps/metrics/src/main/java/org/onosproject/metrics/intent/IntentMetricsService.java
index dd57a6b..aa03e39 100644
--- a/apps/metrics/src/main/java/org/onosproject/metrics/intent/IntentMetricsService.java
+++ b/apps/metrics/src/main/java/org/onosproject/metrics/intent/IntentMetricsService.java
@@ -28,47 +28,47 @@
*
* @return the last saved intent events
*/
- public List<IntentEvent> getEvents();
+ List<IntentEvent> getEvents();
/**
* Gets the Event Metric for the intent INSTALL_REQ events.
*
* @return the Event Metric for the intent INSTALL_REQ events
*/
- public EventMetric intentSubmittedEventMetric();
+ EventMetric intentSubmittedEventMetric();
/**
* Gets the Event Metric for the intent INSTALLED events.
*
* @return the Event Metric for the intent INSTALLED events
*/
- public EventMetric intentInstalledEventMetric();
+ EventMetric intentInstalledEventMetric();
/**
* Gets the Event Metric for the intent FAILED events.
*
* @return the Event Metric for the intent FAILED events
*/
- public EventMetric intentFailedEventMetric();
+ EventMetric intentFailedEventMetric();
/**
* Gets the Event Metric for the intent WITHDRAW_REQ events.
*
* @return the Event Metric for the intent WITHDRAW_REQ events
*/
- public EventMetric intentWithdrawRequestedEventMetric();
+ EventMetric intentWithdrawRequestedEventMetric();
/**
* Gets the Event Metric for the intent WITHDRAWN events.
*
* @return the Event Metric for the intent WITHDRAWN events
*/
- public EventMetric intentWithdrawnEventMetric();
+ EventMetric intentWithdrawnEventMetric();
/**
* Gets the Event Metric for the intent PURGED events.
*
* @return the Event Metric for the intent PURGED events
*/
- public EventMetric intentPurgedEventMetric();
+ EventMetric intentPurgedEventMetric();
}
diff --git a/apps/metrics/src/main/java/org/onosproject/metrics/topology/TopologyMetricsService.java b/apps/metrics/src/main/java/org/onosproject/metrics/topology/TopologyMetricsService.java
index 70166f8..47e46b2 100644
--- a/apps/metrics/src/main/java/org/onosproject/metrics/topology/TopologyMetricsService.java
+++ b/apps/metrics/src/main/java/org/onosproject/metrics/topology/TopologyMetricsService.java
@@ -28,40 +28,40 @@
*
* @return the last saved topology events
*/
- public List<Event> getEvents();
+ List<Event> getEvents();
/**
* Gets the Event Metric for the Device Events.
*
* @return the Event Metric for the Device Events
*/
- public EventMetric topologyDeviceEventMetric();
+ EventMetric topologyDeviceEventMetric();
/**
* Gets the Event Metric for the Host Events.
*
* @return the Event Metric for the Host Events
*/
- public EventMetric topologyHostEventMetric();
+ EventMetric topologyHostEventMetric();
/**
* Gets the Event Metric for the Link Events.
*
* @return the Event Metric for the Link Events
*/
- public EventMetric topologyLinkEventMetric();
+ EventMetric topologyLinkEventMetric();
/**
* Gets the Event Metric for the Topology Graph Events.
*
* @return the Event Metric for the Topology Graph Events
*/
- public EventMetric topologyGraphEventMetric();
+ EventMetric topologyGraphEventMetric();
/**
* Gets the Event Metric for the Topology Graph Reasons Events.
*
* @return the Event Metric for the Topology Graph Reasons Events
*/
- public EventMetric topologyGraphReasonsEventMetric();
+ EventMetric topologyGraphReasonsEventMetric();
}
diff --git a/apps/routing-api/src/main/java/org/onosproject/routing/RouteListener.java b/apps/routing-api/src/main/java/org/onosproject/routing/RouteListener.java
index f1a3d2b..8575216 100644
--- a/apps/routing-api/src/main/java/org/onosproject/routing/RouteListener.java
+++ b/apps/routing-api/src/main/java/org/onosproject/routing/RouteListener.java
@@ -26,5 +26,5 @@
*
* @param routeUpdates the collection with updated route information
*/
- public void update(Collection<RouteUpdate> routeUpdates);
+ void update(Collection<RouteUpdate> routeUpdates);
}
diff --git a/apps/routing-api/src/main/java/org/onosproject/routing/RoutingService.java b/apps/routing-api/src/main/java/org/onosproject/routing/RoutingService.java
index 4356984..7774082 100644
--- a/apps/routing-api/src/main/java/org/onosproject/routing/RoutingService.java
+++ b/apps/routing-api/src/main/java/org/onosproject/routing/RoutingService.java
@@ -29,7 +29,7 @@
/**
* Specifies the type of an IP address or an IP prefix location.
*/
- public static enum LocationType {
+ static enum LocationType {
/**
* The location of an IP address or an IP prefix is in local SDN network.
*/
@@ -50,7 +50,7 @@
* We classify traffic by the first packet of each traffic.
* </p>
*/
- public enum TrafficType {
+ enum TrafficType {
/**
* Traffic from a host located in local SDN network wants to
* communicate with destination host located in Internet (outside
@@ -86,14 +86,14 @@
/**
* Starts the routing service.
*/
- public void start();
+ void start();
/**
* Adds FIB listener.
*
* @param fibListener listener to send FIB updates to
*/
- public void addFibListener(FibListener fibListener);
+ void addFibListener(FibListener fibListener);
/**
* Adds intent creation and submission listener.
@@ -101,27 +101,27 @@
* @param intentRequestListener listener to send intent creation and
* submission request to
*/
- public void addIntentRequestListener(IntentRequestListener
+ void addIntentRequestListener(IntentRequestListener
intentRequestListener);
/**
* Stops the routing service.
*/
- public void stop();
+ void stop();
/**
* Gets all IPv4 routes known to SDN-IP.
*
* @return the SDN-IP IPv4 routes
*/
- public Collection<RouteEntry> getRoutes4();
+ Collection<RouteEntry> getRoutes4();
/**
* Gets all IPv6 routes known to SDN-IP.
*
* @return the SDN-IP IPv6 routes
*/
- public Collection<RouteEntry> getRoutes6();
+ Collection<RouteEntry> getRoutes6();
/**
* Evaluates the location of an IP address and returns the location type.
@@ -129,7 +129,7 @@
* @param ipAddress the IP address to evaluate
* @return the IP address location type
*/
- public LocationType getLocationType(IpAddress ipAddress);
+ LocationType getLocationType(IpAddress ipAddress);
/**
* Finds out the route entry which has the longest matchable IP prefix.
@@ -138,7 +138,7 @@
* @return a route entry which has the longest matchable IP prefix if
* found, otherwise null
*/
- public RouteEntry getLongestMatchableRouteEntry(IpAddress ipAddress);
+ RouteEntry getLongestMatchableRouteEntry(IpAddress ipAddress);
/**
* Finds out the egress connect point where to emit the first packet
@@ -147,7 +147,7 @@
* @param dstIpAddress the destination IP address
* @return the egress connect point if found, otherwise null
*/
- public ConnectPoint getEgressConnectPoint(IpAddress dstIpAddress);
+ ConnectPoint getEgressConnectPoint(IpAddress dstIpAddress);
/**
* Routes packet reactively.
@@ -157,7 +157,7 @@
* @param srcConnectPoint the connect point where a packet comes from
* @param srcMacAddress the source MAC address of a packet
*/
- public void packetReactiveProcessor(IpAddress dstIpAddress,
+ void packetReactiveProcessor(IpAddress dstIpAddress,
IpAddress srcIpAddress,
ConnectPoint srcConnectPoint,
MacAddress srcMacAddress);
diff --git a/apps/routing-api/src/main/java/org/onosproject/routing/config/RoutingConfigurationService.java b/apps/routing-api/src/main/java/org/onosproject/routing/config/RoutingConfigurationService.java
index 4ed9e2c..0afc94b 100644
--- a/apps/routing-api/src/main/java/org/onosproject/routing/config/RoutingConfigurationService.java
+++ b/apps/routing-api/src/main/java/org/onosproject/routing/config/RoutingConfigurationService.java
@@ -33,21 +33,21 @@
*
* @return the map of BGP speaker names to BGP speaker objects
*/
- public Map<String, BgpSpeaker> getBgpSpeakers();
+ Map<String, BgpSpeaker> getBgpSpeakers();
/**
* Gets the list of configured BGP peers.
*
* @return the map from peer IP address to BgpPeer object
*/
- public Map<IpAddress, BgpPeer> getBgpPeers();
+ Map<IpAddress, BgpPeer> getBgpPeers();
/**
* Gets the MAC address configured for virtual gateway in SDN network.
*
* @return the MAC address of virtual gateway
*/
- public MacAddress getVirtualGatewayMacAddress();
+ MacAddress getVirtualGatewayMacAddress();
/**
* Evaluates whether an IP address is a virtual gateway IP address.
@@ -55,7 +55,7 @@
* @param ipAddress the IP address to evaluate
* @return true if the IP address is a virtual gateway address, otherwise false
*/
- public boolean isVirtualGatewayIpAddress(IpAddress ipAddress);
+ boolean isVirtualGatewayIpAddress(IpAddress ipAddress);
/**
* Evaluates whether an IP address belongs to local SDN network.
@@ -63,7 +63,7 @@
* @param ipAddress the IP address to evaluate
* @return true if the IP address belongs to local SDN network, otherwise false
*/
- public boolean isIpAddressLocal(IpAddress ipAddress);
+ boolean isIpAddressLocal(IpAddress ipAddress);
/**
* Evaluates whether an IP prefix belongs to local SDN network.
@@ -71,7 +71,7 @@
* @param ipPrefix the IP prefix to evaluate
* @return true if the IP prefix belongs to local SDN network, otherwise false
*/
- public boolean isIpPrefixLocal(IpPrefix ipPrefix);
+ boolean isIpPrefixLocal(IpPrefix ipPrefix);
/**
* Retrieves the entire set of interfaces in the network.
diff --git a/apps/routing/src/main/java/org/onosproject/routing/bgp/BgpInfoService.java b/apps/routing/src/main/java/org/onosproject/routing/bgp/BgpInfoService.java
index d7914e6..ee8fef1 100644
--- a/apps/routing/src/main/java/org/onosproject/routing/bgp/BgpInfoService.java
+++ b/apps/routing/src/main/java/org/onosproject/routing/bgp/BgpInfoService.java
@@ -27,19 +27,19 @@
*
* @return the BGP sessions
*/
- public Collection<BgpSession> getBgpSessions();
+ Collection<BgpSession> getBgpSessions();
/**
* Gets the selected IPv4 BGP routes among all BGP sessions.
*
* @return the selected IPv4 BGP routes among all BGP sessions
*/
- public Collection<BgpRouteEntry> getBgpRoutes4();
+ Collection<BgpRouteEntry> getBgpRoutes4();
/**
* Gets the selected IPv6 BGP routes among all BGP sessions.
*
* @return the selected IPv6 BGP routes among all BGP sessions
*/
- public Collection<BgpRouteEntry> getBgpRoutes6();
+ Collection<BgpRouteEntry> getBgpRoutes6();
}
diff --git a/apps/sdnip/src/main/java/org/onosproject/sdnip/SdnIpService.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/SdnIpService.java
index 9eeee1d..d26d306 100644
--- a/apps/sdnip/src/main/java/org/onosproject/sdnip/SdnIpService.java
+++ b/apps/sdnip/src/main/java/org/onosproject/sdnip/SdnIpService.java
@@ -26,6 +26,6 @@
*
* @param isPrimary true if the instance is primary, false if it is not
*/
- public void modifyPrimary(boolean isPrimary);
+ void modifyPrimary(boolean isPrimary);
}
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/NetworkConfigService.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/NetworkConfigService.java
index 722d50c..9c4ad6e 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/NetworkConfigService.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/NetworkConfigService.java
@@ -23,7 +23,7 @@
* Suggests the action to be taken by the caller given the configuration
* associated with the queried network-object (eg. switch, link etc.).
*/
- public enum NetworkConfigState {
+ enum NetworkConfigState {
/**
* Associated network object has been configured to not be allowed in
* the network.
@@ -49,7 +49,7 @@
* parameters to the caller, in response to a query for the configuration
* associated with a switch.
*/
- public class SwitchConfigStatus {
+ class SwitchConfigStatus {
private NetworkConfigState configState;
private SwitchConfig switchConfig;
private String msg;
@@ -107,7 +107,7 @@
* parameters to the caller, in response to a query for the configuration
* associated with a link.
*/
- public class LinkConfigStatus {
+ class LinkConfigStatus {
private NetworkConfigState configState;
private LinkConfig linkConfig;
private String msg;
@@ -169,7 +169,7 @@
* @param dpid device id of the switch to be queried
* @return SwitchConfigStatus with outcome of check and associated config.
*/
- public SwitchConfigStatus checkSwitchConfig(DeviceId dpid);
+ SwitchConfigStatus checkSwitchConfig(DeviceId dpid);
/**
* Reserved for future use.
@@ -193,7 +193,7 @@
* @param linkTuple unidirectional link to be queried
* @return LinkConfigStatus with outcome of check and associated config.
*/
- public LinkConfigStatus checkLinkConfig(Link linkTuple);
+ LinkConfigStatus checkLinkConfig(Link linkTuple);
/**
* Retrieves a list of switches that have been configured, and have been
@@ -212,7 +212,7 @@
*
* @return a non-null List of SwitchConfig which may be empty
*/
- public List<SwitchConfig> getConfiguredAllowedSwitches();
+ List<SwitchConfig> getConfiguredAllowedSwitches();
/**
* Reserved for future use.
@@ -237,7 +237,7 @@
*
* @return a non-null List of LinkConfig which may be empty
*/
- public List<LinkConfig> getConfiguredAllowedLinks();
+ List<LinkConfig> getConfiguredAllowedLinks();
/**
* Retrieves the Dpid associated with a 'name' for a configured switch
@@ -248,6 +248,6 @@
* @return the Dpid corresponding to a given 'name', or null if no
* configured switch was found for the given 'name'.
*/
- public DeviceId getDpidForName(String name);
+ DeviceId getDpidForName(String name);
}
diff --git a/apps/virtualbng/src/main/java/org/onosproject/virtualbng/VbngConfigurationService.java b/apps/virtualbng/src/main/java/org/onosproject/virtualbng/VbngConfigurationService.java
index 382f522..ac498dc 100644
--- a/apps/virtualbng/src/main/java/org/onosproject/virtualbng/VbngConfigurationService.java
+++ b/apps/virtualbng/src/main/java/org/onosproject/virtualbng/VbngConfigurationService.java
@@ -28,14 +28,14 @@
*
* @return the IP address of next hop
*/
- public IpAddress getNextHopIpAddress();
+ IpAddress getNextHopIpAddress();
/**
* Gets the MAC address configured for all the public IP addresses.
*
* @return the MAC address
*/
- public MacAddress getPublicFacingMac();
+ MacAddress getPublicFacingMac();
/**
* Evaluates whether an IP address is an assigned public IP address.
@@ -44,7 +44,7 @@
* @return true if the input IP address is an assigned public IP address,
* otherwise false
*/
- public boolean isAssignedPublicIpAddress(IpAddress ipAddress);
+ boolean isAssignedPublicIpAddress(IpAddress ipAddress);
/**
* Gets an available public IP address from local public IP prefixes.
@@ -52,7 +52,7 @@
* @param privateIpAddress a private IP address
* @return an available public IP address if it exists, otherwise null
*/
- public IpAddress getAvailablePublicIpAddress(IpAddress privateIpAddress);
+ IpAddress getAvailablePublicIpAddress(IpAddress privateIpAddress);
/**
* Gets the public IP address already assigned for a private IP address.
@@ -60,5 +60,5 @@
* @param privateIpAddress a private IP address
* @return the assigned public IP address if it exists, otherwise null
*/
- public IpAddress getAssignedPublicIpAddress(IpAddress privateIpAddress);
+ IpAddress getAssignedPublicIpAddress(IpAddress privateIpAddress);
}
diff --git a/apps/virtualbng/src/main/java/org/onosproject/virtualbng/VbngService.java b/apps/virtualbng/src/main/java/org/onosproject/virtualbng/VbngService.java
index 26e6e10..4ac7606 100644
--- a/apps/virtualbng/src/main/java/org/onosproject/virtualbng/VbngService.java
+++ b/apps/virtualbng/src/main/java/org/onosproject/virtualbng/VbngService.java
@@ -34,6 +34,6 @@
* @return the public address if a virtual BGN is successfully created,
* otherwise return null
*/
- public IpAddress createVbng(IpAddress privateIpAddress);
+ IpAddress createVbng(IpAddress privateIpAddress);
}