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/compiler/IntentConfigurableRegistrator.java

diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/IntentConfigurableRegistrator.java b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/IntentConfigurableRegistrator.java
index 14c2d83..97dd992 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/IntentConfigurableRegistrator.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/IntentConfigurableRegistrator.java
@@ -71,29 +71,19 @@
     @Reference(cardinality = ReferenceCardinality.MANDATORY)
     protected ComponentConfigService cfgService;
 
-    //@Property(name = "useFlowObjectives",
-    //        boolValue = DEFAULT_FLOW_OBJECTIVES,
-    //        label = "Indicates whether or not to use flow objective-based compilers")
+    /** Indicates whether or not to use flow objective-based compilers. */
     private boolean useFlowObjectives = ICR_USE_FLOW_OBJECTIVES_DEFAULT;
 
-    //@Property(name = "labelSelection",
-    //        value = DEFAULT_LABEL_SELECTION,
-    //        label = "Defines the label selection algorithm - RANDOM or FIRST_FIT")
+    /** Defines the label selection algorithm - RANDOM or FIRST_FIT. */
     private String labelSelection = ICR_LABEL_SELECTION_DEFAULT;
 
-    //@Property(name = "optLabelSelection",
-    //        value = DEFAULT_OPT_LABEL_SELECTION,
-    //        label = "Defines the optimization for label selection algorithm - NONE, NO_SWAP, MIN_SWAP")
+    /** Defines the optimization for label selection algorithm - NONE, NO_SWAP, MIN_SWAP. */
     private String optLabelSelection = ICR_OPT_LABEL_SELECTION_DEFAULT;
 
-    //@Property(name = "optimizeInstructions",
-    //        boolValue = DEFAULT_FLOW_OPTIMIZATION,
-    //        label = "Indicates whether or not to optimize the flows in the link collection compiler")
+    /** Indicates whether or not to optimize the flows in the link collection compiler. */
     private boolean optimizeInstructions = ICR_FLOW_OPTIMIZATION_DEFAULT;
 
-    //@Property(name = "useCopyTtl",
-    //        boolValue = DEFAULT_COPY_TTL,
-    //        label = "Indicates whether or not to use copy ttl in the link collection compiler")
+    /** Indicates whether or not to use copy ttl in the link collection compiler. */
     private boolean useCopyTtl = ICR_COPY_TTL_DEFAULT;
 
     private final Map<Class<Intent>, IntentCompiler<Intent>> flowRuleBased = Maps.newConcurrentMap();
@@ -127,7 +117,7 @@
 
         boolean newFlowObjectives;
         try {
-            String s = Tools.get(context.getProperties(), "useFlowObjectives");
+            String s = Tools.get(context.getProperties(), ICR_USE_FLOW_OBJECTIVES);
             newFlowObjectives = isNullOrEmpty(s) ? useFlowObjectives : Boolean.parseBoolean(s.trim());
         } catch (ClassCastException e) {
             newFlowObjectives = useFlowObjectives;
@@ -141,7 +131,7 @@
 
         String newLabelSelection;
         try {
-            String s = Tools.get(context.getProperties(), "labelSelection");
+            String s = Tools.get(context.getProperties(), ICR_LABEL_SELECTION);
             newLabelSelection = isNullOrEmpty(s) ? labelSelection : s.trim();
         } catch (ClassCastException e) {
             newLabelSelection = labelSelection;
@@ -156,7 +146,7 @@
         String newOptLabelSelection;
         try {
             // The optimization behavior provided by the user
-            String optLabelSelected = Tools.get(context.getProperties(), "optLabelSelection");
+            String optLabelSelected = Tools.get(context.getProperties(), ICR_OPT_LABEL_SELECTION);
             // Parse the content of the string
             newOptLabelSelection = isNullOrEmpty(optLabelSelected) ? optLabelSelection : optLabelSelected.trim();
         } catch (ClassCastException e) {
@@ -171,7 +161,7 @@
 
         boolean newFlowOptimization;
         try {
-            String s = Tools.get(context.getProperties(), "useFlowOptimization");
+            String s = Tools.get(context.getProperties(), ICR_FLOW_OPTIMIZATION);
             newFlowOptimization = isNullOrEmpty(s) ? optimizeInstructions : Boolean.parseBoolean(s.trim());
         } catch (ClassCastException e) {
             newFlowOptimization = optimizeInstructions;
@@ -185,7 +175,7 @@
 
         boolean newCopyTtl;
         try {
-            String s = Tools.get(context.getProperties(), "useCopyTtl");
+            String s = Tools.get(context.getProperties(), ICR_COPY_TTL);
             newCopyTtl = isNullOrEmpty(s) ? useCopyTtl : Boolean.parseBoolean(s.trim());
         } catch (ClassCastException e) {
             newCopyTtl = useCopyTtl;