Removing commented out @Property annotations from the core.
Change-Id: I336f6a21db531187b8e2fcfb51e7da315c615771
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;