Removing commented out @Property annotations from the core.
Change-Id: I336f6a21db531187b8e2fcfb51e7da315c615771
diff --git a/core/store/dist/src/main/java/org/onosproject/store/OsgiPropertyConstants.java b/core/store/dist/src/main/java/org/onosproject/store/OsgiPropertyConstants.java
index 71f6f87..1f4555d 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/OsgiPropertyConstants.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/OsgiPropertyConstants.java
@@ -23,73 +23,45 @@
private OsgiPropertyConstants() {
}
- //@Property(name = "msgHandlerPoolSize", intValue = MESSAGE_HANDLER_THREAD_POOL_SIZE,
- // label = "Number of threads in the message handler pool")
public static final String MESSAGE_HANDLER_THREAD_POOL_SIZE = "msgHandlerPoolSize";
public static final int MESSAGE_HANDLER_THREAD_POOL_SIZE_DEFAULT = 8;
- //@Property(name = "backupPeriod", intValue = BACKUP_PERIOD_MILLIS,
- // label = "Delay in ms between successive backup runs")
public static final String BACKUP_PERIOD_MILLIS = "backupPeriod";
public static final int BACKUP_PERIOD_MILLIS_DEFAULT = 2000;
- //@Property(name = "antiEntropyPeriod", intValue = ANTI_ENTROPY_PERIOD_MILLIS,
- // label = "Delay in ms between anti-entropy runs")
public static final String ANTI_ENTROPY_PERIOD_MILLIS = "antiEntropyPeriod";
public static final int ANTI_ENTROPY_PERIOD_MILLIS_DEFAULT = 5000;
- //@Property(name = "persistenceEnabled", boolValue = false,
- // label = "Indicates whether or not changes in the flow table should be persisted to disk.")
- public static final String EC_FLOW_RULE_STORE_PERSISTENCE_ENABLED = "ECFlowRuleStorePersistenceEnabled";
+ public static final String EC_FLOW_RULE_STORE_PERSISTENCE_ENABLED = "flowRuleStorePersistenceEnabled";
public static final boolean EC_FLOW_RULE_STORE_PERSISTENCE_ENABLED_DEFAULT = false;
- //@Property(name = "backupCount", intValue = DEFAULT_MAX_BACKUP_COUNT,
- // label = "Max number of backup copies for each device")
public static final String MAX_BACKUP_COUNT = "backupCount";
public static final int MAX_BACKUP_COUNT_DEFAULT = 2;
- //@Property(name = "electionTimeoutMillis", longValue = DEFAULT_ELECTION_TIMEOUT_MILLIS,
- // label = "the leader election timeout in milliseconds")
public static final String ELECTION_TIMEOUT_MILLIS = "electionTimeoutMillis";
public static final long ELECTION_TIMEOUT_MILLIS_DEFAULT = 2500;
- //@Property(name = "garbageCollect", boolValue = GARBAGE_COLLECT,
- // label = "Enable group garbage collection")
public static final String GARBAGE_COLLECT = "garbageCollect";
public static final boolean GARBAGE_COLLECT_DEFAULT = false;
- //@Property(name = "gcThresh", intValue = GC_THRESH,
- // label = "Number of rounds for group garbage collection")
public static final String GARBAGE_COLLECT_THRESH = "gcThresh";
public static final int GARBAGE_COLLECT_THRESH_DEFAULT = 6;
- //@Property(name = "allowExtraneousGroups", boolValue = ALLOW_EXTRANEOUS_GROUPS,
- // label = "Allow groups in switches not installed by ONOS")
- public static final String ALLOW_EXTRANEOUS_GROUPS = "garbageCollect";
+ public static final String ALLOW_EXTRANEOUS_GROUPS = "allowExtraneousGroups";
public static final boolean ALLOW_EXTRANEOUS_GROUPS_DEFAULT = false;
- //@Property(name = "persistenceEnabled", boolValue = PERSIST,
- // label = "EXPERIMENTAL: Enable intent persistence")
- public static final String GIS_PERSISTENCE_ENABLED = "GISPersistenceEnabled";
+ public static final String GIS_PERSISTENCE_ENABLED = "persistenceEnabled";
public static final boolean GIS_PERSISTENCE_ENABLED_DEFAULT = false;
- //@Property(name = "messageHandlerThreadPoolSize", intValue = DEFAULT_MESSAGE_HANDLER_THREAD_POOL_SIZE,
- // label = "Size of thread pool to assign message handler")
- public static final String DPS_MESSAGE_HANDLER_THREAD_POOL_SIZE = "DPSMessageHandlerThreadPoolSize";
+ public static final String DPS_MESSAGE_HANDLER_THREAD_POOL_SIZE = "messageHandlerThreadPoolSize";
public static final int DPS_MESSAGE_HANDLER_THREAD_POOL_SIZE_DEFAULT = 4;
- //@Property(name = "messageHandlerThreadPoolSize", intValue = DEFAULT_MESSAGE_HANDLER_THREAD_POOL_SIZE,
- // label = "Size of thread pool to assign message handler")
- public static final String DFS_MESSAGE_HANDLER_THREAD_POOL_SIZE = "DFSMessageHandlerThreadPoolSize";
+ public static final String DFS_MESSAGE_HANDLER_THREAD_POOL_SIZE = "messageHandlerThreadPoolSize";
public static final int DFS_MESSAGE_HANDLER_THREAD_POOL_SIZE_DEFAULT = 4;
- //@Property(name = "messageHandlerThreadPoolSize", intValue = DEFAULT_MESSAGE_HANDLER_THREAD_POOL_SIZE,
- // label = "Size of thread pool to assign message handler")
- public static final String DSS_MESSAGE_HANDLER_THREAD_POOL_SIZE = "DFSMessageHandlerThreadPoolSize";
+ public static final String DSS_MESSAGE_HANDLER_THREAD_POOL_SIZE = "messageHandlerThreadPoolSize";
public static final int DSS_MESSAGE_HANDLER_THREAD_POOL_SIZE_DEFAULT = 4;
- //@Property(name = "linkWeightFunction", value = DEFAULT_LINK_WEIGHT_FUNCTION,
- // label = "Default link-weight function: hopCount, linkMetric, geoDistance")
public static final String LINK_WEIGHT_FUNCTION = "linkWeightFunction";
public static final String LINK_WEIGHT_FUNCTION_DEFAULT = "hopCount";
}
diff --git a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedLeadershipStore.java b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedLeadershipStore.java
index 171e146..43959de 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedLeadershipStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedLeadershipStore.java
@@ -90,8 +90,7 @@
@Reference(cardinality = MANDATORY)
protected UpgradeService upgradeService;
- //@Property(name = "electionTimeoutMillis", longValue = DEFAULT_ELECTION_TIMEOUT_MILLIS,
- // label = "the leader election timeout in milliseconds")
+ /** Leader election timeout in milliseconds. */
private long electionTimeoutMillis = ELECTION_TIMEOUT_MILLIS_DEFAULT;
private ExecutorService statusChangeHandler;
@@ -192,7 +191,7 @@
Dictionary<?, ?> properties = context.getProperties();
long newElectionTimeoutMillis;
try {
- String s = get(properties, "electionTimeoutMillis");
+ String s = get(properties, ELECTION_TIMEOUT_MILLIS);
newElectionTimeoutMillis = isNullOrEmpty(s) ? electionTimeoutMillis : Long.parseLong(s.trim());
} catch (NumberFormatException | ClassCastException e) {
log.warn("Malformed configuration detected; using defaults", e);
diff --git a/core/store/dist/src/main/java/org/onosproject/store/flow/impl/ECFlowRuleStore.java b/core/store/dist/src/main/java/org/onosproject/store/flow/impl/ECFlowRuleStore.java
index 50c68a2..dad9351 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/flow/impl/ECFlowRuleStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/flow/impl/ECFlowRuleStore.java
@@ -129,24 +129,19 @@
private static final long FLOW_RULE_STORE_TIMEOUT_MILLIS = 5000;
- //@Property(name = "msgHandlerPoolSize", 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 msgHandlerPoolSize = 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 = "antiEntropyPeriod", intValue = ANTI_ENTROPY_PERIOD_MILLIS,
- // label = "Delay in ms between anti-entropy runs")
+ /** Delay in ms between anti-entropy runs. */
private int antiEntropyPeriod = ANTI_ENTROPY_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 = EC_FLOW_RULE_STORE_PERSISTENCE_ENABLED_DEFAULT;
- //@Property(name = "backupCount", intValue = DEFAULT_MAX_BACKUP_COUNT,
- // label = "Max number of backup copies for each device")
+ /** Max number of backup copies for each device. */
private volatile int backupCount = MAX_BACKUP_COUNT_DEFAULT;
private InternalFlowTable flowTable = new InternalFlowTable();
@@ -270,13 +265,13 @@
String s = get(properties, "msgHandlerPoolSize");
newPoolSize = isNullOrEmpty(s) ? msgHandlerPoolSize : Integer.parseInt(s.trim());
- s = get(properties, "backupPeriod");
+ s = get(properties, BACKUP_PERIOD_MILLIS);
newBackupPeriod = isNullOrEmpty(s) ? backupPeriod : Integer.parseInt(s.trim());
- s = get(properties, "backupCount");
+ s = get(properties, MAX_BACKUP_COUNT);
newBackupCount = isNullOrEmpty(s) ? backupCount : Integer.parseInt(s.trim());
- s = get(properties, "antiEntropyPeriod");
+ s = get(properties, ANTI_ENTROPY_PERIOD_MILLIS);
newAntiEntropyPeriod = isNullOrEmpty(s) ? antiEntropyPeriod : Integer.parseInt(s.trim());
} catch (NumberFormatException | ClassCastException e) {
newPoolSize = MESSAGE_HANDLER_THREAD_POOL_SIZE_DEFAULT;
diff --git a/core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java b/core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java
index 03f9e3f..23c1c9f 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java
@@ -170,16 +170,13 @@
private static Topic<GroupStoreMessage> groupTopic;
- //@Property(name = "garbageCollect", boolValue = GARBAGE_COLLECT,
- // label = "Enable group garbage collection")
+ /** Enable group garbage collection. */
private boolean garbageCollect = GARBAGE_COLLECT_DEFAULT;
- //@Property(name = "gcThresh", intValue = GC_THRESH,
- // label = "Number of rounds for group garbage collection")
+ /** Number of rounds for group garbage collection. */
private int gcThresh = GARBAGE_COLLECT_THRESH_DEFAULT;
- //@Property(name = "allowExtraneousGroups", boolValue = ALLOW_EXTRANEOUS_GROUPS,
- // label = "Allow groups in switches not installed by ONOS")
+ /** Allow groups in switches not installed by ONOS. */
private boolean allowExtraneousGroups = ALLOW_EXTRANEOUS_GROUPS_DEFAULT;
@Activate
@@ -269,13 +266,13 @@
Dictionary<?, ?> properties = context != null ? context.getProperties() : new Properties();
try {
- String s = get(properties, "garbageCollect");
+ String s = get(properties, GARBAGE_COLLECT);
garbageCollect = isNullOrEmpty(s) ? GARBAGE_COLLECT_DEFAULT : Boolean.parseBoolean(s.trim());
- s = get(properties, "gcThresh");
+ s = get(properties, GARBAGE_COLLECT_THRESH);
gcThresh = isNullOrEmpty(s) ? GARBAGE_COLLECT_THRESH_DEFAULT : Integer.parseInt(s.trim());
- s = get(properties, "allowExtraneousGroups");
+ s = get(properties, ALLOW_EXTRANEOUS_GROUPS);
allowExtraneousGroups = isNullOrEmpty(s) ? ALLOW_EXTRANEOUS_GROUPS_DEFAULT : Boolean.parseBoolean(s.trim());
} catch (Exception e) {
gcThresh = GARBAGE_COLLECT_THRESH_DEFAULT;
diff --git a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java
index e2ec57f..bddb7a0 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java
@@ -119,11 +119,11 @@
private boolean initiallyPersistent = false;
//TODO this is currently an experimental feature used for performance
- // evalutaion, enabling persistence with persist the intents but they will
+ // evaluation, enabling persistence with persist the intents but they will
// not be reinstalled and network state will not be consistent with the
// intents on cluster restart
- //@Property(name = "persistenceEnabled", boolValue = PERSIST,
- // label = "EXPERIMENTAL: Enable intent persistence")
+
+ /** EXPERIMENTAL: Enable intent persistence. */
private boolean persistenceEnabled = GIS_PERSISTENCE_ENABLED_DEFAULT;
@@ -218,7 +218,7 @@
Dictionary<?, ?> properties = context != null ? context.getProperties()
: new Properties();
try {
- String s = get(properties, "persistenceEnabled");
+ String s = get(properties, GIS_PERSISTENCE_ENABLED);
persistenceEnabled = isNullOrEmpty(s) ? PERSIST :
Boolean.parseBoolean(s.trim());
} catch (Exception e) {
diff --git a/core/store/dist/src/main/java/org/onosproject/store/packet/impl/DistributedPacketStore.java b/core/store/dist/src/main/java/org/onosproject/store/packet/impl/DistributedPacketStore.java
index b5b489a..50e8900 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/packet/impl/DistributedPacketStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/packet/impl/DistributedPacketStore.java
@@ -106,8 +106,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 = DPS_MESSAGE_HANDLER_THREAD_POOL_SIZE_DEFAULT;
private static final int MAX_BACKOFF = 50;
@@ -148,7 +147,7 @@
int newMessageHandlerThreadPoolSize;
try {
- String s = get(properties, "messageHandlerThreadPoolSize");
+ String s = get(properties, DPS_MESSAGE_HANDLER_THREAD_POOL_SIZE);
newMessageHandlerThreadPoolSize =
isNullOrEmpty(s) ? messageHandlerThreadPoolSize : Integer.parseInt(s.trim());
diff --git a/core/store/dist/src/main/java/org/onosproject/store/statistic/impl/DistributedFlowStatisticStore.java b/core/store/dist/src/main/java/org/onosproject/store/statistic/impl/DistributedFlowStatisticStore.java
index b430d37..a115995 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/statistic/impl/DistributedFlowStatisticStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/statistic/impl/DistributedFlowStatisticStore.java
@@ -106,8 +106,7 @@
private NodeId local;
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 = DFS_MESSAGE_HANDLER_THREAD_POOL_SIZE_DEFAULT;
@@ -152,7 +151,7 @@
int newMessageHandlerThreadPoolSize;
try {
- String s = get(properties, "messageHandlerThreadPoolSize");
+ String s = get(properties, DFS_MESSAGE_HANDLER_THREAD_POOL_SIZE);
newMessageHandlerThreadPoolSize =
isNullOrEmpty(s) ? messageHandlerThreadPoolSize : Integer.parseInt(s.trim());
diff --git a/core/store/dist/src/main/java/org/onosproject/store/statistic/impl/DistributedStatisticStore.java b/core/store/dist/src/main/java/org/onosproject/store/statistic/impl/DistributedStatisticStore.java
index 5e2f325..acf73fc 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/statistic/impl/DistributedStatisticStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/statistic/impl/DistributedStatisticStore.java
@@ -109,8 +109,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 = DSS_MESSAGE_HANDLER_THREAD_POOL_SIZE_DEFAULT;
private static final long STATISTIC_STORE_TIMEOUT_MILLIS = 3000;
@@ -156,7 +155,7 @@
int newMessageHandlerThreadPoolSize;
try {
- String s = get(properties, "messageHandlerThreadPoolSize");
+ String s = get(properties, DSS_MESSAGE_HANDLER_THREAD_POOL_SIZE);
newMessageHandlerThreadPoolSize =
isNullOrEmpty(s) ? messageHandlerThreadPoolSize : Integer.parseInt(s.trim());
diff --git a/core/store/dist/src/main/java/org/onosproject/store/topology/impl/DistributedTopologyStore.java b/core/store/dist/src/main/java/org/onosproject/store/topology/impl/DistributedTopologyStore.java
index fee5d8d..0ea6845 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/topology/impl/DistributedTopologyStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/topology/impl/DistributedTopologyStore.java
@@ -125,8 +125,7 @@
private static final String LINK_METRIC = "linkMetric";
private static final String GEO_DISTANCE = "geoDistance";
- //@Property(name = "linkWeightFunction", value = DEFAULT_LINK_WEIGHT_FUNCTION,
- // label = "Default link-weight function: hopCount, linkMetric, geoDistance")
+ /** Default link-weight function: hopCount, linkMetric, geoDistance. */
private String linkWeightFunction = LINK_WEIGHT_FUNCTION_DEFAULT;
// Cluster root to broadcast points bindings to allow convergence to
@@ -165,7 +164,7 @@
protected void modified(ComponentContext context) {
Dictionary<?, ?> properties = context.getProperties();
- String newLinkWeightFunction = get(properties, "linkWeightFunction");
+ String newLinkWeightFunction = get(properties, LINK_WEIGHT_FUNCTION);
if (newLinkWeightFunction != null &&
!Objects.equals(newLinkWeightFunction, linkWeightFunction)) {
linkWeightFunction = newLinkWeightFunction;