commit f566fa25034690f76477102c09822bff43c9f3f2
author Thomas Vachuska <tom@opennetworking.org> Tue Oct 30 14:03:36 2018 -0700
committer Thomas Vachuska <tom@opennetworking.org> Tue Oct 30 23:43:48 2018 +0000
tree 8ec0babce611656d8f1cb5c4b4f0399cbe3895b1
parent 2110e4cb4ab202df42a4570df262220a3bd39aec

Removing commented out @Property annotations from the core.

Change-Id: I336f6a21db531187b8e2fcfb51e7da315c615771

core/net/src/main/java/org/onosproject/net/intent/impl/IntentCleanup.java

diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentCleanup.java b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentCleanup.java
index 37e6be8..d41439e 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentCleanup.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentCleanup.java
@@ -74,21 +74,16 @@
     // Logical timeout for stuck Intents in INSTALLING or WITHDRAWING. The unit is seconds
     private static final int INSTALLING_WITHDRAWING_PERIOD = 120;
 
-
-
-
-    //@Property(name = "enabled", boolValue = true,
-    //          label = "Enables/disables the intent cleanup component")
-    private boolean enabled = ICU_ENABLED_DEFAULT;
-
-    //@Property(name = "period", intValue = DEFAULT_PERIOD,
-    //          label = "Frequency in ms between cleanup runs")
-    protected int period = ICU_PERIOD_DEFAULT;
     private long periodMs;
     private long periodMsForStuck;
 
-    //@Property(name = "retryThreshold", intValue = DEFAULT_THRESHOLD,
-    //        label = "Number of times to retry CORRUPT intent without delay")
+    /** Enables/disables the intent cleanup component. */
+    private boolean enabled = ICU_ENABLED_DEFAULT;
+
+    /** Frequency in ms between cleanup runs. */
+    protected int period = ICU_PERIOD_DEFAULT;
+
+    /** Number of times to retry CORRUPT intent without delay. */
     protected int retryThreshold = ICU_RETRY_THRESHOLD_DEFAULT;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY)
@@ -131,13 +126,13 @@
         int newPeriod;
         boolean newEnabled;
         try {
-            String s = get(properties, "period");
+            String s = get(properties, ICU_PERIOD);
             newPeriod = isNullOrEmpty(s) ? period : Integer.parseInt(s.trim());
 
-            s = get(properties, "retryThreshold");
+            s = get(properties, ICU_RETRY_THRESHOLD);
             retryThreshold = isNullOrEmpty(s) ? retryThreshold : Integer.parseInt(s.trim());
 
-            s = get(properties, "enabled");
+            s = get(properties, ICU_ENABLED);
             newEnabled = isNullOrEmpty(s) ? enabled : Boolean.parseBoolean(s.trim());
         } catch (NumberFormatException e) {
             log.warn(e.getMessage());