Migrate users of Optional.get()

[ovsdb.git] / hwvtepsouthbound / hwvtepsouthbound-impl / src / main / java / org / opendaylight / ovsdb / hwvtepsouthbound / transact / DependentJob.java

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/DependentJob.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/DependentJob.java
index e35bed005d81082bd2c5b33624d48754b1812c77..4f7f6e7242c4c46636d30c2fee067d43f43ba40a 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/DependentJob.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/DependentJob.java
@@ -171,11 +171,11 @@ public abstract class DependentJob<T extends Identifiable> {
                 Optional<TypedBaseTable> latestDeviceStatus = deviceInfo.getConnectionInstance()
                         .getHwvtepTableReader().getHwvtepTableEntryUUID(cls, iid, controllerData.getUuid());
 
-                TypedBaseTable latestDeviceData = latestDeviceStatus.isPresent() ? latestDeviceStatus.get() : null;
+                TypedBaseTable latestDeviceData = latestDeviceStatus.orElse(null);
 
                 if (INTRANSIT_DATA_CREATED.test(controllerData, latestDeviceStatus)) {
                     LOG.info("Intransit expired key is actually created but update is missed/delayed {}", iid);
-                    deviceInfo.updateDeviceOperData(cls, iid, latestDeviceStatus.get().getUuid(), latestDeviceData);
+                    deviceInfo.updateDeviceOperData(cls, iid, latestDeviceData.getUuid(), latestDeviceData);
 
                 } else if (INTRANSIT_DATA_NOT_CREATED.test(controllerData, latestDeviceStatus)) {
                     LOG.info("Intransit expired key is actually not created but update is missed/delayed {}", iid);
@@ -189,7 +189,7 @@ public abstract class DependentJob<T extends Identifiable> {
                 } else if (INTRANSIT_DATA_NOT_DELETED.test(controllerData, latestDeviceStatus)) {
                     //not deleted from device we will reuse existing uuid
                     LOG.info("Intransit expired key is actually not deleted but update is missed/delayed {}", iid);
-                    deviceInfo.updateDeviceOperData(cls, iid, latestDeviceStatus.get().getUuid(), latestDeviceData);
+                    deviceInfo.updateDeviceOperData(cls, iid, latestDeviceData.getUuid(), latestDeviceData);
                 }
             } else if (DATA_INTRANSIT.test(controllerData)) {
                 //device status is still in transit