Merge remote-tracking branch 'origin/master'
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProviderService.java b/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProviderService.java
index f5b31f8..737ac28 100644
--- a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProviderService.java
+++ b/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProviderService.java
@@ -33,9 +33,8 @@
* Pushes the collection of flow entries currently applied on the given
* device.
*
- * @param deviceId device identifier
- * @return collection of flow entries
+ * @param flowRules collection of flow rules
*/
- void pushFlowMetrics(Iterable<FlowRule> flowEntries);
+ void pushFlowMetrics(Iterable<FlowRule> flowRules);
}
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/criteria/Criteria.java b/core/api/src/main/java/org/onlab/onos/net/flow/criteria/Criteria.java
index 9a5fffa..2cfb4de 100644
--- a/core/api/src/main/java/org/onlab/onos/net/flow/criteria/Criteria.java
+++ b/core/api/src/main/java/org/onlab/onos/net/flow/criteria/Criteria.java
@@ -31,7 +31,7 @@
* Creates a match on ETH_SRC field using the specified value. This value
* may be a wildcard mask.
*
- * @param macValue MAC address value or wildcard mask
+ * @param mac MAC address value or wildcard mask
* @return match criterion
*/
public static Criterion matchEthSrc(MacAddress mac) {
@@ -42,7 +42,7 @@
* Creates a match on ETH_DST field using the specified value. This value
* may be a wildcard mask.
*
- * @param macValue MAC address value or wildcard mask
+ * @param mac MAC address value or wildcard mask
* @return match criterion
*/
public static Criterion matchEthDst(MacAddress mac) {
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/instructions/L2ModificationInstruction.java b/core/api/src/main/java/org/onlab/onos/net/flow/instructions/L2ModificationInstruction.java
index 78eaaa9..a0ab04c 100644
--- a/core/api/src/main/java/org/onlab/onos/net/flow/instructions/L2ModificationInstruction.java
+++ b/core/api/src/main/java/org/onlab/onos/net/flow/instructions/L2ModificationInstruction.java
@@ -5,7 +5,6 @@
/**
* Abstraction of a single traffic treatment step.
- * @param <T> the type parameter for the instruction
*/
public abstract class L2ModificationInstruction implements Instruction {
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/instructions/L3ModificationInstruction.java b/core/api/src/main/java/org/onlab/onos/net/flow/instructions/L3ModificationInstruction.java
index cf25f10..797df9b 100644
--- a/core/api/src/main/java/org/onlab/onos/net/flow/instructions/L3ModificationInstruction.java
+++ b/core/api/src/main/java/org/onlab/onos/net/flow/instructions/L3ModificationInstruction.java
@@ -4,7 +4,6 @@
/**
* Abstraction of a single traffic treatment step.
- * @param <T> the type parameter for the instruction
*/
public abstract class L3ModificationInstruction implements Instruction {
diff --git a/src/main/javadoc/overview.html b/src/main/javadoc/overview.html
index 1edf587..1c66548 100644
--- a/src/main/javadoc/overview.html
+++ b/src/main/javadoc/overview.html
@@ -28,7 +28,7 @@
<br>
<img src="doc-files/onos-subsystem.png" alt="ONOS subsystem structure"><br>
For example, the device-subsystem comprises of a core
- {@link org.onlab.onos.net.trivial.device.impl.SimpleDeviceManager DeviceManager},
+ {@link org.onlab.onos.net.trivial.device.impl.DeviceManager},
which exposes a north-bound
{@link org.onlab.onos.net.device.DeviceService} through which applications or other core components
can learn about the global infrastructure device inventory and through
@@ -39,7 +39,7 @@
</p>
<p>
- On the south-bound side, the core {@link org.onlab.onos.net.trivial.device.impl.SimpleDeviceManager DeviceManager}
+ On the south-bound side, the core {@link org.onlab.onos.net.trivial.device.impl.DeviceManager}
exposes a {@link org.onlab.onos.net.device.DeviceProviderRegistry} through which any number of
{@link org.onlab.onos.net.device.DeviceProvider} entities can register and in turn obtain a
{@link org.onlab.onos.net.device.DeviceProviderService}. Device and port information can then be
@@ -52,7 +52,7 @@
<p>
Within the core, the tasks of indexing, persisting and synchronizing the
global device and port state with the cluster peers falls on the
- {@link org.onlab.onos.net.trivial.device.impl.SimpleDeviceStore DeviceStore}.
+ {@link org.onlab.onos.net.device.DeviceStore}.
</p>
<p>