Move type specifiers from property name constants to the corresponding component annotations
Change-Id: Id5e3b669721ecf076a010cc4783b9e6b33e6fca0
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 4a9d041..71f6f87 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
@@ -25,82 +25,67 @@
//@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:Integer";
+ 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:Integer";
+ 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:Integer";
+ 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:Boolean";
+ public static final String EC_FLOW_RULE_STORE_PERSISTENCE_ENABLED = "ECFlowRuleStorePersistenceEnabled";
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:Integer";
+ public static final String MAX_BACKUP_COUNT = "backupCount";
public static final int MAX_BACKUP_COUNT_DEFAULT = 2;
- //@Property(name = "heartbeatInterval", intValue = DEFAULT_HEARTBEAT_INTERVAL,
- // label = "Interval time to send heartbeat to other controller nodes (millisecond)")
- public static final String HEARTBEAT_INTERVAL = "heartbeatInterval:Integer";
- public static final int HEARTBEAT_INTERVAL_DEFAULT = 100;
-
- //@Property(name = "phiFailureThreshold", intValue = DEFAULT_PHI_FAILURE_THRESHOLD,
- // label = "the value of Phi threshold to detect accrual failure")
- public static final String PHI_FAILURE_THRESHOLD = "phiFailureThreshold:Integer";
- public static final int PHI_FAILURE_THRESHOLD_DEFAULT = 10;
-
- //@Property(name = "minStandardDeviationMillis", longValue = DEFAULT_MIN_STANDARD_DEVIATION_MILLIS,
- // label = "The minimum standard deviation to take into account when computing the Phi value")
- public static final String MIN_STANDARD_DEVIATION_MILLIS = "minStandardDeviationMillis:Long";
- public static final long MIN_STANDARD_DEVIATION_MILLIS_DEFAULT = 50;
-
//@Property(name = "electionTimeoutMillis", longValue = DEFAULT_ELECTION_TIMEOUT_MILLIS,
// label = "the leader election timeout in milliseconds")
- public static final String ELECTION_TIMEOUT_MILLIS = "electionTimeoutMillis:Long";
+ 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:Boolean";
+ 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:Integer";
+ 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:Boolean";
+ public static final String ALLOW_EXTRANEOUS_GROUPS = "garbageCollect";
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:Boolean";
+ public static final String GIS_PERSISTENCE_ENABLED = "GISPersistenceEnabled";
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:Integer";
+ public static final String DPS_MESSAGE_HANDLER_THREAD_POOL_SIZE = "DPSMessageHandlerThreadPoolSize";
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:Integer";
+ public static final String DFS_MESSAGE_HANDLER_THREAD_POOL_SIZE = "DFSMessageHandlerThreadPoolSize";
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:Integer";
+ public static final String DSS_MESSAGE_HANDLER_THREAD_POOL_SIZE = "DFSMessageHandlerThreadPoolSize";
public static final int DSS_MESSAGE_HANDLER_THREAD_POOL_SIZE_DEFAULT = 4;
//@Property(name = "linkWeightFunction", value = DEFAULT_LINK_WEIGHT_FUNCTION,
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 f8a07fb..171e146 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
@@ -64,7 +64,7 @@
immediate = true,
service = LeadershipStore.class,
property = {
- ELECTION_TIMEOUT_MILLIS + "=" + ELECTION_TIMEOUT_MILLIS_DEFAULT
+ ELECTION_TIMEOUT_MILLIS + ":Long=" + ELECTION_TIMEOUT_MILLIS_DEFAULT
}
)
public class DistributedLeadershipStore
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 89758c4..50c68a2 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
@@ -114,11 +114,11 @@
immediate = true,
service = FlowRuleStore.class,
property = {
- MESSAGE_HANDLER_THREAD_POOL_SIZE + "=" + MESSAGE_HANDLER_THREAD_POOL_SIZE_DEFAULT,
- BACKUP_PERIOD_MILLIS + "=" + BACKUP_PERIOD_MILLIS_DEFAULT,
- ANTI_ENTROPY_PERIOD_MILLIS + "=" + ANTI_ENTROPY_PERIOD_MILLIS_DEFAULT,
- EC_FLOW_RULE_STORE_PERSISTENCE_ENABLED + "=" + EC_FLOW_RULE_STORE_PERSISTENCE_ENABLED_DEFAULT,
- MAX_BACKUP_COUNT + "=" + MAX_BACKUP_COUNT_DEFAULT
+ MESSAGE_HANDLER_THREAD_POOL_SIZE + ":Integer=" + MESSAGE_HANDLER_THREAD_POOL_SIZE_DEFAULT,
+ BACKUP_PERIOD_MILLIS + ":Integer=" + BACKUP_PERIOD_MILLIS_DEFAULT,
+ ANTI_ENTROPY_PERIOD_MILLIS + ":Integer=" + ANTI_ENTROPY_PERIOD_MILLIS_DEFAULT,
+ EC_FLOW_RULE_STORE_PERSISTENCE_ENABLED + ":Boolean=" + EC_FLOW_RULE_STORE_PERSISTENCE_ENABLED_DEFAULT,
+ MAX_BACKUP_COUNT + ":Integer=" + MAX_BACKUP_COUNT_DEFAULT
}
)
public class ECFlowRuleStore
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 27d8ed7..03f9e3f 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
@@ -109,9 +109,9 @@
immediate = true,
service = GroupStore.class,
property = {
- GARBAGE_COLLECT + "=" + GARBAGE_COLLECT_DEFAULT,
- GARBAGE_COLLECT_THRESH + "=" + GARBAGE_COLLECT_THRESH_DEFAULT,
- ALLOW_EXTRANEOUS_GROUPS + "=" + ALLOW_EXTRANEOUS_GROUPS_DEFAULT
+ GARBAGE_COLLECT + ":Boolean=" + GARBAGE_COLLECT_DEFAULT,
+ GARBAGE_COLLECT_THRESH + ":Integer=" + GARBAGE_COLLECT_THRESH_DEFAULT,
+ ALLOW_EXTRANEOUS_GROUPS + ":Boolean=" + ALLOW_EXTRANEOUS_GROUPS_DEFAULT
}
)
public class DistributedGroupStore
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 b8bf434..e2ec57f 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
@@ -78,7 +78,7 @@
immediate = true,
service = IntentStore.class,
property = {
- GIS_PERSISTENCE_ENABLED + "=" + GIS_PERSISTENCE_ENABLED_DEFAULT
+ GIS_PERSISTENCE_ENABLED + ":Boolean=" + GIS_PERSISTENCE_ENABLED_DEFAULT
}
)
public class GossipIntentStore
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 729839b..b5b489a 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
@@ -71,7 +71,7 @@
immediate = true,
service = PacketStore.class,
property = {
- DPS_MESSAGE_HANDLER_THREAD_POOL_SIZE + "=" + DPS_MESSAGE_HANDLER_THREAD_POOL_SIZE_DEFAULT
+ DPS_MESSAGE_HANDLER_THREAD_POOL_SIZE + ":Integer=" + DPS_MESSAGE_HANDLER_THREAD_POOL_SIZE_DEFAULT
}
)
public class DistributedPacketStore
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 6a920bc..b430d37 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
@@ -72,7 +72,7 @@
immediate = true,
service = FlowStatisticStore.class,
property = {
- DFS_MESSAGE_HANDLER_THREAD_POOL_SIZE + "=" + DFS_MESSAGE_HANDLER_THREAD_POOL_SIZE_DEFAULT
+ DFS_MESSAGE_HANDLER_THREAD_POOL_SIZE + ":Integer=" + DFS_MESSAGE_HANDLER_THREAD_POOL_SIZE_DEFAULT
}
)
public class DistributedFlowStatisticStore implements FlowStatisticStore {
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 d9902fe..5e2f325 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
@@ -72,7 +72,7 @@
immediate = true,
service = StatisticStore.class,
property = {
- DSS_MESSAGE_HANDLER_THREAD_POOL_SIZE + "=" + DSS_MESSAGE_HANDLER_THREAD_POOL_SIZE_DEFAULT
+ DSS_MESSAGE_HANDLER_THREAD_POOL_SIZE + ":Integer=" + DSS_MESSAGE_HANDLER_THREAD_POOL_SIZE_DEFAULT
}
)
public class DistributedStatisticStore implements StatisticStore {