commit 4694e0618f484c26e792cff36869aa065ac87055
author Ray Milkey <ray@opennetworking.org> Wed Oct 31 13:17:18 2018 -0700
committer Ray Milkey <ray@opennetworking.org> Wed Oct 31 13:17:48 2018 -0700
tree b00358fc7738542debfa13efecb6cc99d6a562ad
parent 2069565d120279f4f29ea71c4cd61af7a94b7cdb

OSGi property annotations for remaining apps

Change-Id: I5f87ebeb65eb85ee7161e35a838d9275fde22787

apps/newoptical/src/main/java/org/onosproject/newoptical/OpticalPathProvisioner.java

diff --git a/apps/newoptical/src/main/java/org/onosproject/newoptical/OpticalPathProvisioner.java b/apps/newoptical/src/main/java/org/onosproject/newoptical/OpticalPathProvisioner.java
index 19edcbc..59ee3d9 100644
--- a/apps/newoptical/src/main/java/org/onosproject/newoptical/OpticalPathProvisioner.java
+++ b/apps/newoptical/src/main/java/org/onosproject/newoptical/OpticalPathProvisioner.java
@@ -107,12 +107,20 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 import static org.onosproject.net.LinkKey.linkKey;
 import static org.onosproject.net.optical.device.OpticalDeviceServiceView.opticalView;
+import static org.onosproject.newoptical.OsgiPropertyConstants.MAX_PATHS;
+import static org.onosproject.newoptical.OsgiPropertyConstants.MAX_PATHS_DEFAULT;
 
 /**
  * Main component to configure optical connectivity.
  */
 @Beta
-@Component(immediate = true, service = OpticalPathService.class)
+@Component(
+    immediate = true,
+    service = OpticalPathService.class,
+    property = {
+        MAX_PATHS + ":Integer=" + MAX_PATHS_DEFAULT
+    }
+)
 public class OpticalPathProvisioner
         extends AbstractListenerManager<OpticalPathEvent, OpticalPathListener>
         implements OpticalPathService {
@@ -159,11 +167,8 @@
     @Reference(cardinality = ReferenceCardinality.MANDATORY)
     protected ResourceService resourceService;
 
-    private static final String MAX_PATHS = "maxPaths";
-    private static final int DEFAULT_MAX_PATHS = 10;
-    //@Property(name = MAX_PATHS, intValue = DEFAULT_MAX_PATHS,
-    //        label = "Maximum number of paths to consider for path provisioning")
-    private int maxPaths = DEFAULT_MAX_PATHS;
+    /** Maximum number of paths to consider for path provisioning. */
+    private int maxPaths = MAX_PATHS_DEFAULT;
 
     private ApplicationId appId;
 
@@ -262,7 +267,7 @@
      */
     private void readComponentConfiguration(ComponentContext context) {
         Dictionary<?, ?> properties = context.getProperties();
-        maxPaths = Tools.getIntegerProperty(properties, MAX_PATHS, DEFAULT_MAX_PATHS);
+        maxPaths = Tools.getIntegerProperty(properties, MAX_PATHS, MAX_PATHS_DEFAULT);
         log.info("Configured. Maximum paths to consider is configured to {}", maxPaths);
     }