Committed by
Brian O'Connor
Fix javadoc issues
Change-Id: I68b5e8feba625104f9a5c9eb62a56654ddea0516
Showing
6 changed files
with
11 additions
and
5 deletions
... | @@ -16,13 +16,13 @@ | ... | @@ -16,13 +16,13 @@ |
16 | package org.onosproject.net.flow; | 16 | package org.onosproject.net.flow; |
17 | 17 | ||
18 | 18 | ||
19 | -import java.util.Collections; | ||
20 | -import java.util.Set; | ||
21 | - | ||
22 | import com.google.common.base.MoreObjects; | 19 | import com.google.common.base.MoreObjects; |
23 | import com.google.common.collect.ImmutableSet; | 20 | import com.google.common.collect.ImmutableSet; |
24 | import org.onosproject.net.DeviceId; | 21 | import org.onosproject.net.DeviceId; |
25 | 22 | ||
23 | +import java.util.Collections; | ||
24 | +import java.util.Set; | ||
25 | + | ||
26 | /** | 26 | /** |
27 | * Representation of a completed flow rule batch operation. | 27 | * Representation of a completed flow rule batch operation. |
28 | */ | 28 | */ |
... | @@ -54,7 +54,7 @@ public class CompletedBatchOperation implements BatchOperationResult<FlowRule> { | ... | @@ -54,7 +54,7 @@ public class CompletedBatchOperation implements BatchOperationResult<FlowRule> { |
54 | * | 54 | * |
55 | * @param success indicates whether the completion is successful. | 55 | * @param success indicates whether the completion is successful. |
56 | * @param failures set of any failures encountered | 56 | * @param failures set of any failures encountered |
57 | - * @param deviceId device id | 57 | + * @param deviceId the device this operation completed for |
58 | */ | 58 | */ |
59 | public CompletedBatchOperation(boolean success, Set<? extends FlowRule> failures, | 59 | public CompletedBatchOperation(boolean success, Set<? extends FlowRule> failures, |
60 | DeviceId deviceId) { | 60 | DeviceId deviceId) { | ... | ... |
... | @@ -108,8 +108,10 @@ public class IntentData { //FIXME need to make this "immutable" | ... | @@ -108,8 +108,10 @@ public class IntentData { //FIXME need to make this "immutable" |
108 | public String toString() { | 108 | public String toString() { |
109 | return MoreObjects.toStringHelper(getClass()) | 109 | return MoreObjects.toStringHelper(getClass()) |
110 | .add("key", key()) | 110 | .add("key", key()) |
111 | + .add("intent", intent()) | ||
111 | .add("state", state()) | 112 | .add("state", state()) |
112 | .add("version", version()) | 113 | .add("version", version()) |
114 | + .add("installables", installables()) | ||
113 | .toString(); | 115 | .toString(); |
114 | } | 116 | } |
115 | 117 | ... | ... |
... | @@ -64,6 +64,7 @@ public final class MultiPointToSinglePointIntent extends ConnectivityIntent { | ... | @@ -64,6 +64,7 @@ public final class MultiPointToSinglePointIntent extends ConnectivityIntent { |
64 | * traffic selector and treatment. | 64 | * traffic selector and treatment. |
65 | * | 65 | * |
66 | * @param appId application identifier | 66 | * @param appId application identifier |
67 | + * @param key intent key | ||
67 | * @param selector traffic selector | 68 | * @param selector traffic selector |
68 | * @param treatment treatment | 69 | * @param treatment treatment |
69 | * @param ingressPoints set of ports from which ingress traffic originates | 70 | * @param ingressPoints set of ports from which ingress traffic originates | ... | ... |
... | @@ -44,6 +44,8 @@ public class IntentAccumulator extends AbstractAccumulator<IntentData> { | ... | @@ -44,6 +44,8 @@ public class IntentAccumulator extends AbstractAccumulator<IntentData> { |
44 | 44 | ||
45 | /** | 45 | /** |
46 | * Creates an intent operation accumulator. | 46 | * Creates an intent operation accumulator. |
47 | + * | ||
48 | + * @param delegate the intent batch delegate | ||
47 | */ | 49 | */ |
48 | protected IntentAccumulator(IntentBatchDelegate delegate) { | 50 | protected IntentAccumulator(IntentBatchDelegate delegate) { |
49 | super(TIMER, DEFAULT_MAX_EVENTS, DEFAULT_MAX_BATCH_MS, DEFAULT_MAX_IDLE_MS); | 51 | super(TIMER, DEFAULT_MAX_EVENTS, DEFAULT_MAX_BATCH_MS, DEFAULT_MAX_IDLE_MS); | ... | ... |
... | @@ -265,6 +265,7 @@ public class IntentManager | ... | @@ -265,6 +265,7 @@ public class IntentManager |
265 | * Compiles an intent recursively. | 265 | * Compiles an intent recursively. |
266 | * | 266 | * |
267 | * @param intent intent | 267 | * @param intent intent |
268 | + * @param previousInstallables previous intent installables | ||
268 | * @return result of compilation | 269 | * @return result of compilation |
269 | */ | 270 | */ |
270 | List<Intent> compileIntent(Intent intent, List<Intent> previousInstallables) { | 271 | List<Intent> compileIntent(Intent intent, List<Intent> previousInstallables) { | ... | ... |
... | @@ -24,7 +24,7 @@ import static com.google.common.base.Preconditions.checkNotNull; | ... | @@ -24,7 +24,7 @@ import static com.google.common.base.Preconditions.checkNotNull; |
24 | 24 | ||
25 | /** | 25 | /** |
26 | * Represents a phase of withdrawing an intent with calling | 26 | * Represents a phase of withdrawing an intent with calling |
27 | - * {@link import org.onosproject.net.flow.FlowRuleService}. | 27 | + * {@link org.onosproject.net.flow.FlowRuleService}. |
28 | */ | 28 | */ |
29 | class Withdrawing implements IntentUpdate { | 29 | class Withdrawing implements IntentUpdate { |
30 | 30 | ... | ... |
-
Please register or login to post a comment