commit 00b5d4fee0d26e5e1e71d442a93f23a5033f7560
author Thomas Vachuska <tom@opennetworking.org> Tue Oct 30 15:13:20 2018 -0700
committer Thomas Vachuska <tom@opennetworking.org> Tue Oct 30 23:43:55 2018 +0000
tree bd77201d0a23f44ec46efcde6b8d88d6e09e5122
parent f566fa25034690f76477102c09822bff43c9f3f2

Removing commented out @Property annotations from the drivers, protocols, pipelines and providers.

Change-Id: I4cabc5a53c93b778824c72cebbce0ec49700eade

drivers/bmv2/src/main/java/org/onosproject/drivers/bmv2/ctl/Bmv2PreControllerImpl.java

diff --git a/drivers/bmv2/src/main/java/org/onosproject/drivers/bmv2/ctl/Bmv2PreControllerImpl.java b/drivers/bmv2/src/main/java/org/onosproject/drivers/bmv2/ctl/Bmv2PreControllerImpl.java
index f9661f2..bc0aa47 100644
--- a/drivers/bmv2/src/main/java/org/onosproject/drivers/bmv2/ctl/Bmv2PreControllerImpl.java
+++ b/drivers/bmv2/src/main/java/org/onosproject/drivers/bmv2/ctl/Bmv2PreControllerImpl.java
@@ -50,7 +50,7 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static java.lang.String.format;
-import static org.onosproject.drivers.bmv2.ctl.OsgiPropertyDefaults.*;
+import static org.onosproject.drivers.bmv2.ctl.OsgiPropertyConstants.*;
 import static org.slf4j.LoggerFactory.getLogger;
 
 /**
@@ -58,9 +58,9 @@
  */
 @Component(immediate = true, service = Bmv2PreController.class,
         property = {
-                "numConnectionRetries:Integer=" + NUM_CONNECTION_RETRIES_DEFAULT,
-                "timeBetweenRetries:Integer=" + TIME_BETWEEN_RETRIES_DEFAULT,
-                "deviceLockWaitingTime:Integer=" + DEVICE_LOCK_WAITING_TIME_IN_SEC_DEFAULT,
+                 NUM_CONNECTION_RETRIES + ":Integer=" + NUM_CONNECTION_RETRIES_DEFAULT,
+                TIME_BETWEEN_RETRIES + ":Integer=" + TIME_BETWEEN_RETRIES_DEFAULT,
+                DEVICE_LOCK_WAITING_TIME_IN_SEC + ":Integer=" + DEVICE_LOCK_WAITING_TIME_IN_SEC_DEFAULT,
         })
 public class Bmv2PreControllerImpl implements Bmv2PreController {
 
@@ -79,14 +79,14 @@
             });
     @Reference(cardinality = ReferenceCardinality.MANDATORY)
     protected ComponentConfigService cfgService;
-    //@Property(name = "numConnectionRetries", intValue = DEFAULT_NUM_CONNECTION_RETRIES,
-    //        label = "Number of connection retries after a network error")
+
+    /** Number of connection retries after a network error. */
     private int numConnectionRetries = NUM_CONNECTION_RETRIES_DEFAULT;
-    //@Property(name = "timeBetweenRetries", intValue = DEFAULT_TIME_BETWEEN_RETRIES,
-    //        label = "Time between retries in milliseconds")
+
+    /** Time between retries in milliseconds. */
     private int timeBetweenRetries = TIME_BETWEEN_RETRIES_DEFAULT;
-    //@Property(name = "deviceLockWaitingTime", intValue = DEVICE_LOCK_WAITING_TIME_IN_SEC,
-    //        label = "Waiting time for a read/write lock in seconds")
+
+    /** Waiting time for a read/write lock in seconds. */
     private int deviceLockWaitingTime = DEVICE_LOCK_WAITING_TIME_IN_SEC_DEFAULT;
 
     @Activate