Fix FindBugs warnings in sal-distributed-datastore and enable enforcement

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / main / java / org / opendaylight / controller / cluster / datastore / CohortEntry.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/CohortEntry.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/CohortEntry.java
index f585bb66c35a985c12fd73a0b83dedf91a10f62b..84535b593eebb5da9b4df5f7353336ed5b287cd2 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/CohortEntry.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/CohortEntry.java
@@ -21,7 +21,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification
 
 final class CohortEntry {
     private final ReadWriteShardDataTreeTransaction transaction;
-    private final TransactionIdentifier transactionID;
+    private final TransactionIdentifier transactionId;
     private final short clientVersion;
 
     private RuntimeException lastBatchedModificationsException;
@@ -33,13 +33,13 @@ final class CohortEntry {
 
     private CohortEntry(final ReadWriteShardDataTreeTransaction transaction, final short clientVersion) {
         this.transaction = Preconditions.checkNotNull(transaction);
-        this.transactionID = transaction.getId();
+        this.transactionId = transaction.getId();
         this.clientVersion = clientVersion;
     }
 
     private CohortEntry(final ShardDataTreeCohort cohort, final short clientVersion) {
         this.cohort = Preconditions.checkNotNull(cohort);
-        this.transactionID = cohort.getIdentifier();
+        this.transactionId = cohort.getIdentifier();
         this.transaction = null;
         this.clientVersion = clientVersion;
     }
@@ -52,8 +52,8 @@ final class CohortEntry {
         return new CohortEntry(cohort, clientVersion);
     }
 
-    TransactionIdentifier getTransactionID() {
-        return transactionID;
+    TransactionIdentifier getTransactionId() {
+        return transactionId;
     }
 
     short getClientVersion() {
@@ -118,7 +118,7 @@ final class CohortEntry {
 
         if (cohortDecorator != null) {
             // Call the hook for unit tests.
-            cohort = cohortDecorator.decorate(transactionID, cohort);
+            cohort = cohortDecorator.decorate(transactionId, cohort);
         }
     }
 
@@ -149,7 +149,7 @@ final class CohortEntry {
     @Override
     public String toString() {
         final StringBuilder builder = new StringBuilder();
-        builder.append("CohortEntry [transactionID=").append(transactionID).append(", doImmediateCommit=")
+        builder.append("CohortEntry [transactionId=").append(transactionId).append(", doImmediateCommit=")
                 .append(doImmediateCommit).append("]");
         return builder.toString();
     }