commit b5646e6f7a62849d87dceb660dd6f351386d48f1
author Ray Milkey <ray@opennetworking.org> Tue Oct 16 11:42:18 2018 -0700
committer Ray Milkey <ray@opennetworking.org> Tue Oct 16 18:52:22 2018 +0000
tree ead639417d573bb4190f84cbc78da6d221f5b211
parent 309f9a09445eec77046efc6a5f891e2ad757e1d8

Use property constants for OSGi components for stores

Change-Id: I5d21075abb453d5bc54e02653d5a96746e6a074e

core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedLeadershipStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedLeadershipStore.java b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedLeadershipStore.java
index 92ef75a..f8a07fb 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedLeadershipStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedLeadershipStore.java
@@ -54,12 +54,19 @@
 import static org.onlab.util.Tools.groupedThreads;
 import static org.osgi.service.component.annotations.ReferenceCardinality.MANDATORY;
 import static org.slf4j.LoggerFactory.getLogger;
+import static org.onosproject.store.OsgiPropertyConstants.*;
 
 /**
  * Implementation of {@code LeadershipStore} that makes use of a {@link LeaderElector}
  * primitive.
  */
-@Component(immediate = true, service = LeadershipStore.class)
+@Component(
+        immediate = true,
+        service = LeadershipStore.class,
+        property = {
+                ELECTION_TIMEOUT_MILLIS + "=" + ELECTION_TIMEOUT_MILLIS_DEFAULT
+        }
+)
 public class DistributedLeadershipStore
     extends AbstractStore<LeadershipEvent, LeadershipStoreDelegate>
     implements LeadershipStore {
@@ -83,10 +90,9 @@
     @Reference(cardinality = MANDATORY)
     protected UpgradeService upgradeService;
 
-    private static final long DEFAULT_ELECTION_TIMEOUT_MILLIS = 2500;
     //@Property(name = "electionTimeoutMillis", longValue = DEFAULT_ELECTION_TIMEOUT_MILLIS,
     //        label = "the leader election timeout in milliseconds")
-    private long electionTimeoutMillis = DEFAULT_ELECTION_TIMEOUT_MILLIS;
+    private long electionTimeoutMillis = ELECTION_TIMEOUT_MILLIS_DEFAULT;
 
     private ExecutorService statusChangeHandler;
     private NodeId localNodeId;
@@ -190,7 +196,7 @@
             newElectionTimeoutMillis = isNullOrEmpty(s) ? electionTimeoutMillis : Long.parseLong(s.trim());
         } catch (NumberFormatException | ClassCastException e) {
             log.warn("Malformed configuration detected; using defaults", e);
-            newElectionTimeoutMillis = DEFAULT_ELECTION_TIMEOUT_MILLIS;
+            newElectionTimeoutMillis = ELECTION_TIMEOUT_MILLIS_DEFAULT;
         }
 
         if (newElectionTimeoutMillis != electionTimeoutMillis) {