Ray Milkey
Committed by Gerrit Code Review

Javadoc fixes

Change-Id: Id23ed2d576b2222194153be9d043ca5acafe67ae
...@@ -37,6 +37,7 @@ public interface DhcpStore { ...@@ -37,6 +37,7 @@ public interface DhcpStore {
37 * Returns an IP Address for a Mac ID, in response to a DHCP DISCOVER message. 37 * Returns an IP Address for a Mac ID, in response to a DHCP DISCOVER message.
38 * 38 *
39 * @param macID Mac ID of the client requesting an IP 39 * @param macID Mac ID of the client requesting an IP
40 + * @param requestedIP requested IP address
40 * @return IP address assigned to the Mac ID 41 * @return IP address assigned to the Mac ID
41 */ 42 */
42 Ip4Address suggestIP(MacAddress macID, Ip4Address requestedIP); 43 Ip4Address suggestIP(MacAddress macID, Ip4Address requestedIP);
......
...@@ -128,6 +128,7 @@ public final class IpAssignment { ...@@ -128,6 +128,7 @@ public final class IpAssignment {
128 /** 128 /**
129 * Creates and returns a new builder instance that clones an existing IPAssignment. 129 * Creates and returns a new builder instance that clones an existing IPAssignment.
130 * 130 *
131 + * @param assignment ip address assignment
131 * @return new builder 132 * @return new builder
132 */ 133 */
133 public static Builder builder(IpAssignment assignment) { 134 public static Builder builder(IpAssignment assignment) {
......
...@@ -104,6 +104,7 @@ public class DHCPWebResource extends AbstractWebResource { ...@@ -104,6 +104,7 @@ public class DHCPWebResource extends AbstractWebResource {
104 * Post a new static MAC/IP binding. 104 * Post a new static MAC/IP binding.
105 * Registers a static binding to the DHCP server, and displays the current set of bindings. 105 * Registers a static binding to the DHCP server, and displays the current set of bindings.
106 * 106 *
107 + * @param stream JSON stream
107 * @return 200 OK 108 * @return 200 OK
108 */ 109 */
109 @POST 110 @POST
...@@ -139,6 +140,7 @@ public class DHCPWebResource extends AbstractWebResource { ...@@ -139,6 +140,7 @@ public class DHCPWebResource extends AbstractWebResource {
139 * Delete a static MAC/IP binding. 140 * Delete a static MAC/IP binding.
140 * Removes a static binding from the DHCP Server, and displays the current set of bindings. 141 * Removes a static binding from the DHCP Server, and displays the current set of bindings.
141 * 142 *
143 + * @param macID mac address identifier
142 * @return 200 OK 144 * @return 200 OK
143 */ 145 */
144 @DELETE 146 @DELETE
......
...@@ -102,6 +102,7 @@ public class IntentSynchronizer implements FibListener, IntentRequestListener { ...@@ -102,6 +102,7 @@ public class IntentSynchronizer implements FibListener, IntentRequestListener {
102 * @param intentService the intent service 102 * @param intentService the intent service
103 * @param hostService the host service 103 * @param hostService the host service
104 * @param configService the SDN-IP configuration service 104 * @param configService the SDN-IP configuration service
105 + * @param interfaceService the interface service
105 */ 106 */
106 IntentSynchronizer(ApplicationId appId, IntentService intentService, 107 IntentSynchronizer(ApplicationId appId, IntentService intentService,
107 HostService hostService, 108 HostService hostService,
......
...@@ -67,6 +67,8 @@ public class PeerConnectivityManager { ...@@ -67,6 +67,8 @@ public class PeerConnectivityManager {
67 * @param appId the application ID 67 * @param appId the application ID
68 * @param intentSynchronizer the intent synchronizer 68 * @param intentSynchronizer the intent synchronizer
69 * @param configService the SDN-IP config service 69 * @param configService the SDN-IP config service
70 + * @param interfaceService the interface service
71 + * @param routerAppId application ID
70 */ 72 */
71 public PeerConnectivityManager(ApplicationId appId, 73 public PeerConnectivityManager(ApplicationId appId,
72 IntentSynchronizer intentSynchronizer, 74 IntentSynchronizer intentSynchronizer,
......
...@@ -65,7 +65,7 @@ public class PolicyWebResource extends AbstractWebResource { ...@@ -65,7 +65,7 @@ public class PolicyWebResource extends AbstractWebResource {
65 * @param input JSON stream for policy to create 65 * @param input JSON stream for policy to create
66 * @return status of the request - OK if the policy is created, 66 * @return status of the request - OK if the policy is created,
67 * INTERNAL_SERVER_ERROR if the JSON is invalid or the policy cannot be created 67 * INTERNAL_SERVER_ERROR if the JSON is invalid or the policy cannot be created
68 - * @throws IOException 68 + * @throws IOException if JSON processing fails
69 */ 69 */
70 @POST 70 @POST
71 @Consumes(MediaType.APPLICATION_JSON) 71 @Consumes(MediaType.APPLICATION_JSON)
......
...@@ -344,6 +344,7 @@ public abstract class L2ModificationInstruction implements Instruction { ...@@ -344,6 +344,7 @@ public abstract class L2ModificationInstruction implements Instruction {
344 344
345 /** 345 /**
346 * @deprecated in Drake Release. 346 * @deprecated in Drake Release.
347 + * @return integer value of label
347 */ 348 */
348 // Consider changing return value to MplsLabel 349 // Consider changing return value to MplsLabel
349 // after deprecation process so that it'll be symmetric to 350 // after deprecation process so that it'll be symmetric to
......
...@@ -90,6 +90,7 @@ public class Controller { ...@@ -90,6 +90,7 @@ public class Controller {
90 90
91 /** 91 /**
92 * Tells controller that we're ready to accept ovsdb node loop. 92 * Tells controller that we're ready to accept ovsdb node loop.
93 + * @throws InterruptedException if thread is interrupted
93 */ 94 */
94 public void run() throws InterruptedException { 95 public void run() throws InterruptedException {
95 initEventLoopGroup(); 96 initEventLoopGroup();
......
...@@ -181,6 +181,7 @@ public class RemoteTENodeDescriptorsTlv implements PcepValueType { ...@@ -181,6 +181,7 @@ public class RemoteTENodeDescriptorsTlv implements PcepValueType {
181 * Reads channel buffer and returns object of Remote TE Node Descriptors TLV. 181 * Reads channel buffer and returns object of Remote TE Node Descriptors TLV.
182 * 182 *
183 * @param c input channel buffer 183 * @param c input channel buffer
184 + * @param length length of buffer
184 * @return object of RemoteTENodeDescriptorsTLV 185 * @return object of RemoteTENodeDescriptorsTLV
185 * @throws PcepParseException if mandatory fields are missing 186 * @throws PcepParseException if mandatory fields are missing
186 */ 187 */
......
...@@ -43,6 +43,11 @@ public class NetconfOperation { ...@@ -43,6 +43,11 @@ public class NetconfOperation {
43 43
44 /** 44 /**
45 * This will send a Xml message to the device. 45 * This will send a Xml message to the device.
46 + * @param xmlMsg XML to send
47 + * @param username user name
48 + * @param password pass word
49 + * @param deviceIp ip address of the device
50 + * @param devicePort port on the device
46 */ 51 */
47 protected void sendXmlMessage(String xmlMsg, String username, 52 protected void sendXmlMessage(String xmlMsg, String username,
48 String password, String deviceIp, 53 String password, String deviceIp,
...@@ -105,10 +110,18 @@ public class NetconfOperation { ...@@ -105,10 +110,18 @@ public class NetconfOperation {
105 110
106 /** 111 /**
107 * To establish SSH Connection. 112 * To establish SSH Connection.
113 + *
114 + * @param username user name
115 + * @param password pass word
116 + * @param sshHost host
117 + * @param sshPort port
118 + * @return new SSH connection
119 + * @throws IOException if connection fails
120 + * @throws JNCException if connection causes an error
108 */ 121 */
109 public SSHConnection getConnection(String username, String password, 122 public SSHConnection getConnection(String username, String password,
110 String sshHost, Integer sshPort) 123 String sshHost, Integer sshPort)
111 - throws Exception { 124 + throws IOException, JNCException {
112 SSHConnection sshConnection; 125 SSHConnection sshConnection;
113 try { 126 try {
114 sshConnection = new SSHConnection(sshHost, sshPort); 127 sshConnection = new SSHConnection(sshHost, sshPort);
......
...@@ -78,8 +78,8 @@ public class IGMPMembership extends IGMPGroup { ...@@ -78,8 +78,8 @@ public class IGMPMembership extends IGMPGroup {
78 * 78 *
79 * @param bb the ByteBuffer wrapping the serialized message. The position of the 79 * @param bb the ByteBuffer wrapping the serialized message. The position of the
80 * ByteBuffer should be pointing at the head of either message type. 80 * ByteBuffer should be pointing at the head of either message type.
81 - * @return 81 + * @return IGMP Group
82 - * @throws DeserializationException 82 + * @throws DeserializationException if deserialization fails
83 */ 83 */
84 public IGMPGroup deserialize(ByteBuffer bb) throws DeserializationException { 84 public IGMPGroup deserialize(ByteBuffer bb) throws DeserializationException {
85 85
...@@ -155,4 +155,4 @@ public class IGMPMembership extends IGMPGroup { ...@@ -155,4 +155,4 @@ public class IGMPMembership extends IGMPGroup {
155 result = prime * result + this.sources.hashCode(); 155 result = prime * result + this.sources.hashCode();
156 return result; 156 return result;
157 } 157 }
158 -}
...\ No newline at end of file ...\ No newline at end of file
158 +}
......
...@@ -63,7 +63,7 @@ public class IGMPQuery extends IGMPGroup { ...@@ -63,7 +63,7 @@ public class IGMPQuery extends IGMPGroup {
63 /** 63 /**
64 * Get the Querier Robustness Variable. 64 * Get the Querier Robustness Variable.
65 * 65 *
66 - * @return 66 + * @return querier robustness value
67 */ 67 */
68 public byte getQrv() { 68 public byte getQrv() {
69 return qrv; 69 return qrv;
...@@ -72,7 +72,7 @@ public class IGMPQuery extends IGMPGroup { ...@@ -72,7 +72,7 @@ public class IGMPQuery extends IGMPGroup {
72 /** 72 /**
73 * Set the Querier Robustness Variable. Default is 2. 73 * Set the Querier Robustness Variable. Default is 2.
74 * 74 *
75 - * @param qrv 75 + * @param qrv new querier robustness value
76 */ 76 */
77 public void setQrv(byte qrv) { 77 public void setQrv(byte qrv) {
78 this.qrv = qrv; 78 this.qrv = qrv;
...@@ -199,4 +199,4 @@ public class IGMPQuery extends IGMPGroup { ...@@ -199,4 +199,4 @@ public class IGMPQuery extends IGMPGroup {
199 result = prime * result + this.sources.hashCode(); 199 result = prime * result + this.sources.hashCode();
200 return result; 200 return result;
201 } 201 }
202 -}
...\ No newline at end of file ...\ No newline at end of file
202 +}
......
...@@ -15,15 +15,7 @@ ...@@ -15,15 +15,7 @@
15 */ 15 */
16 package org.onosproject.rest.resources; 16 package org.onosproject.rest.resources;
17 17
18 -import com.fasterxml.jackson.databind.JsonNode; 18 +import java.io.InputStream;
19 -import com.fasterxml.jackson.databind.ObjectMapper;
20 -import org.onosproject.net.device.DeviceProviderRegistry;
21 -import org.onosproject.net.device.DeviceService;
22 -import org.onosproject.net.host.HostProviderRegistry;
23 -import org.onosproject.net.link.LinkProviderRegistry;
24 -import org.onlab.rest.BaseResource;
25 -import org.slf4j.Logger;
26 -import org.slf4j.LoggerFactory;
27 19
28 import javax.ws.rs.Consumes; 20 import javax.ws.rs.Consumes;
29 import javax.ws.rs.POST; 21 import javax.ws.rs.POST;
...@@ -31,8 +23,17 @@ import javax.ws.rs.Path; ...@@ -31,8 +23,17 @@ import javax.ws.rs.Path;
31 import javax.ws.rs.Produces; 23 import javax.ws.rs.Produces;
32 import javax.ws.rs.core.MediaType; 24 import javax.ws.rs.core.MediaType;
33 import javax.ws.rs.core.Response; 25 import javax.ws.rs.core.Response;
34 -import java.io.IOException; 26 +
35 -import java.io.InputStream; 27 +import org.onlab.rest.BaseResource;
28 +import org.onosproject.net.device.DeviceProviderRegistry;
29 +import org.onosproject.net.device.DeviceService;
30 +import org.onosproject.net.host.HostProviderRegistry;
31 +import org.onosproject.net.link.LinkProviderRegistry;
32 +import org.slf4j.Logger;
33 +import org.slf4j.LoggerFactory;
34 +
35 +import com.fasterxml.jackson.databind.JsonNode;
36 +import com.fasterxml.jackson.databind.ObjectMapper;
36 37
37 import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; 38 import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
38 39
...@@ -49,13 +50,12 @@ public class ConfigWebResource extends BaseResource { ...@@ -49,13 +50,12 @@ public class ConfigWebResource extends BaseResource {
49 * 50 *
50 * @param input JSON blob 51 * @param input JSON blob
51 * @return 200 OK 52 * @return 200 OK
52 - * @throws IOException
53 */ 53 */
54 @POST 54 @POST
55 @Path("topology") 55 @Path("topology")
56 @Consumes(MediaType.APPLICATION_JSON) 56 @Consumes(MediaType.APPLICATION_JSON)
57 @Produces(MediaType.APPLICATION_JSON) 57 @Produces(MediaType.APPLICATION_JSON)
58 - public Response topology(InputStream input) throws IOException { 58 + public Response topology(InputStream input) {
59 try { 59 try {
60 ObjectMapper mapper = new ObjectMapper(); 60 ObjectMapper mapper = new ObjectMapper();
61 JsonNode cfg = mapper.readTree(input); 61 JsonNode cfg = mapper.readTree(input);
......
...@@ -181,6 +181,7 @@ public class TrafficMonitor { ...@@ -181,6 +181,7 @@ public class TrafficMonitor {
181 * </ul> 181 * </ul>
182 * 182 *
183 * @param mode monitoring mode 183 * @param mode monitoring mode
184 + * @param nodeSelection how to select a node
184 */ 185 */
185 public synchronized void monitor(Mode mode, NodeSelection nodeSelection) { 186 public synchronized void monitor(Mode mode, NodeSelection nodeSelection) {
186 log.debug("monitor: {} -- {}", mode, nodeSelection); 187 log.debug("monitor: {} -- {}", mode, nodeSelection);
......