Brian O'Connor

Fixing Javadoc errors

Change-Id: I72b9d49e052316cbbbef343d367ffffe13cd4e56
...@@ -98,6 +98,7 @@ public class AclWebResource extends AbstractWebResource { ...@@ -98,6 +98,7 @@ public class AclWebResource extends AbstractWebResource {
98 * 98 *
99 * @param stream JSON data describing the rule 99 * @param stream JSON data describing the rule
100 * @return 200 OK 100 * @return 200 OK
101 + * @throws URISyntaxException uri syntax exception
101 */ 102 */
102 @POST 103 @POST
103 @Consumes(MediaType.APPLICATION_JSON) 104 @Consumes(MediaType.APPLICATION_JSON)
......
...@@ -64,6 +64,7 @@ public interface DhcpStore { ...@@ -64,6 +64,7 @@ public interface DhcpStore {
64 * Releases the IP assigned to a Mac ID into the free pool. 64 * Releases the IP assigned to a Mac ID into the free pool.
65 * 65 *
66 * @param hostId the host ID for which the mapping needs to be changed 66 * @param hostId the host ID for which the mapping needs to be changed
67 + * @return released ip
67 */ 68 */
68 Ip4Address releaseIP(HostId hostId); 69 Ip4Address releaseIP(HostId hostId);
69 70
......
...@@ -85,6 +85,8 @@ public class FlowAnalyzer { ...@@ -85,6 +85,8 @@ public class FlowAnalyzer {
85 * the network. The possible states are: Cleared (implying that the entry leads to 85 * the network. The possible states are: Cleared (implying that the entry leads to
86 * a host), Cycle (implying that it is part of cycle), and Black Hole (implying 86 * a host), Cycle (implying that it is part of cycle), and Black Hole (implying
87 * that the entry does not lead to a single host). 87 * that the entry does not lead to a single host).
88 + *
89 + * @return result string
88 */ 90 */
89 public String analyze() { 91 public String analyze() {
90 graph = topologyService.getGraph(topologyService.currentTopology()); 92 graph = topologyService.getGraph(topologyService.currentTopology());
......
...@@ -67,6 +67,8 @@ public class DeviceConfiguration implements DeviceProperties { ...@@ -67,6 +67,8 @@ public class DeviceConfiguration implements DeviceProperties {
67 /** 67 /**
68 * Constructor. Reads all the configuration for all devices of type 68 * Constructor. Reads all the configuration for all devices of type
69 * Segment Router and organizes into various maps for easier access. 69 * Segment Router and organizes into various maps for easier access.
70 + *
71 + * @param cfgService config service
70 */ 72 */
71 public DeviceConfiguration(NetworkConfigRegistry cfgService) { 73 public DeviceConfiguration(NetworkConfigRegistry cfgService) {
72 // Read config from device subject, excluding gatewayIps and subnets. 74 // Read config from device subject, excluding gatewayIps and subnets.
......
...@@ -34,6 +34,7 @@ public class ControllerInfo { ...@@ -34,6 +34,7 @@ public class ControllerInfo {
34 * 34 *
35 * @param ip the ip address 35 * @param ip the ip address
36 * @param port the tcp port 36 * @param port the tcp port
37 + * @param type the connection type
37 */ 38 */
38 public ControllerInfo(IpAddress ip, int port, String type) { 39 public ControllerInfo(IpAddress ip, int port, String type) {
39 this.ip = ip; 40 this.ip = ip;
......
...@@ -54,6 +54,8 @@ public interface TypedStoredFlowEntry extends StoredFlowEntry { ...@@ -54,6 +54,8 @@ public interface TypedStoredFlowEntry extends StoredFlowEntry {
54 54
55 /** 55 /**
56 * Gets the flow live type for this entry. 56 * Gets the flow live type for this entry.
57 + *
58 + * @return flow live type
57 */ 59 */
58 FlowLiveType flowLiveType(); 60 FlowLiveType flowLiveType();
59 61
......
...@@ -55,9 +55,10 @@ public interface HostProviderService extends ProviderService<HostProvider> { ...@@ -55,9 +55,10 @@ public interface HostProviderService extends ProviderService<HostProvider> {
55 void hostVanished(HostId hostId); 55 void hostVanished(HostId hostId);
56 56
57 /** 57 /**
58 - * Notifies the core when a host is no longer detected on a network. 58 + * Notifies the core when an IP is no longer associated with a host.
59 * 59 *
60 - * @param hostId id of the host that vanished 60 + * @param hostId id of the host
61 + * @param ipAddress ip address of host that vanished
61 */ 62 */
62 void removeIpFromHost(HostId hostId, IpAddress ipAddress); 63 void removeIpFromHost(HostId hostId, IpAddress ipAddress);
63 64
......
...@@ -94,6 +94,7 @@ public interface FlowStatisticService { ...@@ -94,6 +94,7 @@ public interface FlowStatisticService {
94 * @param pNumber the port number of the Device to query 94 * @param pNumber the port number of the Device to query
95 * @param liveType the FlowLiveType to filter, null means no filtering . 95 * @param liveType the FlowLiveType to filter, null means no filtering .
96 * @param instType the InstructionType to filter, null means no filtering. 96 * @param instType the InstructionType to filter, null means no filtering.
97 + * @param topn topn //FIXME what?
97 * @return list of flow entry load 98 * @return list of flow entry load
98 */ 99 */
99 List<TypedFlowEntryWithLoad> loadTopnByType(Device device, PortNumber pNumber, 100 List<TypedFlowEntryWithLoad> loadTopnByType(Device device, PortNumber pNumber,
......
...@@ -94,6 +94,8 @@ public class SummaryFlowEntryWithLoad { ...@@ -94,6 +94,8 @@ public class SummaryFlowEntryWithLoad {
94 94
95 /** 95 /**
96 * Returns connect point. 96 * Returns connect point.
97 + *
98 + * @return connect point
97 */ 99 */
98 public ConnectPoint connectPoint() { 100 public ConnectPoint connectPoint() {
99 return cp; 101 return cp;
...@@ -101,6 +103,8 @@ public class SummaryFlowEntryWithLoad { ...@@ -101,6 +103,8 @@ public class SummaryFlowEntryWithLoad {
101 103
102 /** 104 /**
103 * Returns total load of connect point. 105 * Returns total load of connect point.
106 + *
107 + * @return total load
104 */ 108 */
105 public Load totalLoad() { 109 public Load totalLoad() {
106 return totalLoad; 110 return totalLoad;
...@@ -108,6 +112,8 @@ public class SummaryFlowEntryWithLoad { ...@@ -108,6 +112,8 @@ public class SummaryFlowEntryWithLoad {
108 112
109 /** 113 /**
110 * Returns immediate load of connect point. 114 * Returns immediate load of connect point.
115 + *
116 + * @return immediate load
111 */ 117 */
112 public Load immediateLoad() { 118 public Load immediateLoad() {
113 return immediateLoad; 119 return immediateLoad;
...@@ -115,6 +121,8 @@ public class SummaryFlowEntryWithLoad { ...@@ -115,6 +121,8 @@ public class SummaryFlowEntryWithLoad {
115 121
116 /** 122 /**
117 * Returns short load of connect point. 123 * Returns short load of connect point.
124 + *
125 + * @return short load
118 */ 126 */
119 public Load shortLoad() { 127 public Load shortLoad() {
120 return shortLoad; 128 return shortLoad;
...@@ -122,6 +130,8 @@ public class SummaryFlowEntryWithLoad { ...@@ -122,6 +130,8 @@ public class SummaryFlowEntryWithLoad {
122 130
123 /** 131 /**
124 * Returns mid load of connect point. 132 * Returns mid load of connect point.
133 + *
134 + * @return mid load
125 */ 135 */
126 public Load midLoad() { 136 public Load midLoad() {
127 return midLoad; 137 return midLoad;
...@@ -129,6 +139,8 @@ public class SummaryFlowEntryWithLoad { ...@@ -129,6 +139,8 @@ public class SummaryFlowEntryWithLoad {
129 139
130 /** 140 /**
131 * Returns long load of connect point. 141 * Returns long load of connect point.
142 + *
143 + * @return long load
132 */ 144 */
133 public Load longLoad() { 145 public Load longLoad() {
134 return longLoad; 146 return longLoad;
...@@ -136,6 +148,8 @@ public class SummaryFlowEntryWithLoad { ...@@ -136,6 +148,8 @@ public class SummaryFlowEntryWithLoad {
136 148
137 /** 149 /**
138 * Returns unknown load of connect point. 150 * Returns unknown load of connect point.
151 + *
152 + * @return unknown load
139 */ 153 */
140 public Load unknownLoad() { 154 public Load unknownLoad() {
141 return unknownLoad; 155 return unknownLoad;
......
...@@ -36,19 +36,37 @@ public class TypedFlowEntryWithLoad { ...@@ -36,19 +36,37 @@ public class TypedFlowEntryWithLoad {
36 private static final int MID_POLL_INTERVAL = 10; 36 private static final int MID_POLL_INTERVAL = 10;
37 private static final int LONG_POLL_INTERVAL = 15; 37 private static final int LONG_POLL_INTERVAL = 15;
38 38
39 - 39 + /**
40 + * Creates a new typed flow entry with load.
41 + *
42 + * @param cp connect point
43 + * @param tfe typed flow entry
44 + * @param load load
45 + */
40 public TypedFlowEntryWithLoad(ConnectPoint cp, TypedStoredFlowEntry tfe, Load load) { 46 public TypedFlowEntryWithLoad(ConnectPoint cp, TypedStoredFlowEntry tfe, Load load) {
41 this.cp = cp; 47 this.cp = cp;
42 this.tfe = tfe; 48 this.tfe = tfe;
43 this.load = load; 49 this.load = load;
44 } 50 }
45 51
52 + /**
53 + * Creates a new typed flow entry with load.
54 + *
55 + * @param cp connect point
56 + * @param tfe typed flow entry
57 + */
46 public TypedFlowEntryWithLoad(ConnectPoint cp, TypedStoredFlowEntry tfe) { 58 public TypedFlowEntryWithLoad(ConnectPoint cp, TypedStoredFlowEntry tfe) {
47 this.cp = cp; 59 this.cp = cp;
48 this.tfe = tfe; 60 this.tfe = tfe;
49 this.load = new DefaultLoad(tfe.bytes(), 0, typedPollInterval(tfe)); 61 this.load = new DefaultLoad(tfe.bytes(), 0, typedPollInterval(tfe));
50 } 62 }
51 63
64 + /**
65 + * Creates a new typed flow entry with load.
66 + *
67 + * @param cp connect point
68 + * @param fe flow entry
69 + */
52 public TypedFlowEntryWithLoad(ConnectPoint cp, FlowEntry fe) { 70 public TypedFlowEntryWithLoad(ConnectPoint cp, FlowEntry fe) {
53 this.cp = cp; 71 this.cp = cp;
54 this.tfe = newTypedStoredFlowEntry(fe); 72 this.tfe = newTypedStoredFlowEntry(fe);
...@@ -70,6 +88,8 @@ public class TypedFlowEntryWithLoad { ...@@ -70,6 +88,8 @@ public class TypedFlowEntryWithLoad {
70 88
71 /** 89 /**
72 * Returns short polling interval. 90 * Returns short polling interval.
91 + *
92 + * @return short poll interval
73 */ 93 */
74 public static int shortPollInterval() { 94 public static int shortPollInterval() {
75 return CAL_AND_POLL_INTERVAL; 95 return CAL_AND_POLL_INTERVAL;
...@@ -77,6 +97,8 @@ public class TypedFlowEntryWithLoad { ...@@ -77,6 +97,8 @@ public class TypedFlowEntryWithLoad {
77 97
78 /** 98 /**
79 * Returns mid polling interval. 99 * Returns mid polling interval.
100 + *
101 + * @return mid poll interval
80 */ 102 */
81 public static int midPollInterval() { 103 public static int midPollInterval() {
82 return MID_POLL_INTERVAL; 104 return MID_POLL_INTERVAL;
...@@ -84,6 +106,8 @@ public class TypedFlowEntryWithLoad { ...@@ -84,6 +106,8 @@ public class TypedFlowEntryWithLoad {
84 106
85 /** 107 /**
86 * Returns long polling interval. 108 * Returns long polling interval.
109 + *
110 + * @return long poll interval
87 */ 111 */
88 public static int longPollInterval() { 112 public static int longPollInterval() {
89 return LONG_POLL_INTERVAL; 113 return LONG_POLL_INTERVAL;
...@@ -91,6 +115,8 @@ public class TypedFlowEntryWithLoad { ...@@ -91,6 +115,8 @@ public class TypedFlowEntryWithLoad {
91 115
92 /** 116 /**
93 * Returns average polling interval. 117 * Returns average polling interval.
118 + *
119 + * @return average poll interval
94 */ 120 */
95 public static int avgPollInterval() { 121 public static int avgPollInterval() {
96 return (CAL_AND_POLL_INTERVAL + MID_POLL_INTERVAL + LONG_POLL_INTERVAL) / 3; 122 return (CAL_AND_POLL_INTERVAL + MID_POLL_INTERVAL + LONG_POLL_INTERVAL) / 3;
...@@ -100,6 +126,7 @@ public class TypedFlowEntryWithLoad { ...@@ -100,6 +126,7 @@ public class TypedFlowEntryWithLoad {
100 * Returns current typed flow entry's polling interval. 126 * Returns current typed flow entry's polling interval.
101 * 127 *
102 * @param tfe typed flow entry 128 * @param tfe typed flow entry
129 + * @return typed poll interval
103 */ 130 */
104 public static long typedPollInterval(TypedStoredFlowEntry tfe) { 131 public static long typedPollInterval(TypedStoredFlowEntry tfe) {
105 checkNotNull(tfe, "TypedStoredFlowEntry cannot be null"); 132 checkNotNull(tfe, "TypedStoredFlowEntry cannot be null");
...@@ -120,6 +147,7 @@ public class TypedFlowEntryWithLoad { ...@@ -120,6 +147,7 @@ public class TypedFlowEntryWithLoad {
120 * Creates a new typed flow entry with the given flow entry fe. 147 * Creates a new typed flow entry with the given flow entry fe.
121 * 148 *
122 * @param fe flow entry 149 * @param fe flow entry
150 + * @return new typed flow entry
123 */ 151 */
124 public static TypedStoredFlowEntry newTypedStoredFlowEntry(FlowEntry fe) { 152 public static TypedStoredFlowEntry newTypedStoredFlowEntry(FlowEntry fe) {
125 if (fe == null) { 153 if (fe == null) {
......
...@@ -63,6 +63,7 @@ public interface AsyncAtomicCounter { ...@@ -63,6 +63,7 @@ public interface AsyncAtomicCounter {
63 /** 63 /**
64 * Atomically sets the given value to the current value. 64 * Atomically sets the given value to the current value.
65 * 65 *
66 + * @param value new value
66 * @return future void 67 * @return future void
67 */ 68 */
68 CompletableFuture<Void> set(long value); 69 CompletableFuture<Void> set(long value);
......
...@@ -158,8 +158,8 @@ public final class OpticalPortOperator implements ConfigOperator { ...@@ -158,8 +158,8 @@ public final class OpticalPortOperator implements ConfigOperator {
158 /** 158 /**
159 * Returns a description built from an existing port and reported status. 159 * Returns a description built from an existing port and reported status.
160 * 160 *
161 - * @param port 161 + * @param port port
162 - * @param isEnabled 162 + * @param isEnabled true if enabled
163 * @return a PortDescription based on the port 163 * @return a PortDescription based on the port
164 */ 164 */
165 static PortDescription descriptionOf(Port port, boolean isEnabled) { 165 static PortDescription descriptionOf(Port port, boolean isEnabled) {
......
...@@ -17,6 +17,7 @@ public interface VirtualNetworkProvider extends Provider { ...@@ -17,6 +17,7 @@ public interface VirtualNetworkProvider extends Provider {
17 * @param networkId virtual network identifier 17 * @param networkId virtual network identifier
18 * @param src source connection point 18 * @param src source connection point
19 * @param dst destination connection point 19 * @param dst destination connection point
20 + * @return new tunnel's id
20 */ 21 */
21 TunnelId createTunnel(NetworkId networkId, ConnectPoint src, ConnectPoint dst); 22 TunnelId createTunnel(NetworkId networkId, ConnectPoint src, ConnectPoint dst);
22 23
......
...@@ -88,13 +88,14 @@ public interface OvsdbClientService extends OvsdbRPC { ...@@ -88,13 +88,14 @@ public interface OvsdbClientService extends OvsdbRPC {
88 /** 88 /**
89 * Gets controllers of the node. 89 * Gets controllers of the node.
90 * 90 *
91 + * @param openflowDeviceId target device id
91 * @return set of controllers; empty if no controller is find 92 * @return set of controllers; empty if no controller is find
92 */ 93 */
93 Set<ControllerInfo> getControllers(DeviceId openflowDeviceId); 94 Set<ControllerInfo> getControllers(DeviceId openflowDeviceId);
94 95
95 /** 96 /**
96 * Sets the Controllers for the specified bridge. 97 * Sets the Controllers for the specified bridge.
97 - * <p/> 98 + * <p>
98 * This method will replace the existing controller list with the new controller 99 * This method will replace the existing controller list with the new controller
99 * list. 100 * list.
100 * 101 *
...@@ -105,7 +106,7 @@ public interface OvsdbClientService extends OvsdbRPC { ...@@ -105,7 +106,7 @@ public interface OvsdbClientService extends OvsdbRPC {
105 106
106 /** 107 /**
107 * Sets the Controllers for the specified device. 108 * Sets the Controllers for the specified device.
108 - * <p/> 109 + * <p>
109 * This method will replace the existing controller list with the new controller 110 * This method will replace the existing controller list with the new controller
110 * list. 111 * list.
111 * 112 *
......
...@@ -56,6 +56,7 @@ public final class Row { ...@@ -56,6 +56,7 @@ public final class Row {
56 * 56 *
57 * @param tableName table name 57 * @param tableName table name
58 * @param columns Map of Column entity 58 * @param columns Map of Column entity
59 + * @param uuid UUID of the row
59 */ 60 */
60 public Row(String tableName, UUID uuid, Map<String, Column> columns) { 61 public Row(String tableName, UUID uuid, Map<String, Column> columns) {
61 checkNotNull(tableName, "table name cannot be null"); 62 checkNotNull(tableName, "table name cannot be null");
......
...@@ -492,6 +492,7 @@ public class NewAdaptiveFlowStatsCollector { ...@@ -492,6 +492,7 @@ public class NewAdaptiveFlowStatsCollector {
492 /** 492 /**
493 * returns flowMissingXid that indicates the execution of flowMissing process or not(NO_FLOW_MISSING_XID(-1)). 493 * returns flowMissingXid that indicates the execution of flowMissing process or not(NO_FLOW_MISSING_XID(-1)).
494 * 494 *
495 + * @return xid of missing flow
495 */ 496 */
496 public long getFlowMissingXid() { 497 public long getFlowMissingXid() {
497 return flowMissingXid; 498 return flowMissingXid;
......