Add new revision for pcep types model

[bgpcep.git] / pcep / pcc-mock / src / main / java / org / opendaylight / protocol / pcep / pcc / mock / PCCSyncOptimization.java

diff --git a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCSyncOptimization.java b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCSyncOptimization.java
index 0705b4aa55194f4e398784df89ed5d03572ffdbb..796cef1bc1f6510b7e5c89905468f76eb1f0b645 100644 (file)
--- a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCSyncOptimization.java
+++ b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCSyncOptimization.java
@@ -8,16 +8,17 @@
 
 package org.opendaylight.protocol.pcep.pcc.mock;
 
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import java.math.BigInteger;
+import java.util.Optional;
 import javax.annotation.Nonnull;
 import org.opendaylight.protocol.pcep.pcc.mock.api.PCCSession;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Stateful1;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Tlvs3;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.lsp.db.version.tlv.LspDbVersion;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.Tlvs1;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.open.object.open.Tlvs;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Stateful1;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Tlvs3;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.lsp.db.version.tlv.LspDbVersion;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.Tlvs1;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.object.open.Tlvs;
 
 final class PCCSyncOptimization {
     private final boolean dbVersionMatch;
@@ -30,38 +31,38 @@ final class PCCSyncOptimization {
     private BigInteger lspDBVersion = BigInteger.ONE;
     private Boolean resynchronizing = Boolean.FALSE;
 
-    public PCCSyncOptimization(@Nonnull final PCCSession session) {
-        Preconditions.checkNotNull(session);
+    PCCSyncOptimization(@Nonnull final PCCSession session) {
+        requireNonNull(session);
         final Tlvs remote = session.getRemoteTlvs();
         final Tlvs local = session.localSessionCharacteristics();
         this.localLspDbVersion = getLspDbVersion(local);
         this.remoteLspDbVersion = getLspDbVersion(remote);
-        this.dbVersionMatch = compareLspDbVersion(localLspDbVersion, remoteLspDbVersion);
+        this.dbVersionMatch = compareLspDbVersion(this.localLspDbVersion, this.remoteLspDbVersion);
         this.isSyncAvoidanceEnabled = isSyncAvoidance(local) && isSyncAvoidance(remote);
         this.isDeltaSyncEnabled = isDeltaSync(local) && isDeltaSync(remote);
-        this.isTriggeredInitialSynEnable = isTriggeredInitialSync(local) && isTriggeredInitialSync(remote) &&
-            (this.isDeltaSyncEnabled || this.isSyncAvoidanceEnabled);
+        this.isTriggeredInitialSynEnable = isTriggeredInitialSync(local) && isTriggeredInitialSync(remote)
+                && (this.isDeltaSyncEnabled || this.isSyncAvoidanceEnabled);
         this.isTriggeredReSyncEnable = isTriggeredReSync(local) && isTriggeredReSync(remote);
     }
 
     public boolean doesLspDbMatch() {
-        return dbVersionMatch;
+        return this.dbVersionMatch;
     }
 
     public boolean isSyncAvoidanceEnabled() {
-        return isSyncAvoidanceEnabled;
+        return this.isSyncAvoidanceEnabled;
     }
 
     public boolean isDeltaSyncEnabled() {
-        return isDeltaSyncEnabled;
+        return this.isDeltaSyncEnabled;
     }
 
     public boolean isTriggeredInitSyncEnabled() {
-        return isTriggeredInitialSynEnable;
+        return this.isTriggeredInitialSynEnable;
     }
 
     public boolean isTriggeredReSyncEnabled() {
-        return isTriggeredReSyncEnable;
+        return this.isTriggeredReSyncEnable;
     }
 
     public BigInteger getLocalLspDbVersionValue() {
@@ -78,16 +79,9 @@ final class PCCSyncOptimization {
         return this.remoteLspDbVersion.getLspDbVersionValue();
     }
 
-    public boolean isRemoteLspDbVersionNull() {
-        if (this.remoteLspDbVersion == null) {
-            return true;
-        }
-        return false;
-    }
-
     private static LspDbVersion getLspDbVersion(final Tlvs openTlvs) {
         if (openTlvs != null) {
-            final Tlvs3 tlvs3 = openTlvs.getAugmentation(Tlvs3.class);
+            final Tlvs3 tlvs3 = openTlvs.augmentation(Tlvs3.class);
             if (tlvs3 != null && tlvs3.getLspDbVersion() != null
                 && tlvs3.getLspDbVersion().getLspDbVersionValue() != null) {
                 return tlvs3.getLspDbVersion();
@@ -105,9 +99,9 @@ final class PCCSyncOptimization {
 
     private static Stateful1 getStateful1(final Tlvs openTlvs) {
         if (openTlvs != null) {
-            final Tlvs1 tlvs1 = openTlvs.getAugmentation(Tlvs1.class);
+            final Tlvs1 tlvs1 = openTlvs.augmentation(Tlvs1.class);
             if (tlvs1 != null && tlvs1.getStateful() != null) {
-                return tlvs1.getStateful().getAugmentation(Stateful1.class);
+                return tlvs1.getStateful().augmentation(Stateful1.class);
             }
         }
         return null;
@@ -147,7 +141,7 @@ final class PCCSyncOptimization {
 
     public Optional<BigInteger> incrementLspDBVersion() {
         if (!isSyncAvoidanceEnabled()) {
-            return Optional.absent();
+            return Optional.empty();
         } else if (isSyncNeedIt() && getLocalLspDbVersionValue() != null && !this.resynchronizing) {
             this.lspDBVersion = getLocalLspDbVersionValue();
             return Optional.of(this.lspDBVersion);