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";
}