Jian Li
Committed by Gerrit Code Review

Fix javadoc warnings

Change-Id: I3de24a04593f47c786f698f5ee1669b3d2f2fdfc
Showing 28 changed files with 53 additions and 13 deletions
...@@ -53,6 +53,7 @@ public final class CordService { ...@@ -53,6 +53,7 @@ public final class CordService {
53 * Default constructor. 53 * Default constructor.
54 * 54 *
55 * @param vNet OpenStack network 55 * @param vNet OpenStack network
56 + * @param subnet OpenStack subnet
56 * @param hosts host and tunnel ip map 57 * @param hosts host and tunnel ip map
57 * @param tenantServices list of tenant service ids 58 * @param tenantServices list of tenant service ids
58 */ 59 */
......
...@@ -125,6 +125,8 @@ public class CordVtnRuleInstaller { ...@@ -125,6 +125,8 @@ public class CordVtnRuleInstaller {
125 * @param flowRuleService flow rule service 125 * @param flowRuleService flow rule service
126 * @param deviceService device service 126 * @param deviceService device service
127 * @param driverService driver service 127 * @param driverService driver service
128 + * @param groupService group service
129 + * @param mastershipService mastership service
128 * @param tunnelType tunnel type 130 * @param tunnelType tunnel type
129 */ 131 */
130 public CordVtnRuleInstaller(ApplicationId appId, 132 public CordVtnRuleInstaller(ApplicationId appId,
......
...@@ -31,6 +31,7 @@ public interface ControlPlaneMonitorService { ...@@ -31,6 +31,7 @@ public interface ControlPlaneMonitorService {
31 * 31 *
32 * @param controlMetric control plane metric (e.g., control message rate, cpu, memory, etc.) 32 * @param controlMetric control plane metric (e.g., control message rate, cpu, memory, etc.)
33 * @param updateInterval value update interval (time unit will be in minute) 33 * @param updateInterval value update interval (time unit will be in minute)
34 + * @param deviceId {@link org.onosproject.net.DeviceId}
34 */ 35 */
35 void updateMetric(ControlMetric controlMetric, int updateInterval, Optional<DeviceId> deviceId); 36 void updateMetric(ControlMetric controlMetric, int updateInterval, Optional<DeviceId> deviceId);
36 37
......
...@@ -45,8 +45,9 @@ public class MetricsAggregator { ...@@ -45,8 +45,9 @@ public class MetricsAggregator {
45 * Instantiates the metrics service 45 * Instantiates the metrics service
46 * Initializes all the general metrics for that object 46 * Initializes all the general metrics for that object
47 * 47 *
48 - * @param type Control metric type 48 + * @param metricsService MetricsService reference
49 - * @param deviceId DeviceId 49 + * @param type Control metric type
50 + * @param deviceId DeviceId
50 */ 51 */
51 MetricsAggregator(MetricsService metricsService, ControlMetricType type, Optional<DeviceId> deviceId) { 52 MetricsAggregator(MetricsService metricsService, ControlMetricType type, Optional<DeviceId> deviceId) {
52 String primitiveName = type.toString(); 53 String primitiveName = type.toString();
......
...@@ -116,10 +116,10 @@ public interface DhcpStore { ...@@ -116,10 +116,10 @@ public interface DhcpStore {
116 Iterable<Ip4Address> getAvailableIPs(); 116 Iterable<Ip4Address> getAvailableIPs();
117 117
118 /** 118 /**
119 + * Returns IpAssignment from map.
119 * 120 *
120 - * 121 + * @param hostId host identification
121 - * @param hostId 122 + * @return IpAssignment
122 - * @return
123 */ 123 */
124 IpAssignment getIpAssignmentFromAllocationMap(HostId hostId); 124 IpAssignment getIpAssignmentFromAllocationMap(HostId hostId);
125 } 125 }
......
...@@ -36,6 +36,7 @@ public class DefaultIpLink extends AbstractModel implements IpLink { ...@@ -36,6 +36,7 @@ public class DefaultIpLink extends AbstractModel implements IpLink {
36 /** 36 /**
37 * Constructor to initialize its parameters. 37 * Constructor to initialize its parameters.
38 * 38 *
39 + * @param providerId provider identification
39 * @param src link source termination point 40 * @param src link source termination point
40 * @param dst link destination termination point 41 * @param dst link destination termination point
41 * @param linkIdentifier provides link identifier details 42 * @param linkIdentifier provides link identifier details
......
...@@ -34,6 +34,7 @@ public class IpDeviceIdentifier { ...@@ -34,6 +34,7 @@ public class IpDeviceIdentifier {
34 /** 34 /**
35 * Constructor to initialize parameters. 35 * Constructor to initialize parameters.
36 * 36 *
37 + * @param routeDish routing distinguisher instance
37 * @param routeInstance routing protocol instance 38 * @param routeInstance routing protocol instance
38 * @param asNum AS number 39 * @param asNum AS number
39 * @param domainIdentifier BGP-LS domain 40 * @param domainIdentifier BGP-LS domain
......
...@@ -29,7 +29,8 @@ public class RouterId implements RouteIdentifier { ...@@ -29,7 +29,8 @@ public class RouterId implements RouteIdentifier {
29 /** 29 /**
30 * Constructor to initialize its parameters. 30 * Constructor to initialize its parameters.
31 * 31 *
32 - * @param routerId Router ID of designated router 32 + * @param routerId Router ID of designated router
33 + * @param type protocol type
33 */ 34 */
34 public RouterId(int routerId, ProtocolType type) { 35 public RouterId(int routerId, ProtocolType type) {
35 this.routerId = routerId; 36 this.routerId = routerId;
......
...@@ -43,6 +43,7 @@ public class AccessDeviceData { ...@@ -43,6 +43,7 @@ public class AccessDeviceData {
43 * @param deviceId access device ID 43 * @param deviceId access device ID
44 * @param uplink uplink port number 44 * @param uplink uplink port number
45 * @param vlan device VLAN ID 45 * @param vlan device VLAN ID
46 + * @param defaultVlan default device VLAN ID
46 */ 47 */
47 public AccessDeviceData(DeviceId deviceId, PortNumber uplink, VlanId vlan, 48 public AccessDeviceData(DeviceId deviceId, PortNumber uplink, VlanId vlan,
48 Optional<VlanId> defaultVlan) { 49 Optional<VlanId> defaultVlan) {
......
...@@ -40,6 +40,9 @@ public class OltWebResource extends AbstractWebResource { ...@@ -40,6 +40,9 @@ public class OltWebResource extends AbstractWebResource {
40 /** 40 /**
41 * Provision a subscriber. 41 * Provision a subscriber.
42 * 42 *
43 + * @param device device id
44 + * @param port port number
45 + * @param vlan vlan id
43 * @return 200 OK 46 * @return 200 OK
44 */ 47 */
45 @POST 48 @POST
...@@ -60,6 +63,10 @@ public class OltWebResource extends AbstractWebResource { ...@@ -60,6 +63,10 @@ public class OltWebResource extends AbstractWebResource {
60 63
61 /** 64 /**
62 * Remove the provisioning for a subscriber. 65 * Remove the provisioning for a subscriber.
66 + *
67 + * @param device device id
68 + * @param port port number
69 + * @return 200 OK
63 */ 70 */
64 @DELETE 71 @DELETE
65 @Produces(MediaType.APPLICATION_JSON) 72 @Produces(MediaType.APPLICATION_JSON)
......
...@@ -34,13 +34,14 @@ public interface OpenstackSwitchingService { ...@@ -34,13 +34,14 @@ public interface OpenstackSwitchingService {
34 /** 34 /**
35 * Removes flow rules corresponding to the port removed by Openstack. 35 * Removes flow rules corresponding to the port removed by Openstack.
36 * 36 *
37 + * @param uuid UUID
37 */ 38 */
38 void deletePort(String uuid); 39 void deletePort(String uuid);
39 40
40 /** 41 /**
41 * Updates flow rules corresponding to the port information updated by Openstack. 42 * Updates flow rules corresponding to the port information updated by Openstack.
42 * 43 *
43 - * @param openstackPort 44 + * @param openstackPort OpenStack port
44 */ 45 */
45 void updatePort(OpenstackPort openstackPort); 46 void updatePort(OpenstackPort openstackPort);
46 47
......
...@@ -72,6 +72,7 @@ public class OpenstackSwitchingRulePopulator { ...@@ -72,6 +72,7 @@ public class OpenstackSwitchingRulePopulator {
72 * @param appId application id 72 * @param appId application id
73 * @param flowObjectiveService FlowObjectiveService reference 73 * @param flowObjectiveService FlowObjectiveService reference
74 * @param deviceService DeviceService reference 74 * @param deviceService DeviceService reference
75 + * @param restHandler OpenstackRestHandler reference
75 * @param driverService DriverService reference 76 * @param driverService DriverService reference
76 */ 77 */
77 public OpenstackSwitchingRulePopulator(ApplicationId appId, 78 public OpenstackSwitchingRulePopulator(ApplicationId appId,
......
...@@ -94,7 +94,8 @@ public class PIMInterface { ...@@ -94,7 +94,8 @@ public class PIMInterface {
94 /** 94 /**
95 * Set the ONOS Interface, it will override a previous value. 95 * Set the ONOS Interface, it will override a previous value.
96 * 96 *
97 - * @param intf ONOS Interface. 97 + * @param intf ONOS Interface
98 + * @return PIM interface instance
98 */ 99 */
99 public PIMInterface setInterface(Interface intf) { 100 public PIMInterface setInterface(Interface intf) {
100 onosInterface = intf; 101 onosInterface = intf;
......
...@@ -57,6 +57,7 @@ public class PIMNeighbor { ...@@ -57,6 +57,7 @@ public class PIMNeighbor {
57 * Construct a new PIM Neighbor. 57 * Construct a new PIM Neighbor.
58 * 58 *
59 * @param ipAddr the IP Address of our new neighbor 59 * @param ipAddr the IP Address of our new neighbor
60 + * @param opts option map
60 */ 61 */
61 public PIMNeighbor(IpAddress ipAddr, Map<Short, PIMHelloOption> opts) { 62 public PIMNeighbor(IpAddress ipAddr, Map<Short, PIMHelloOption> opts) {
62 this.ipAddr = ipAddr; 63 this.ipAddr = ipAddr;
...@@ -67,6 +68,7 @@ public class PIMNeighbor { ...@@ -67,6 +68,7 @@ public class PIMNeighbor {
67 * Construct a new PIM neighbor. 68 * Construct a new PIM neighbor.
68 * 69 *
69 * @param ipAddr the neighbors IP addr 70 * @param ipAddr the neighbors IP addr
71 + * @param macAddr MAC address
70 */ 72 */
71 public PIMNeighbor(IpAddress ipAddr, MacAddress macAddr) { 73 public PIMNeighbor(IpAddress ipAddr, MacAddress macAddr) {
72 this.ipAddr = ipAddr; 74 this.ipAddr = ipAddr;
......
...@@ -40,6 +40,7 @@ public class PartitionId implements Comparable<PartitionId> { ...@@ -40,6 +40,7 @@ public class PartitionId implements Comparable<PartitionId> {
40 * Creates a partition identifier from an integer. 40 * Creates a partition identifier from an integer.
41 * 41 *
42 * @param id input integer 42 * @param id input integer
43 + * @return partition identification
43 */ 44 */
44 public static PartitionId from(int id) { 45 public static PartitionId from(int id) {
45 return new PartitionId(id); 46 return new PartitionId(id);
......
...@@ -171,9 +171,10 @@ public interface NetworkConfigService ...@@ -171,9 +171,10 @@ public interface NetworkConfigService
171 * Clears any configuration for the specified subject and configuration 171 * Clears any configuration for the specified subject and configuration
172 * key. If one does not exist, this call has no effect. 172 * key. If one does not exist, this call has no effect.
173 * 173 *
174 - * @param subject configuration subject 174 + * @param subjectClassKey subject class key
175 - * @param configKey configuration key 175 + * @param subject configuration subject
176 - * @param <S> type of subject 176 + * @param configKey configuration key
177 + * @param <S> type of subject
177 */ 178 */
178 <S> void removeConfig(String subjectClassKey, S subject, String configKey); 179 <S> void removeConfig(String subjectClassKey, S subject, String configKey);
179 } 180 }
......
...@@ -34,6 +34,7 @@ public class ExtensionCriterion implements Criterion { ...@@ -34,6 +34,7 @@ public class ExtensionCriterion implements Criterion {
34 * Constructor. 34 * Constructor.
35 * 35 *
36 * @param extensionSelector extension selector 36 * @param extensionSelector extension selector
37 + * @param deviceId device identification
37 */ 38 */
38 public ExtensionCriterion(ExtensionSelector extensionSelector, DeviceId deviceId) { 39 public ExtensionCriterion(ExtensionSelector extensionSelector, DeviceId deviceId) {
39 this.extensionSelector = extensionSelector; 40 this.extensionSelector = extensionSelector;
......
...@@ -19,6 +19,8 @@ public class HopCountLinkWeight implements LinkWeight { ...@@ -19,6 +19,8 @@ public class HopCountLinkWeight implements LinkWeight {
19 19
20 /** 20 /**
21 * Creates a new hop-count weight with the specified cost of indirect links. 21 * Creates a new hop-count weight with the specified cost of indirect links.
22 + *
23 + * @param indirectLinkCost indirect link cost
22 */ 24 */
23 public HopCountLinkWeight(int indirectLinkCost) { 25 public HopCountLinkWeight(int indirectLinkCost) {
24 this.indirectLinkCost = indirectLinkCost; 26 this.indirectLinkCost = indirectLinkCost;
......
...@@ -40,6 +40,7 @@ public interface AsyncDistributedSet<E> extends DistributedPrimitive { ...@@ -40,6 +40,7 @@ public interface AsyncDistributedSet<E> extends DistributedPrimitive {
40 * the set is updated. 40 * the set is updated.
41 * 41 *
42 * @param listener listener to notify about set update events 42 * @param listener listener to notify about set update events
43 + * @return CompletableFuture that is completed when the operation completes
43 */ 44 */
44 CompletableFuture<Void> addListener(SetEventListener<E> listener); 45 CompletableFuture<Void> addListener(SetEventListener<E> listener);
45 46
...@@ -79,6 +80,7 @@ public interface AsyncDistributedSet<E> extends DistributedPrimitive { ...@@ -79,6 +80,7 @@ public interface AsyncDistributedSet<E> extends DistributedPrimitive {
79 80
80 /** 81 /**
81 * Removes all elements from the set. 82 * Removes all elements from the set.
83 + * @return CompletableFuture that is completed when the operation completes
82 */ 84 */
83 CompletableFuture<Void> clear(); 85 CompletableFuture<Void> clear();
84 86
......
...@@ -71,6 +71,7 @@ public interface DistributedPrimitive { ...@@ -71,6 +71,7 @@ public interface DistributedPrimitive {
71 71
72 /** 72 /**
73 * Returns the application owning this primitive. 73 * Returns the application owning this primitive.
74 + * @return application id
74 */ 75 */
75 default ApplicationId applicationId() { 76 default ApplicationId applicationId() {
76 return null; 77 return null;
......
...@@ -62,7 +62,8 @@ final class ResourceDeviceListener implements DeviceListener { ...@@ -62,7 +62,8 @@ final class ResourceDeviceListener implements DeviceListener {
62 * Creates an instance with the specified ResourceAdminService and ExecutorService. 62 * Creates an instance with the specified ResourceAdminService and ExecutorService.
63 * 63 *
64 * @param adminService instance invoked to register resources 64 * @param adminService instance invoked to register resources
65 - * @param deviceService {@link DeviceService} to be used. 65 + * @param deviceService {@link DeviceService} to be used
66 + * @param driverService {@link DriverService} to be used
66 * @param executor executor used for processing resource registration 67 * @param executor executor used for processing resource registration
67 */ 68 */
68 ResourceDeviceListener(ResourceAdminService adminService, DeviceService deviceService, DriverService driverService, 69 ResourceDeviceListener(ResourceAdminService adminService, DeviceService deviceService, DriverService driverService,
......
...@@ -61,6 +61,7 @@ public class EventuallyConsistentMapBuilderImpl<K, V> ...@@ -61,6 +61,7 @@ public class EventuallyConsistentMapBuilderImpl<K, V>
61 * 61 *
62 * @param clusterService cluster service 62 * @param clusterService cluster service
63 * @param clusterCommunicator cluster communication service 63 * @param clusterCommunicator cluster communication service
64 + * @param persistenceService persistence service
64 */ 65 */
65 public EventuallyConsistentMapBuilderImpl(ClusterService clusterService, 66 public EventuallyConsistentMapBuilderImpl(ClusterService clusterService,
66 ClusterCommunicationService clusterCommunicator, 67 ClusterCommunicationService clusterCommunicator,
......
...@@ -150,6 +150,7 @@ public class EventuallyConsistentMapImpl<K, V> ...@@ -150,6 +150,7 @@ public class EventuallyConsistentMapImpl<K, V>
150 * @param antiEntropyTimeUnit time unit for anti-entropy period 150 * @param antiEntropyTimeUnit time unit for anti-entropy period
151 * @param convergeFaster make anti-entropy try to converge faster 151 * @param convergeFaster make anti-entropy try to converge faster
152 * @param persistent persist data to disk 152 * @param persistent persist data to disk
153 + * @param persistenceService persistence service
153 */ 154 */
154 EventuallyConsistentMapImpl(String mapName, 155 EventuallyConsistentMapImpl(String mapName,
155 ClusterService clusterService, 156 ClusterService clusterService,
......
...@@ -35,6 +35,7 @@ public interface InterfaceAdminService { ...@@ -35,6 +35,7 @@ public interface InterfaceAdminService {
35 * 35 *
36 * @param connectPoint connect point of the interface 36 * @param connectPoint connect point of the interface
37 * @param name name of the interface 37 * @param name name of the interface
38 + * @return the result of removal
38 */ 39 */
39 boolean remove(ConnectPoint connectPoint, String name); 40 boolean remove(ConnectPoint connectPoint, String name);
40 } 41 }
......
...@@ -108,7 +108,7 @@ public final class BgpSelectionAlgo implements Comparator<PathAttrNlriDetailsLoc ...@@ -108,7 +108,7 @@ public final class BgpSelectionAlgo implements Comparator<PathAttrNlriDetailsLoc
108 * 108 *
109 * @param obj1Size object1 AS count 109 * @param obj1Size object1 AS count
110 * @param obj2Size object2 AS count 110 * @param obj2Size object2 AS count
111 - * @return 111 + * @return object with shortest AsPath
112 */ 112 */
113 int compareAsPath(Integer obj1Size, Integer obj2Size) { 113 int compareAsPath(Integer obj1Size, Integer obj2Size) {
114 return obj1Size.compareTo(obj2Size); 114 return obj1Size.compareTo(obj2Size);
......
...@@ -186,6 +186,7 @@ public class BgpAppConfig extends Config<ApplicationId> { ...@@ -186,6 +186,7 @@ public class BgpAppConfig extends Config<ApplicationId> {
186 /** 186 /**
187 * Validates the Bgp peer As number. 187 * Validates the Bgp peer As number.
188 * 188 *
189 + * @param remoteAs remote As number
189 * @return true if valid else false 190 * @return true if valid else false
190 */ 191 */
191 public boolean validateRemoteAs(long remoteAs) { 192 public boolean validateRemoteAs(long remoteAs) {
...@@ -218,6 +219,7 @@ public class BgpAppConfig extends Config<ApplicationId> { ...@@ -218,6 +219,7 @@ public class BgpAppConfig extends Config<ApplicationId> {
218 /** 219 /**
219 * Validates the Bgp peer holdTime. 220 * Validates the Bgp peer holdTime.
220 * 221 *
222 + * @param remoteAs remote As number
221 * @return true if valid else false 223 * @return true if valid else false
222 */ 224 */
223 public boolean validatePeerHoldTime(long remoteAs) { 225 public boolean validatePeerHoldTime(long remoteAs) {
......
...@@ -213,6 +213,8 @@ public abstract class Tools { ...@@ -213,6 +213,8 @@ public abstract class Tools {
213 213
214 /** 214 /**
215 * Returns the UTF-8 encoded byte[] representation of a String. 215 * Returns the UTF-8 encoded byte[] representation of a String.
216 + * @param input input string
217 + * @return UTF-8 encoded byte array
216 */ 218 */
217 public static byte[] getBytesUtf8(String input) { 219 public static byte[] getBytesUtf8(String input) {
218 return input.getBytes(Charsets.UTF_8); 220 return input.getBytes(Charsets.UTF_8);
...@@ -220,6 +222,8 @@ public abstract class Tools { ...@@ -220,6 +222,8 @@ public abstract class Tools {
220 222
221 /** 223 /**
222 * Returns the String representation of UTF-8 encoded byte[]. 224 * Returns the String representation of UTF-8 encoded byte[].
225 + * @param input input byte array
226 + * @return UTF-8 encoded string
223 */ 227 */
224 public static String toStringUtf8(byte[] input) { 228 public static String toStringUtf8(byte[] input) {
225 return new String(input, Charsets.UTF_8); 229 return new String(input, Charsets.UTF_8);
......
...@@ -96,6 +96,7 @@ public class MetersWebResource extends AbstractWebResource { ...@@ -96,6 +96,7 @@ public class MetersWebResource extends AbstractWebResource {
96 * Returns a meter by the meter id. 96 * Returns a meter by the meter id.
97 * 97 *
98 * @param deviceId device identifier 98 * @param deviceId device identifier
99 + * @param meterId meter identifier
99 * @return a meter, return 404 if no entry has been found 100 * @return a meter, return 404 if no entry has been found
100 * @onos.rsModel Meter 101 * @onos.rsModel Meter
101 */ 102 */
......