Removing commented out @Property annotations from the drivers, protocols, pipelines and providers.
Change-Id: I4cabc5a53c93b778824c72cebbce0ec49700eade
diff --git a/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/DistributedVirtualFlowRuleStore.java b/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/DistributedVirtualFlowRuleStore.java
index 27ca7f7..61ea506 100644
--- a/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/DistributedVirtualFlowRuleStore.java
+++ b/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/DistributedVirtualFlowRuleStore.java
@@ -94,7 +94,7 @@
import static com.google.common.base.Strings.isNullOrEmpty;
import static org.onlab.util.Tools.get;
import static org.onlab.util.Tools.groupedThreads;
-import static org.onosproject.incubator.store.virtual.impl.OsgiPropertyDefaults.*;
+import static org.onosproject.incubator.store.virtual.impl.OsgiPropertyConstants.*;
import static org.onosproject.net.flow.FlowRuleEvent.Type.RULE_REMOVED;
import static org.slf4j.LoggerFactory.getLogger;
@@ -105,9 +105,9 @@
//TODO: support backup and persistent mechanism
@Component(immediate = true, enabled = false, service = VirtualNetworkFlowRuleStore.class,
property = {
- "messageHandlerThreadPoolSize:Integer=" + MESSAGE_HANDLER_THREAD_POOL_SIZE_DEFAULT,
- "pendingFutureTimeoutMinutes:Integer=" + BACKUP_PERIOD_MILLIS_DEFAULT,
- "persistenceEnabled:Boolean=" + PERSISTENCE_ENABLED_DEFAULT,
+ MESSAGE_HANDLER_THREAD_POOL_SIZE + ":Integer=" + MESSAGE_HANDLER_THREAD_POOL_SIZE_DEFAULT,
+ BACKUP_PERIOD_MILLIS + ":Integer=" + BACKUP_PERIOD_MILLIS_DEFAULT,
+ PERSISTENCE_ENABLED + ":Boolean=" + PERSISTENCE_ENABLED_DEFAULT,
})
public class DistributedVirtualFlowRuleStore
@@ -117,7 +117,6 @@
private final Logger log = getLogger(getClass());
//TODO: confirm this working fine with multiple thread more than 1
- private static final int MESSAGE_HANDLER_THREAD_POOL_SIZE = 1;
private static final long FLOW_RULE_STORE_TIMEOUT_MILLIS = 5000;
private static final String FLOW_OP_TOPIC = "virtual-flow-ops-ids";
@@ -134,15 +133,13 @@
private static final MessageSubject REMOTE_APPLY_COMPLETED
= new MessageSubject("virtual-peer-apply-completed");
- //@Property(name = "msgHandlerThreadPoolSize", intValue = MESSAGE_HANDLER_THREAD_POOL_SIZE,
- // label = "Number of threads in the message handler pool")
+ /** Number of threads in the message handler pool. */
private int msgHandlerThreadPoolSize = MESSAGE_HANDLER_THREAD_POOL_SIZE_DEFAULT;
- //@Property(name = "backupPeriod", intValue = BACKUP_PERIOD_MILLIS,
- // label = "Delay in ms between successive backup runs")
+ /** Delay in ms between successive backup runs. */
private int backupPeriod = BACKUP_PERIOD_MILLIS_DEFAULT;
- //@Property(name = "persistenceEnabled", boolValue = false,
- // label = "Indicates whether or not changes in the flow table should be persisted to disk.")
+
+ /** Indicates whether or not changes in the flow table should be persisted to disk.. */
private boolean persistenceEnabled = PERSISTENCE_ENABLED_DEFAULT;
private InternalFlowTable flowTable = new InternalFlowTable();
@@ -240,13 +237,13 @@
int newPoolSize;
int newBackupPeriod;
try {
- String s = get(properties, "msgHandlerPoolSize");
+ String s = get(properties, MESSAGE_HANDLER_THREAD_POOL_SIZE);
newPoolSize = isNullOrEmpty(s) ? msgHandlerThreadPoolSize : Integer.parseInt(s.trim());
- s = get(properties, "backupPeriod");
+ s = get(properties, BACKUP_PERIOD_MILLIS);
newBackupPeriod = isNullOrEmpty(s) ? backupPeriod : Integer.parseInt(s.trim());
} catch (NumberFormatException | ClassCastException e) {
- newPoolSize = MESSAGE_HANDLER_THREAD_POOL_SIZE;
+ newPoolSize = MESSAGE_HANDLER_THREAD_POOL_SIZE_DEFAULT;
newBackupPeriod = BACKUP_PERIOD_MILLIS_DEFAULT;
}
diff --git a/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/DistributedVirtualPacketStore.java b/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/DistributedVirtualPacketStore.java
index c1a1210..cbf3860 100644
--- a/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/DistributedVirtualPacketStore.java
+++ b/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/DistributedVirtualPacketStore.java
@@ -63,7 +63,8 @@
import static java.util.concurrent.Executors.newFixedThreadPool;
import static org.onlab.util.Tools.get;
import static org.onlab.util.Tools.groupedThreads;
-import static org.onosproject.incubator.store.virtual.impl.OsgiPropertyDefaults.MESSAGE_HANDLER_THREAD_POOL_SIZE_DEFAULT;
+import static org.onosproject.incubator.store.virtual.impl.OsgiPropertyConstants.MESSAGE_HANDLER_THREAD_POOL_SIZE;
+import static org.onosproject.incubator.store.virtual.impl.OsgiPropertyConstants.MESSAGE_HANDLER_THREAD_POOL_SIZE_DEFAULT;
import static org.onosproject.net.packet.PacketEvent.Type.EMIT;
import static org.slf4j.LoggerFactory.getLogger;
@@ -73,7 +74,7 @@
*/
@Component(immediate = true, enabled = false, service = VirtualNetworkPacketStore.class,
property = {
- "messageHandlerThreadPoolSize:Integer=" + MESSAGE_HANDLER_THREAD_POOL_SIZE_DEFAULT,
+ MESSAGE_HANDLER_THREAD_POOL_SIZE + ":Integer=" + MESSAGE_HANDLER_THREAD_POOL_SIZE_DEFAULT,
})
public class DistributedVirtualPacketStore
extends AbstractVirtualStore<PacketEvent, PacketStoreDelegate>
@@ -107,8 +108,7 @@
private ExecutorService messageHandlingExecutor;
- //@Property(name = "messageHandlerThreadPoolSize", intValue = DEFAULT_MESSAGE_HANDLER_THREAD_POOL_SIZE,
- // label = "Size of thread pool to assign message handler")
+ /** Size of thread pool to assign message handler. */
private static int messageHandlerThreadPoolSize = MESSAGE_HANDLER_THREAD_POOL_SIZE_DEFAULT;
@Activate
@@ -149,7 +149,7 @@
int newMessageHandlerThreadPoolSize;
try {
- String s = get(properties, "messageHandlerThreadPoolSize");
+ String s = get(properties, MESSAGE_HANDLER_THREAD_POOL_SIZE);
newMessageHandlerThreadPoolSize =
isNullOrEmpty(s) ? messageHandlerThreadPoolSize : Integer.parseInt(s.trim());
diff --git a/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/OsgiPropertyDefaults.java b/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/OsgiPropertyConstants.java
similarity index 70%
rename from incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/OsgiPropertyDefaults.java
rename to incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/OsgiPropertyConstants.java
index 765903a..4670429 100644
--- a/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/OsgiPropertyDefaults.java
+++ b/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/OsgiPropertyConstants.java
@@ -19,13 +19,20 @@
/**
* Constants for default values of configurable properties.
*/
-public final class OsgiPropertyDefaults {
+public final class OsgiPropertyConstants {
- private OsgiPropertyDefaults() {}
+ private OsgiPropertyConstants() {}
+ public static final String MESSAGE_HANDLER_THREAD_POOL_SIZE = "messageHandlerThreadPoolSize";
public static final int MESSAGE_HANDLER_THREAD_POOL_SIZE_DEFAULT = 4;
+
+ public static final String BACKUP_PERIOD_MILLIS = "backupPeriod";
public static final int BACKUP_PERIOD_MILLIS_DEFAULT = 2000;
+
+ public static final String PERSISTENCE_ENABLED = "persistenceEnabled";
public static final boolean PERSISTENCE_ENABLED_DEFAULT = false;
+
+ public static final String PENDING_FUTURE_TIMEOUT_MINUTES = "pendingFutureTimeoutMinutes";
public static final int PENDING_FUTURE_TIMEOUT_MINUTES_DEFAULT = 5;
}
diff --git a/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/SimpleVirtualFlowRuleStore.java b/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/SimpleVirtualFlowRuleStore.java
index c2edd81..ab2c792 100644
--- a/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/SimpleVirtualFlowRuleStore.java
+++ b/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/SimpleVirtualFlowRuleStore.java
@@ -62,7 +62,8 @@
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicInteger;
-import static org.onosproject.incubator.store.virtual.impl.OsgiPropertyDefaults.PENDING_FUTURE_TIMEOUT_MINUTES_DEFAULT;
+import static org.onosproject.incubator.store.virtual.impl.OsgiPropertyConstants.PENDING_FUTURE_TIMEOUT_MINUTES;
+import static org.onosproject.incubator.store.virtual.impl.OsgiPropertyConstants.PENDING_FUTURE_TIMEOUT_MINUTES_DEFAULT;
import static org.onosproject.net.flow.FlowRuleEvent.Type.RULE_REMOVED;
import static org.slf4j.LoggerFactory.getLogger;
@@ -74,7 +75,7 @@
@Component(immediate = true, service = VirtualNetworkFlowRuleStore.class,
property = {
- "pendingFutureTimeoutMinutes:Integer=" + PENDING_FUTURE_TIMEOUT_MINUTES_DEFAULT,
+ PENDING_FUTURE_TIMEOUT_MINUTES + ":Integer=" + PENDING_FUTURE_TIMEOUT_MINUTES_DEFAULT,
})
public class SimpleVirtualFlowRuleStore
extends AbstractVirtualStore<FlowRuleBatchEvent, FlowRuleStoreDelegate>
@@ -92,8 +93,7 @@
private final AtomicInteger localBatchIdGen = new AtomicInteger();
- //@Property(name = "pendingFutureTimeoutMinutes", intValue = DEFAULT_PENDING_FUTURE_TIMEOUT_MINUTES,
- // label = "Expiration time after an entry is created that it should be automatically removed")
+ /** Expiration time after an entry is created that it should be automatically removed. */
private int pendingFutureTimeoutMinutes = PENDING_FUTURE_TIMEOUT_MINUTES_DEFAULT;
private Cache<Integer, SettableFuture<CompletedBatchOperation>> pendingFutures =