From: Robert Varga Date: Sun, 23 Apr 2023 11:24:38 +0000 (+0200) Subject: Migrate users of Optional.get() X-Git-Tag: release/argon-sr1~2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=15b576cdf8f7abe67343053f8f6109070515dd6d;p=ovsdb.git Migrate users of Optional.get() Modernizer is flaggin callers, use better alternatives. Change-Id: I79b3a5c64e28b2fd5a8de5b6010cfe7b1d38719b Signed-off-by: Robert Varga --- diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepConnectionManager.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepConnectionManager.java index 21ead14ef..041efecc8 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepConnectionManager.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepConnectionManager.java @@ -317,7 +317,7 @@ public class HwvtepConnectionManager implements OvsdbConnectionListener, AutoClo public HwvtepConnectionInstance getConnectionInstance(final HwvtepPhysicalSwitchAttributes node) { Optional optional = HwvtepSouthboundUtil.getManagingNode(db, node); if (optional.isPresent()) { - return getConnectionInstance(optional.get().getConnectionInfo()); + return getConnectionInstance(optional.orElseThrow().getConnectionInfo()); } else { return null; } @@ -431,7 +431,7 @@ public class HwvtepConnectionManager implements OvsdbConnectionListener, AutoClo java.util.Optional ownershipStateOpt = entityOwnershipService.getOwnershipState(candidateEntity); if (ownershipStateOpt.isPresent()) { - EntityOwnershipState ownershipState = ownershipStateOpt.get(); + EntityOwnershipState ownershipState = ownershipStateOpt.orElseThrow(); putConnectionInstance(hwvtepConnectionInstance.getMDConnectionInfo(), hwvtepConnectionInstance); if (ownershipState != EntityOwnershipState.NO_OWNER) { hwvtepConnectionInstance.setHasDeviceOwnership(ownershipState == EntityOwnershipState.IS_OWNER); @@ -561,7 +561,7 @@ public class HwvtepConnectionManager implements OvsdbConnectionListener, AutoClo @Override public void onSuccess(final Optional node) { if (node.isPresent()) { - HwvtepGlobalAugmentation augmentation = node.get() + HwvtepGlobalAugmentation augmentation = node.orElseThrow() .augmentation(HwvtepGlobalAugmentation.class); if (augmentation == null || augmentation.getConnectionInfo() == null) { return; diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepSouthboundUtil.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepSouthboundUtil.java index 27e2435d1..54a75049f 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepSouthboundUtil.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepSouthboundUtil.java @@ -174,7 +174,7 @@ public final class HwvtepSouthboundUtil { Optional optional = new MdsalUtils(db).readOptional(LogicalDatastoreType.OPERATIONAL, path); if (optional != null && optional.isPresent()) { HwvtepGlobalAugmentation hwvtepNode = null; - Node node = optional.get(); + Node node = optional.orElseThrow(); if (node instanceof HwvtepGlobalAugmentation) { hwvtepNode = (HwvtepGlobalAugmentation) node; } else if (node != null) { diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepTableReader.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepTableReader.java index 46bb1bfe7..a93ff20eb 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepTableReader.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepTableReader.java @@ -189,10 +189,9 @@ public class HwvtepTableReader { public UUID getLsUuid(InstanceIdentifier lsIid) { UUID lsUUID = connectionInstance.getDeviceInfo().getUUID(LogicalSwitches.class, lsIid); if (lsUUID == null) { - Optional optional = - getHwvtepTableEntryUUID(LogicalSwitches.class, lsIid, null); + Optional optional = getHwvtepTableEntryUUID(LogicalSwitches.class, lsIid, null); if (optional.isPresent()) { - lsUUID = optional.get().getUuid(); + return optional.orElseThrow().getUuid(); } } return lsUUID; diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/configuration/HwvtepReconciliationTask.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/configuration/HwvtepReconciliationTask.java index 00580fafa..132756425 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/configuration/HwvtepReconciliationTask.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/configuration/HwvtepReconciliationTask.java @@ -10,7 +10,6 @@ package org.opendaylight.ovsdb.hwvtepsouthbound.reconciliation.configuration; import java.util.ArrayList; import java.util.Collection; import java.util.Map; -import java.util.Optional; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.DataTreeModification; import org.opendaylight.mdsal.binding.api.ReadTransaction; @@ -106,10 +105,6 @@ public class HwvtepReconciliationTask extends ReconciliationTask { private static Node readNode(ReadTransaction transaction, LogicalDatastoreType logicalDatastoreType, InstanceIdentifier iid) { - Optional optional = HwvtepSouthboundUtil.readNode(transaction, logicalDatastoreType, iid); - if (optional.isPresent()) { - return optional.get(); - } - return null; + return HwvtepSouthboundUtil.readNode(transaction, logicalDatastoreType, iid).orElse(null); } } diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/AbstractTransactCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/AbstractTransactCommand.java index 2422712b6..c5b014da6 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/AbstractTransactCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/AbstractTransactCommand.java @@ -18,6 +18,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; import org.eclipse.jdt.annotation.NonNull; @@ -443,11 +444,11 @@ public abstract class AbstractTransactCommand & DataOb HwvtepDeviceInfo.DeviceData deviceData = getDeviceOpData(cls, key); if (deviceData == null) { LOG.debug("Could not find data for key {}", getNodeKeyStr(key)); - java.util.Optional optional = - getTableReader().getHwvtepTableEntryUUID(cls, key, null); + Optional optional = getTableReader().getHwvtepTableEntryUUID(cls, key, null); if (optional.isPresent()) { + TypedBaseTable table = optional.orElseThrow(); LOG.debug("Found the data for key from device {} ", getNodeKeyStr(key)); - getDeviceInfo().updateDeviceOperData(cls, key, optional.get().getUuid(), optional.get()); + getDeviceInfo().updateDeviceOperData(cls, key, table.getUuid(), table); return getDeviceOpData(cls, key); } else { LOG.info("Could not Find the data for key from device {} ", getNodeKeyStr(key)); 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 e35bed005..4f7f6e724 100644 --- 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 { Optional 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 { } 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 diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/HwvtepOperationalState.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/HwvtepOperationalState.java index afe4c7a40..8bb0626cf 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/HwvtepOperationalState.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/HwvtepOperationalState.java @@ -105,7 +105,7 @@ public class HwvtepOperationalState { Optional readNode = new MdsalUtils(db).readOptional(LogicalDatastoreType.OPERATIONAL, connectionInstance.getInstanceIdentifier()); if (readNode.isPresent()) { - operationalNodes.put(connectionInstance.getInstanceIdentifier(), readNode.get()); + operationalNodes.put(connectionInstance.getInstanceIdentifier(), readNode.orElseThrow()); } } @@ -145,20 +145,19 @@ public class HwvtepOperationalState { //for example, when creating physical port, logical switch is needed //but logical switch is in HwvtepGlobalAugmentation rather than PhysicalSwitchAugmentation if (readNode.isPresent()) { - operationalNodes.put(entry.getKey(), readNode.get()); - HwvtepGlobalAugmentation hgAugmentation = - readNode.get().augmentation(HwvtepGlobalAugmentation.class); - PhysicalSwitchAugmentation psAugmentation = - readNode.get().augmentation(PhysicalSwitchAugmentation.class); - if (hgAugmentation != null && hgAugmentation.getSwitches() != null) { - for (Switches pswitch : hgAugmentation.getSwitches().values()) { + Node rdNode = readNode.orElseThrow(); + operationalNodes.put(entry.getKey(), rdNode); + HwvtepGlobalAugmentation hgAugmentation = rdNode.augmentation(HwvtepGlobalAugmentation.class); + PhysicalSwitchAugmentation psAugmentation = rdNode.augmentation(PhysicalSwitchAugmentation.class); + if (hgAugmentation != null) { + for (Switches pswitch : hgAugmentation.nonnullSwitches().values()) { @SuppressWarnings("unchecked") InstanceIdentifier psNodeIid = (InstanceIdentifier) pswitch.getSwitchRef().getValue(); Optional psNode = new MdsalUtils(db).readOptional(LogicalDatastoreType.OPERATIONAL, psNodeIid); if (psNode.isPresent()) { - operationalNodes.put(psNodeIid, psNode.get()); + operationalNodes.put(psNodeIid, psNode.orElseThrow()); } } } @@ -169,7 +168,7 @@ public class HwvtepOperationalState { Optional hgNode = new MdsalUtils(db).readOptional( LogicalDatastoreType.OPERATIONAL, hgNodeIid); if (hgNode.isPresent()) { - operationalNodes.put(hgNodeIid, hgNode.get()); + operationalNodes.put(hgNodeIid, hgNode.orElseThrow()); } } } @@ -183,40 +182,25 @@ public class HwvtepOperationalState { } public Optional getHwvtepGlobalAugmentation(final InstanceIdentifier iid) { - Optional nodeOptional = getGlobalNode(requireNonNull(iid)); - if (nodeOptional.isPresent()) { - return Optional.ofNullable(nodeOptional.get().augmentation(HwvtepGlobalAugmentation.class)); - } - return Optional.empty(); + return getGlobalNode(requireNonNull(iid)) + .flatMap(node -> Optional.ofNullable(node.augmentation(HwvtepGlobalAugmentation.class))); } public Optional getPhysicalSwitchAugmentation(final InstanceIdentifier iid) { - Optional nodeOptional = getGlobalNode(requireNonNull(iid)); - if (nodeOptional.isPresent()) { - return Optional.ofNullable(nodeOptional.get().augmentation(PhysicalSwitchAugmentation.class)); - } - return Optional.empty(); + return getGlobalNode(requireNonNull(iid)) + .flatMap(node -> Optional.ofNullable(node.augmentation(PhysicalSwitchAugmentation.class))); } public Optional> getTerminationPointList( final InstanceIdentifier iid) { - Optional nodeOptional = getGlobalNode(requireNonNull(iid)); - if (nodeOptional.isPresent() && nodeOptional.get().getTerminationPoint() != null) { - return Optional.ofNullable(nodeOptional.get().getTerminationPoint()); - } - return Optional.empty(); + return getGlobalNode(requireNonNull(iid)) + .flatMap(node -> Optional.ofNullable(node.getTerminationPoint())); } public Optional getLogicalSwitches(final InstanceIdentifier iid, final LogicalSwitchesKey logicalSwitchesKey) { - Optional nodeOptional = getHwvtepGlobalAugmentation(requireNonNull(iid)); - if (nodeOptional.isPresent()) { - LogicalSwitches lswitch = nodeOptional.get().nonnullLogicalSwitches().get(logicalSwitchesKey); - if (lswitch != null) { - return Optional.of(lswitch); - } - } - return Optional.empty(); + return getHwvtepGlobalAugmentation(requireNonNull(iid)) + .flatMap(node -> Optional.ofNullable(node.nonnullLogicalSwitches().get(logicalSwitchesKey))); } public Optional getLogicalSwitches(final InstanceIdentifier iid) { @@ -224,14 +208,8 @@ public class HwvtepOperationalState { } public Optional getTunnels(final InstanceIdentifier iid, final TunnelsKey tunnelsKey) { - Optional psOptional = getPhysicalSwitchAugmentation(requireNonNull(iid)); - if (psOptional.isPresent()) { - Tunnels tunnel = psOptional.get().nonnullTunnels().get(tunnelsKey); - if (tunnel != null) { - return Optional.of(tunnel); - } - } - return Optional.empty(); + return getPhysicalSwitchAugmentation(requireNonNull(iid)) + .flatMap(ps -> Optional.ofNullable(ps.nonnullTunnels().get(tunnelsKey))); } public Optional getTunnels(final InstanceIdentifier iid) { @@ -244,11 +222,11 @@ public class HwvtepOperationalState { Optional> nodeOptional = getTerminationPointList(requireNonNull(iid)); if (nodeOptional.isPresent()) { - for (TerminationPoint tp : nodeOptional.get().values()) { + for (TerminationPoint tp : nodeOptional.orElseThrow().values()) { HwvtepPhysicalPortAugmentation hppAugmentation = tp.augmentation(HwvtepPhysicalPortAugmentation.class); if (hppAugmentation != null && hppAugmentation.getHwvtepNodeName().equals(hwvtepNodeName)) { - return Optional.ofNullable(hppAugmentation); + return Optional.of(hppAugmentation); } } } @@ -260,7 +238,7 @@ public class HwvtepOperationalState { Optional> nodeOptional = getTerminationPointList(requireNonNull(iid)); if (nodeOptional.isPresent()) { - for (TerminationPoint tp : nodeOptional.get().values()) { + for (TerminationPoint tp : nodeOptional.orElseThrow().values()) { HwvtepPhysicalLocatorAugmentation hppAugmentation = tp.augmentation(HwvtepPhysicalLocatorAugmentation.class); if (hppAugmentation != null && hppAugmentation.getDstIp().equals(dstIp) @@ -274,73 +252,38 @@ public class HwvtepOperationalState { public Optional getPhysicalLocatorAugmentation(final InstanceIdentifier iid) { - Optional tp = - new MdsalUtils(db).readOptional(LogicalDatastoreType.OPERATIONAL, iid); - if (tp.isPresent()) { - return Optional.ofNullable(tp.get().augmentation(HwvtepPhysicalLocatorAugmentation.class)); - } - return Optional.empty(); + Optional optTp = new MdsalUtils(db).readOptional(LogicalDatastoreType.OPERATIONAL, iid); + return optTp.flatMap(tp -> Optional.ofNullable(tp.augmentation(HwvtepPhysicalLocatorAugmentation.class))); } public Optional getLocalMcastMacs(final InstanceIdentifier iid, final LocalMcastMacsKey key) { - Optional nodeOptional = getHwvtepGlobalAugmentation(requireNonNull(iid)); - if (nodeOptional.isPresent()) { - LocalMcastMacs mac = nodeOptional.get().nonnullLocalMcastMacs().get(key); - if (mac != null) { - return Optional.of(mac); - } - } - return Optional.empty(); + return getHwvtepGlobalAugmentation(requireNonNull(iid)) + .flatMap(node -> Optional.ofNullable(node.nonnullLocalMcastMacs().get(key))); } public Optional getRemoteMcastMacs(final InstanceIdentifier iid, final RemoteMcastMacsKey key) { - Optional nodeOptional = getHwvtepGlobalAugmentation(requireNonNull(iid)); - if (nodeOptional.isPresent()) { - RemoteMcastMacs mac = nodeOptional.get().nonnullRemoteMcastMacs().get(key); - if (mac != null) { - return Optional.of(mac); - } - } - return Optional.empty(); + return getHwvtepGlobalAugmentation(requireNonNull(iid)) + .flatMap(node -> Optional.ofNullable(node.nonnullRemoteMcastMacs().get(key))); } public Optional getLocalUcastMacs(final InstanceIdentifier iid, final LocalUcastMacsKey key) { - Optional nodeOptional = getHwvtepGlobalAugmentation(requireNonNull(iid)); - if (nodeOptional.isPresent()) { - LocalUcastMacs mac = nodeOptional.get().nonnullLocalUcastMacs().get(key); - if (mac != null) { - return Optional.of(mac); - } - } - return Optional.empty(); + return getHwvtepGlobalAugmentation(requireNonNull(iid)) + .flatMap(node -> Optional.ofNullable(node.nonnullLocalUcastMacs().get(key))); } public Optional getRemoteUcastMacs(final InstanceIdentifier iid, final RemoteUcastMacsKey key) { - Optional nodeOptional = getHwvtepGlobalAugmentation(requireNonNull(iid)); - if (nodeOptional.isPresent()) { - RemoteUcastMacs mac = nodeOptional.get().nonnullRemoteUcastMacs().get(key); - if (mac != null) { - return Optional.of(mac); - } - } - return Optional.empty(); + return getHwvtepGlobalAugmentation(requireNonNull(iid)) + .flatMap(node -> Optional.ofNullable(node.nonnullRemoteUcastMacs().get(key))); } public Optional getLogicalRouters(final InstanceIdentifier iid, final LogicalRoutersKey logicalRoutersKey) { - Optional nodeOptional = getHwvtepGlobalAugmentation(requireNonNull(iid)); - if (nodeOptional.isPresent()) { - LogicalRouters lrouter = nodeOptional.get().nonnullLogicalRouters().get(logicalRoutersKey); - if (lrouter != null) { - return Optional.of(lrouter); - } - } - return Optional.empty(); + return getHwvtepGlobalAugmentation(requireNonNull(iid)) + .flatMap(node -> Optional.ofNullable(node.nonnullLogicalRouters().get(logicalRoutersKey))); } public Optional getAcls(final InstanceIdentifier iid) { - Optional acl = new MdsalUtils(db).readOptional(LogicalDatastoreType.OPERATIONAL, iid); - return acl; + return new MdsalUtils(db).readOptional(LogicalDatastoreType.OPERATIONAL, iid); } public ReadWriteTransaction getReadWriteTransaction() { diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/LogicalRouterRemoveCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/LogicalRouterRemoveCommand.java index 10907bd08..abd99c9e3 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/LogicalRouterRemoveCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/LogicalRouterRemoveCommand.java @@ -81,9 +81,10 @@ public class LogicalRouterRemoveCommand getOperationalState().getLogicalRouters(instanceIdentifier, lrouter.key()); if (operationalRouterOptional.isPresent() - && operationalRouterOptional.get().getLogicalRouterUuid() != null) { + && operationalRouterOptional.orElseThrow().getLogicalRouterUuid() != null) { LogicalRouter logicalRouter = transaction.getTypedRowSchema(LogicalRouter.class); - UUID logicalRouterUuid = new UUID(operationalRouterOptional.get().getLogicalRouterUuid().getValue()); + UUID logicalRouterUuid = new UUID( + operationalRouterOptional.orElseThrow().getLogicalRouterUuid().getValue()); transaction.add(op.delete(logicalRouter.getSchema()) .where(logicalRouter.getUuidColumn().getSchema().opEqual(logicalRouterUuid)).build()); transaction.add(op.comment("Logical Router: Deleting " + lrouter.getHwvtepNodeName().getValue())); diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/LogicalRouterUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/LogicalRouterUpdateCommand.java index be348667f..194ced57c 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/LogicalRouterUpdateCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/LogicalRouterUpdateCommand.java @@ -80,7 +80,7 @@ public class LogicalRouterUpdateCommand updateCurrentTxData(LogicalRouters.class, routerKey, lrUuid, lrouter); updateControllerTxHistory(TransactionType.ADD, logicalRouter); } else { - LogicalRouters updatedLRouter = operationalRouterOptional.get(); + LogicalRouters updatedLRouter = operationalRouterOptional.orElseThrow(); String existingLogicalRouterName = updatedLRouter.getHwvtepNodeName().getValue(); LogicalRouter extraLogicalRouter = transaction.getTypedRowWrapper(LogicalRouter.class); extraLogicalRouter.setName(""); @@ -107,8 +107,8 @@ public class LogicalRouterUpdateCommand final Optional inputRouterOptional) { if (inputRouter.getHwvtepNodeName() != null) { logicalRouter.setName(inputRouter.getHwvtepNodeName().getValue()); - } else if (inputRouterOptional.isPresent() && inputRouterOptional.get().getHwvtepNodeName() != null) { - logicalRouter.setName(inputRouterOptional.get().getHwvtepNodeName().getValue()); + } else if (inputRouterOptional.isPresent() && inputRouterOptional.orElseThrow().getHwvtepNodeName() != null) { + logicalRouter.setName(inputRouterOptional.orElseThrow().getHwvtepNodeName().getValue()); } } @@ -123,7 +123,7 @@ public class LogicalRouterUpdateCommand Optional operationalSwitchOptional = getOperationalState().getLogicalSwitches(lswitchIid); if (operationalSwitchOptional.isPresent()) { - Uuid logicalSwitchUuid = operationalSwitchOptional.get().getLogicalSwitchUuid(); + Uuid logicalSwitchUuid = operationalSwitchOptional.orElseThrow().getLogicalSwitchUuid(); bindingMap.put(switchBinding.getDestinationAddress().getIpv4Prefix().getValue(), new UUID(logicalSwitchUuid.getValue())); } else { @@ -145,12 +145,10 @@ public class LogicalRouterUpdateCommand Optional operationalAclOptional = getOperationalState().getAcls(aclIid); if (operationalAclOptional.isPresent()) { - Uuid aclUuid = operationalAclOptional.get().getAclUuid(); - bindingMap.put(aclBinding.getRouterInterface().stringValue(), - new UUID(aclUuid.getValue())); + Uuid aclUuid = operationalAclOptional.orElseThrow().getAclUuid(); + bindingMap.put(aclBinding.getRouterInterface().stringValue(), new UUID(aclUuid.getValue())); } else { - bindingMap.put(aclBinding.getRouterInterface().stringValue(), - TransactUtils.getAclUUID(aclIid)); + bindingMap.put(aclBinding.getRouterInterface().stringValue(), TransactUtils.getAclUUID(aclIid)); } } logicalRouter.setAclBinding(bindingMap); diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsLocalRemoveCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsLocalRemoveCommand.java index 4380efe3d..5e65c7754 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsLocalRemoveCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsLocalRemoveCommand.java @@ -54,10 +54,10 @@ public class McastMacsLocalRemoveCommand Optional operationalMacOptional = getOperationalState().getLocalMcastMacs(instanceIdentifier, mac.key()); McastMacsLocal mcastMacsLocal = transaction.getTypedRowSchema(McastMacsLocal.class); - if (operationalMacOptional.isPresent() && operationalMacOptional.get().getMacEntryUuid() != null) { + if (operationalMacOptional.isPresent() && operationalMacOptional.orElseThrow().getMacEntryUuid() != null) { //when mac entry is deleted, its referenced locator set and locators are deleted automatically. //TODO: locator in config DS is not deleted - UUID macEntryUUID = new UUID(operationalMacOptional.get().getMacEntryUuid().getValue()); + UUID macEntryUUID = new UUID(operationalMacOptional.orElseThrow().getMacEntryUuid().getValue()); mcastMacsLocal.getUuidColumn().setData(macEntryUUID); transaction.add(op.delete(mcastMacsLocal.getSchema()) .where(mcastMacsLocal.getUuidColumn().getSchema().opEqual(macEntryUUID)).build()); diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsLocalUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsLocalUpdateCommand.java index dd345879c..862fce0c2 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsLocalUpdateCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsLocalUpdateCommand.java @@ -66,8 +66,8 @@ public class McastMacsLocalUpdateCommand LOG.trace("execute: create LocalMcastMac entry: {}", mcastMacsLocal); transaction.add(op.insert(mcastMacsLocal)); transaction.add(op.comment("McastMacLocal: Creating " + localMcastMac.getMacEntryKey().getValue())); - } else if (operationalMacOptional.get().getMacEntryUuid() != null) { - UUID macEntryUUID = new UUID(operationalMacOptional.get().getMacEntryUuid().getValue()); + } else if (operationalMacOptional.orElseThrow().getMacEntryUuid() != null) { + UUID macEntryUUID = new UUID(operationalMacOptional.orElseThrow().getMacEntryUuid().getValue()); McastMacsLocal extraMac = transaction.getTypedRowSchema(McastMacsLocal.class); extraMac.getUuidColumn().setData(macEntryUUID); LOG.trace("execute: update LocalMcastMac entry: {}", mcastMacsLocal); @@ -90,7 +90,7 @@ public class McastMacsLocalUpdateCommand Optional operationalSwitchOptional = getOperationalState().getLogicalSwitches(lswitchIid); if (operationalSwitchOptional.isPresent()) { - Uuid logicalSwitchUuid = operationalSwitchOptional.get().getLogicalSwitchUuid(); + Uuid logicalSwitchUuid = operationalSwitchOptional.orElseThrow().getLogicalSwitchUuid(); UUID logicalSwitchUUID = new UUID(logicalSwitchUuid.getValue()); mcastMacsLocal.setLogicalSwitch(logicalSwitchUUID); } else { @@ -124,8 +124,8 @@ public class McastMacsLocalUpdateCommand } else { mcastMacsLocal.setMac(inputMac.getMacEntryKey().getValue()); } - } else if (inputSwitchOptional.isPresent() && inputSwitchOptional.get().getMacEntryKey() != null) { - mcastMacsLocal.setMac(inputSwitchOptional.get().getMacEntryKey().getValue()); + } else if (inputSwitchOptional.isPresent() && inputSwitchOptional.orElseThrow().getMacEntryKey() != null) { + mcastMacsLocal.setMac(inputSwitchOptional.orElseThrow().getMacEntryKey().getValue()); } } diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalPortRemoveCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalPortRemoveCommand.java index 8cbf865e5..7764e4d15 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalPortRemoveCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalPortRemoveCommand.java @@ -59,7 +59,7 @@ public class PhysicalPortRemoveCommand extends AbstractTransactCommand { if (operationalPhysicalPortOptional.isPresent()) { PhysicalPort physicalPort = transaction.getTypedRowWrapper(PhysicalPort.class); physicalPort.setVlanBindings(new HashMap<>()); - HwvtepPhysicalPortAugmentation updatedPhysicalPort = operationalPhysicalPortOptional.get(); + HwvtepPhysicalPortAugmentation updatedPhysicalPort = operationalPhysicalPortOptional.orElseThrow(); String existingPhysicalPortName = updatedPhysicalPort.getHwvtepNodeName().getValue(); PhysicalPort extraPhyscialPort = transaction.getTypedRowWrapper(PhysicalPort.class); extraPhyscialPort.setName(""); diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalSwitchRemoveCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalSwitchRemoveCommand.java index 20c59afe8..45ddde080 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalSwitchRemoveCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalSwitchRemoveCommand.java @@ -55,8 +55,8 @@ public class PhysicalSwitchRemoveCommand extends AbstractTransactCommand { getOperationalState().getPhysicalSwitchAugmentation(iid); PhysicalSwitch physicalSwitch = transaction.getTypedRowSchema(PhysicalSwitch.class); if (operationalPhysicalSwitchOptional.isPresent() - && operationalPhysicalSwitchOptional.get().getPhysicalSwitchUuid() != null) { - UUID physicalSwitchUuid = new UUID(operationalPhysicalSwitchOptional.get() + && operationalPhysicalSwitchOptional.orElseThrow().getPhysicalSwitchUuid() != null) { + UUID physicalSwitchUuid = new UUID(operationalPhysicalSwitchOptional.orElseThrow() .getPhysicalSwitchUuid().getValue()); Global global = transaction.getTypedRowSchema(Global.class); transaction.add(op.delete(physicalSwitch.getSchema()) diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalSwitchUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalSwitchUpdateCommand.java index f0aebff57..2b22dd078 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalSwitchUpdateCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalSwitchUpdateCommand.java @@ -88,7 +88,7 @@ public final class PhysicalSwitchUpdateCommand extends AbstractTransactCommand { PhysicalSwitch physicalSwitch = transaction.getTypedRowWrapper(PhysicalSwitch.class); setDescription(physicalSwitch, physicalSwitchAugmentation); setManagementIps(physicalSwitch, physicalSwitchAugmentation); - setTunnuleIps(physicalSwitch, operationalPhysicalSwitchOptional.get()); + setTunnuleIps(physicalSwitch, operationalPhysicalSwitchOptional.orElseThrow()); try { setTunnels(transaction, iid, physicalSwitch, physicalSwitchAugmentation, operationalPhysicalSwitchOptional.isPresent()); @@ -113,7 +113,7 @@ public final class PhysicalSwitchUpdateCommand extends AbstractTransactCommand { transaction.add(op.comment("Global: Mutating " + physicalSwitchAugmentation.getHwvtepNodeName().getValue() + " " + pswitchUuid)); } else { - PhysicalSwitchAugmentation updatedPhysicalSwitch = operationalPhysicalSwitchOptional.get(); + PhysicalSwitchAugmentation updatedPhysicalSwitch = operationalPhysicalSwitchOptional.orElseThrow(); String existingPhysicalSwitchName = updatedPhysicalSwitch.getHwvtepNodeName().getValue(); /* In case TOR devices don't allow creation of PhysicalSwitch name might be null * as user is only adding configurable parameters to MDSAL like BFD params @@ -121,7 +121,8 @@ public final class PhysicalSwitchUpdateCommand extends AbstractTransactCommand { * TODO Note: Consider handling tunnel udpate/remove in separate command */ if (existingPhysicalSwitchName == null) { - existingPhysicalSwitchName = operationalPhysicalSwitchOptional.get().getHwvtepNodeName().getValue(); + existingPhysicalSwitchName = operationalPhysicalSwitchOptional.orElseThrow() + .getHwvtepNodeName().getValue(); } // Name is immutable, and so we *can't* update it. So we use extraPhysicalSwitch for the schema stuff PhysicalSwitch extraPhysicalSwitch = transaction.getTypedRowWrapper(PhysicalSwitch.class); @@ -140,8 +141,8 @@ public final class PhysicalSwitchUpdateCommand extends AbstractTransactCommand { if (physicalSwitchAugmentation.getHwvtepNodeName() != null) { physicalSwitch.setName(physicalSwitchAugmentation.getHwvtepNodeName().getValue()); } else if (operationalPhysicalSwitchOptional.isPresent() - && operationalPhysicalSwitchOptional.get().getHwvtepNodeName() != null) { - physicalSwitch.setName(operationalPhysicalSwitchOptional.get().getHwvtepNodeName().getValue()); + && operationalPhysicalSwitchOptional.orElseThrow().getHwvtepNodeName() != null) { + physicalSwitch.setName(operationalPhysicalSwitchOptional.orElseThrow().getHwvtepNodeName().getValue()); } } @@ -218,7 +219,7 @@ public final class PhysicalSwitchUpdateCommand extends AbstractTransactCommand { transaction.add(op.comment("PhysicalSwitch: Mutating " + tunnelUuid)); } } else { - UUID uuid = new UUID(opTunnelOpt.get().getTunnelUuid().getValue()); + UUID uuid = new UUID(opTunnelOpt.orElseThrow().getTunnelUuid().getValue()); Tunnel extraTunnel = transaction.getTypedRowSchema(Tunnel.class); extraTunnel.getUuidColumn().setData(uuid); transaction.add(op.update(newTunnel) @@ -270,7 +271,7 @@ public final class PhysicalSwitchUpdateCommand extends AbstractTransactCommand { getOperationalState().getPhysicalLocatorAugmentation(iid); if (opLocOptional.isPresent()) { // Get Locator UUID from operational - HwvtepPhysicalLocatorAugmentation locatorAug = opLocOptional.get(); + HwvtepPhysicalLocatorAugmentation locatorAug = opLocOptional.orElseThrow(); locatorUUID = new UUID(locatorAug.getPhysicalLocatorUuid().getValue()); } else { // TODO/FIXME: Not in operational, do we create a new one? diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UcastMacsLocalRemoveCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UcastMacsLocalRemoveCommand.java index 3f2ca6aec..b5b69ea12 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UcastMacsLocalRemoveCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UcastMacsLocalRemoveCommand.java @@ -54,10 +54,10 @@ public class UcastMacsLocalRemoveCommand Optional operationalMacOptional = getOperationalState().getLocalUcastMacs(instanceIdentifier, mac.key()); UcastMacsLocal ucastMacsLocal = transaction.getTypedRowSchema(UcastMacsLocal.class); - if (operationalMacOptional.isPresent() && operationalMacOptional.get().getMacEntryUuid() != null) { + if (operationalMacOptional.isPresent() && operationalMacOptional.orElseThrow().getMacEntryUuid() != null) { //when mac entry is deleted, its referenced locators are deleted automatically. //locators in config DS is not deleted and user need to be removed explicitly by user. - UUID macEntryUUID = new UUID(operationalMacOptional.get().getMacEntryUuid().getValue()); + UUID macEntryUUID = new UUID(operationalMacOptional.orElseThrow().getMacEntryUuid().getValue()); ucastMacsLocal.getUuidColumn().setData(macEntryUUID); transaction.add(op.delete(ucastMacsLocal.getSchema()) .where(ucastMacsLocal.getUuidColumn().getSchema().opEqual(macEntryUUID)).build()); diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UcastMacsLocalUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UcastMacsLocalUpdateCommand.java index abf421214..b3417df7b 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UcastMacsLocalUpdateCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UcastMacsLocalUpdateCommand.java @@ -63,13 +63,13 @@ public class UcastMacsLocalUpdateCommand setIpAddress(ucastMacsLocal, localUcastMac); setLocator(transaction, ucastMacsLocal, localUcastMac); setLogicalSwitch(ucastMacsLocal, localUcastMac); - if (!operationalMacOptional.isPresent()) { + if (operationalMacOptional.isEmpty()) { setMac(ucastMacsLocal, localUcastMac, operationalMacOptional); LOG.trace("execute: creating LocalUcastMac entry: {}", ucastMacsLocal); transaction.add(op.insert(ucastMacsLocal)); transaction.add(op.comment("UcastMacLocal: Creating " + localUcastMac.getMacEntryKey().getValue())); - } else if (operationalMacOptional.get().getMacEntryUuid() != null) { - UUID macEntryUUID = new UUID(operationalMacOptional.get().getMacEntryUuid().getValue()); + } else if (operationalMacOptional.orElseThrow().getMacEntryUuid() != null) { + UUID macEntryUUID = new UUID(operationalMacOptional.orElseThrow().getMacEntryUuid().getValue()); UcastMacsLocal extraMac = transaction.getTypedRowSchema(UcastMacsLocal.class); extraMac.getUuidColumn().setData(macEntryUUID); LOG.trace("execute: updating LocalUcastMac entry: {}", ucastMacsLocal); @@ -92,7 +92,7 @@ public class UcastMacsLocalUpdateCommand Optional operationalSwitchOptional = getOperationalState().getLogicalSwitches(lswitchIid); if (operationalSwitchOptional.isPresent()) { - Uuid logicalSwitchUuid = operationalSwitchOptional.get().getLogicalSwitchUuid(); + Uuid logicalSwitchUuid = operationalSwitchOptional.orElseThrow().getLogicalSwitchUuid(); UUID logicalSwitchUUID = new UUID(logicalSwitchUuid.getValue()); ucastMacsLocal.setLogicalSwitch(logicalSwitchUUID); } else { @@ -116,7 +116,7 @@ public class UcastMacsLocalUpdateCommand getOperationalState().getPhysicalLocatorAugmentation(iid); if (operationalLocatorOptional.isPresent()) { //if exist, get uuid - HwvtepPhysicalLocatorAugmentation locatorAugmentation = operationalLocatorOptional.get(); + HwvtepPhysicalLocatorAugmentation locatorAugmentation = operationalLocatorOptional.orElseThrow(); locatorUuid = new UUID(locatorAugmentation.getPhysicalLocatorUuid().getValue()); } else { //if no, get it from config DS and create id @@ -124,7 +124,7 @@ public class UcastMacsLocalUpdateCommand getOperationalState().getDataBroker()).readOptional(LogicalDatastoreType.CONFIGURATION, iid); if (configLocatorOptional.isPresent()) { HwvtepPhysicalLocatorAugmentation locatorAugmentation = - configLocatorOptional.get().augmentation(HwvtepPhysicalLocatorAugmentation.class); + configLocatorOptional.orElseThrow().augmentation(HwvtepPhysicalLocatorAugmentation.class); locatorUuid = TransactUtils.createPhysicalLocator(transaction, locatorAugmentation, getOperationalState()); } else { @@ -148,8 +148,8 @@ public class UcastMacsLocalUpdateCommand final Optional inputSwitchOptional) { if (inputMac.getMacEntryKey() != null) { ucastMacsLocal.setMac(inputMac.getMacEntryKey().getValue()); - } else if (inputSwitchOptional.isPresent() && inputSwitchOptional.get().getMacEntryKey() != null) { - ucastMacsLocal.setMac(inputSwitchOptional.get().getMacEntryKey().getValue()); + } else if (inputSwitchOptional.isPresent() && inputSwitchOptional.orElseThrow().getMacEntryKey() != null) { + ucastMacsLocal.setMac(inputSwitchOptional.orElseThrow().getMacEntryKey().getValue()); } } diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UnMetDependencyGetter.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UnMetDependencyGetter.java index 54c9c69ac..3200f9e1b 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UnMetDependencyGetter.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UnMetDependencyGetter.java @@ -109,7 +109,7 @@ public abstract class UnMetDependencyGetter { DataBroker db = opState.getConnectionInstance().getDataBroker(); Optional data = HwvtepSouthboundUtil.readNode(db, LogicalDatastoreType.CONFIGURATION, key); if (data.isPresent()) { - opState.getDeviceInfo().updateConfigData(cls, key, data.get()); + opState.getDeviceInfo().updateConfigData(cls, key, data.orElseThrow()); return true; } return false; diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepGlobalRemoveCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepGlobalRemoveCommand.java index 99cbcfa98..27d8e8a6b 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepGlobalRemoveCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepGlobalRemoveCommand.java @@ -50,7 +50,7 @@ public class HwvtepGlobalRemoveCommand extends AbstractTransactionCommand { try { Optional hwvtepGlobalOptional = hwvtepGlobalFuture.get(); if (hwvtepGlobalOptional.isPresent()) { - Node hwvtepNode = hwvtepGlobalOptional.get(); + Node hwvtepNode = hwvtepGlobalOptional.orElseThrow(); HwvtepGlobalAugmentation hgAugmentation = hwvtepNode.augmentation(HwvtepGlobalAugmentation.class); if (checkIfOnlyConnectedManager(hgAugmentation)) { if (hgAugmentation != null) { diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepManagerUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepManagerUpdateCommand.java index bee29bb32..c91d2edac 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepManagerUpdateCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepManagerUpdateCommand.java @@ -58,7 +58,7 @@ public final class HwvtepManagerUpdateCommand extends AbstractTransactionCommand final InstanceIdentifier connectionIId = getOvsdbConnectionInstance().getInstanceIdentifier(); Optional connection = HwvtepSouthboundUtil.readNode(transaction, connectionIId); if (connection.isPresent()) { - LOG.debug("Connection {} is present", connection.get()); + LOG.debug("Connection {} is present", connection.orElseThrow()); Node connectionNode = buildConnectionNode(manager); transaction.merge(LogicalDatastoreType.OPERATIONAL, connectionIId, connectionNode); addToDeviceUpdate(TransactionType.ADD, manager); diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepPhysicalLocatorUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepPhysicalLocatorUpdateCommand.java index f212b395b..48d92dd8d 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepPhysicalLocatorUpdateCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepPhysicalLocatorUpdateCommand.java @@ -48,7 +48,7 @@ public final class HwvtepPhysicalLocatorUpdateCommand extends AbstractTransactio } Optional node = HwvtepSouthboundUtil.readNode(transaction, connectionIId); if (node.isPresent()) { - updateTerminationPoints(transaction, node.get()); + updateTerminationPoints(transaction, node.orElseThrow()); } } diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepPhysicalPortUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepPhysicalPortUpdateCommand.java index 7a768d931..505a8a91c 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepPhysicalPortUpdateCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepPhysicalPortUpdateCommand.java @@ -86,7 +86,7 @@ public final class HwvtepPhysicalPortUpdateCommand extends AbstractTransactionCo for (Entry portUpdateEntry : updatedPPRows.entrySet()) { Optional> switchIid = getTerminationPointSwitch(portUpdateEntry.getKey()); if (switchIid.isPresent()) { - if (getDeviceInfo().getDeviceOperData(Node.class, switchIid.get()) == null) { + if (getDeviceInfo().getDeviceOperData(Node.class, switchIid.orElseThrow()) == null) { //This is the first update from switch do not have to do reconciliation of this port //it is taken care by switch reconciliation skipReconciliationPorts.add(portUpdateEntry.getKey()); @@ -105,7 +105,7 @@ public final class HwvtepPhysicalPortUpdateCommand extends AbstractTransactionCo LOG.trace("PhysicalPortTable updated: {}", updatedPPRows); Optional node = HwvtepSouthboundUtil.readNode(transaction, connectionIId); if (node.isPresent()) { - updateTerminationPoints(transaction, node.get()); + updateTerminationPoints(transaction, node.orElseThrow()); // TODO: Handle Deletion of VLAN Bindings } } @@ -128,7 +128,8 @@ public final class HwvtepPhysicalPortUpdateCommand extends AbstractTransactionCo TerminationPointBuilder tpBuilder = new TerminationPointBuilder(); tpBuilder.withKey(tpKey); tpBuilder.setTpId(tpKey.getTpId()); - InstanceIdentifier tpPath = getInstanceIdentifier(switchIid.get(), portUpdate); + InstanceIdentifier tpPath = + getInstanceIdentifier(switchIid.orElseThrow(), portUpdate); HwvtepPhysicalPortAugmentationBuilder tpAugmentationBuilder = new HwvtepPhysicalPortAugmentationBuilder(); buildTerminationPoint(tpAugmentationBuilder, portUpdate); @@ -301,7 +302,7 @@ public final class HwvtepPhysicalPortUpdateCommand extends AbstractTransactionCo for (Switches managedNodeEntry : switchNodes.values()) { @SuppressWarnings("unchecked") Node switchNode = HwvtepSouthboundUtil.readNode(transaction, - (InstanceIdentifier) managedNodeEntry.getSwitchRef().getValue()).get(); + (InstanceIdentifier) managedNodeEntry.getSwitchRef().getValue()).orElseThrow(); TerminationPointKey tpKey = new TerminationPointKey(new TpId(tpName)); TerminationPoint terminationPoint = switchNode.nonnullTerminationPoint().get(tpKey); if (terminationPoint != null) { diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepPhysicalSwitchUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepPhysicalSwitchUpdateCommand.java index 2bd4898da..0478beb68 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepPhysicalSwitchUpdateCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepPhysicalSwitchUpdateCommand.java @@ -97,7 +97,7 @@ public final class HwvtepPhysicalSwitchUpdateCommand extends AbstractTransaction // Update the Physical Switch with whatever data we are getting InstanceIdentifier psIid = getInstanceIdentifier(phySwitch); - Node psNode = buildPhysicalSwitchNode(connection.get(), phySwitch); + Node psNode = buildPhysicalSwitchNode(connection.orElseThrow(), phySwitch); transaction.merge(LogicalDatastoreType.OPERATIONAL, psIid, psNode); addToDeviceUpdate(TransactionType.ADD, phySwitch); LOG.info("DEVICE - {} {}", TransactionType.ADD, phySwitch); diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/StalePassiveConnectionService.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/StalePassiveConnectionService.java index b04ca6ecf..004f54634 100644 --- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/StalePassiveConnectionService.java +++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/StalePassiveConnectionService.java @@ -105,9 +105,10 @@ public class StalePassiveConnectionService implements AutoCloseable { .map(entry -> entry.getKey()) .findFirst(); if (clientOptional.isPresent()) { - LOG.info("Sending notification for client {}", clientOptional.get().getConnectionInfo()); - pendingClients.remove(clientOptional.get()); - clientNotificationCallback.apply(clientOptional.get()); + OvsdbClient client = clientOptional.orElseThrow(); + LOG.info("Sending notification for client {}", client.getConnectionInfo()); + pendingClients.remove(client); + clientNotificationCallback.apply(client); } } diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java index 90151624f..0e700be34 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java @@ -335,7 +335,7 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos public OvsdbConnectionInstance getConnectionInstance(final OvsdbBridgeAttributes mn) { Optional optional = SouthboundUtil.getManagingNode(db, mn); if (optional.isPresent()) { - return getConnectionInstance(optional.get().getConnectionInfo()); + return getConnectionInstance(optional.orElseThrow().getConnectionInfo()); } else { return null; } @@ -366,7 +366,7 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos transaction.close(); Optional optional = nodeFuture.get(); if (optional.isPresent()) { - return this.getConnectionInstance(optional.get()); + return this.getConnectionInstance(optional.orElseThrow()); } else { LOG.debug("Node was not found on the path in the operational DS: {}", nodePath); return null; @@ -500,7 +500,7 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos txInvoker.invoke(transaction -> { Optional ovsdbNodeOpt = SouthboundUtil.readNode(transaction, nodeIid); if (ovsdbNodeOpt.isPresent()) { - Node ovsdbNode = ovsdbNodeOpt.get(); + Node ovsdbNode = ovsdbNodeOpt.orElseThrow(); OvsdbNodeAugmentation nodeAugmentation = ovsdbNode.augmentation(OvsdbNodeAugmentation.class); if (nodeAugmentation != null) { Map entries = nodeAugmentation.getManagedNodeEntry(); @@ -598,7 +598,7 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos java.util.Optional ownershipStateOpt = entityOwnershipService.getOwnershipState(candidateEntity); if (ownershipStateOpt.isPresent()) { - EntityOwnershipState ownershipState = ownershipStateOpt.get(); + EntityOwnershipState ownershipState = ownershipStateOpt.orElseThrow(); if (ownershipState == EntityOwnershipState.OWNED_BY_OTHER) { ovsdbConnectionInstance.setHasDeviceOwnership(false); } else if (ownershipState == EntityOwnershipState.IS_OWNER) { diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundUtil.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundUtil.java index ced432492..5a2641cd6 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundUtil.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundUtil.java @@ -54,17 +54,18 @@ public final class SouthboundUtil { try { OvsdbNodeRef ref = mn.getManagedBy(); if (ref != null && ref.getValue() != null) { - ReadTransaction transaction = db.newReadOnlyTransaction(); - @SuppressWarnings("unchecked") - // Note: erasure makes this safe in combination with the typecheck below - InstanceIdentifier path = (InstanceIdentifier) ref.getValue(); + FluentFuture> nf; + try (ReadTransaction transaction = db.newReadOnlyTransaction()) { + @SuppressWarnings("unchecked") + // Note: erasure makes this safe in combination with the typecheck below + InstanceIdentifier path = (InstanceIdentifier) ref.getValue(); + nf = transaction.read(LogicalDatastoreType.OPERATIONAL, path); + } - FluentFuture> nf = transaction.read(LogicalDatastoreType.OPERATIONAL, path); - transaction.close(); Optional optional = nf.get(); if (optional != null && optional.isPresent()) { OvsdbNodeAugmentation ovsdbNode = null; - Node node = optional.get(); + Node node = optional.orElseThrow(); if (node instanceof OvsdbNodeAugmentation) { ovsdbNode = (OvsdbNodeAugmentation) node; } else if (node != null) { diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/AutoAttachRemovedCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/AutoAttachRemovedCommand.java index 07a4a4fb9..9d0bb1a8a 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/AutoAttachRemovedCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/AutoAttachRemovedCommand.java @@ -82,7 +82,7 @@ public class AutoAttachRemovedCommand implements TransactCommand { return; } final OvsdbNodeAugmentation currentOvsdbNode = - state.getBridgeNode(ovsdbNodeIid).get().augmentation(OvsdbNodeAugmentation.class); + state.getBridgeNode(ovsdbNodeIid).orElseThrow().augmentation(OvsdbNodeAugmentation.class); final Map currentAutoAttach = currentOvsdbNode.getAutoattach(); for (final Autoattach origAutoattach : origAutoattachList.values()) { deleteAutoAttach(transaction, ovsdbNodeIid, getAutoAttachUuid(currentAutoAttach, @@ -145,14 +145,14 @@ public class AutoAttachRemovedCommand implements TransactCommand { final Optional nodeOptional = SouthboundUtil.readNode(transaction, nodeIid); if (nodeOptional.isPresent()) { final Map managedNodes = - nodeOptional.get().augmentation(OvsdbNodeAugmentation.class).getManagedNodeEntry(); + nodeOptional.orElseThrow().augmentation(OvsdbNodeAugmentation.class).getManagedNodeEntry(); for (final ManagedNodeEntry managedNode : managedNodes.values()) { final OvsdbBridgeRef ovsdbBridgeRef = managedNode.getBridgeRef(); final InstanceIdentifier brIid = ovsdbBridgeRef.getValue() .firstIdentifierOf(Node.class).augmentation(OvsdbBridgeAugmentation.class); final Optional optionalBridge = transaction.read(LogicalDatastoreType.OPERATIONAL, brIid).get(); - bridge = optionalBridge.get(); + bridge = optionalBridge.orElseThrow(); if (bridge != null && bridge.getAutoAttach() != null && bridge.getAutoAttach().equals(aaUuid)) { return bridge; diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/AutoAttachUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/AutoAttachUpdateCommand.java index a7e0f6f8b..d753b4616 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/AutoAttachUpdateCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/AutoAttachUpdateCommand.java @@ -92,7 +92,7 @@ public class AutoAttachUpdateCommand implements TransactCommand { } final OvsdbNodeAugmentation currentOvsdbNode = - state.getBridgeNode(iid).get().augmentation(OvsdbNodeAugmentation.class); + state.getBridgeNode(iid).orElseThrow().augmentation(OvsdbNodeAugmentation.class); final Map currentAutoAttach = currentOvsdbNode.getAutoattach(); for (final Autoattach autoAttach : autoAttachList.values()) { final AutoAttach autoAttachWrapper = transaction.getTypedRowWrapper(AutoAttach.class); @@ -177,7 +177,7 @@ public class AutoAttachUpdateCommand implements TransactCommand { final Optional bridgeOptional = transaction.read(LogicalDatastoreType.OPERATIONAL, bridgeIid).get(); if (bridgeOptional.isPresent()) { - bridge = bridgeOptional.get(); + bridge = bridgeOptional.orElseThrow(); } } catch (InterruptedException | ExecutionException e) { LOG.warn("Error reading from datastore", e); diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeOperationalState.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeOperationalState.java index 79a45766f..2c3703006 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeOperationalState.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeOperationalState.java @@ -52,20 +52,18 @@ public class BridgeOperationalState { } public Optional getOvsdbBridgeAugmentation(InstanceIdentifier iid) { - Optional nodeOptional = getBridgeNode(iid); - if (nodeOptional.isPresent()) { - return Optional.ofNullable(nodeOptional.get().augmentation(OvsdbBridgeAugmentation.class)); - } - return Optional.empty(); + return getBridgeNode(iid) + .flatMap(node -> Optional.ofNullable(node.augmentation(OvsdbBridgeAugmentation.class))); } public Optional getBridgeTerminationPoint(InstanceIdentifier iid) { if (iid != null) { Optional nodeOptional = getBridgeNode(iid); - if (nodeOptional.isPresent() && nodeOptional.get().getTerminationPoint() != null) { + if (nodeOptional.isPresent()) { + Node node = nodeOptional.orElseThrow(); TerminationPointKey key = iid.firstKeyOf(TerminationPoint.class); if (key != null) { - final TerminationPoint tp = nodeOptional.get().nonnullTerminationPoint().get(key); + final TerminationPoint tp = node.nonnullTerminationPoint().get(key); if (tp != null) { return Optional.of(tp); } @@ -78,18 +76,16 @@ public class BridgeOperationalState { } public Optional getOvsdbTerminationPointAugmentation(InstanceIdentifier iid) { - Optional tpOptional = getBridgeTerminationPoint(iid); - if (tpOptional.isPresent()) { - return Optional.ofNullable(tpOptional.get().augmentation(OvsdbTerminationPointAugmentation.class)); - } - return Optional.empty(); + return getBridgeTerminationPoint(iid) + .flatMap(tp -> Optional.ofNullable(tp.augmentation(OvsdbTerminationPointAugmentation.class))); } public Optional getControllerEntry(InstanceIdentifier iid) { if (iid != null) { Optional ovsdbBridgeOptional = getOvsdbBridgeAugmentation(iid); if (ovsdbBridgeOptional.isPresent()) { - Map entries = ovsdbBridgeOptional.get().getControllerEntry(); + Map entries = + ovsdbBridgeOptional.orElseThrow().getControllerEntry(); if (entries != null) { ControllerEntryKey key = iid.firstKeyOf(ControllerEntry.class); if (key != null) { @@ -108,7 +104,7 @@ public class BridgeOperationalState { if (iid != null) { Optional ovsdbBridgeOptional = getOvsdbBridgeAugmentation(iid); if (ovsdbBridgeOptional.isPresent()) { - Map entries = ovsdbBridgeOptional.get().getProtocolEntry(); + Map entries = ovsdbBridgeOptional.orElseThrow().getProtocolEntry(); if (entries != null) { ProtocolEntryKey key = iid.firstKeyOf(ProtocolEntry.class); if (key != null) { diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeRemovedCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeRemovedCommand.java index 032c79311..77c215e61 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeRemovedCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeRemovedCommand.java @@ -55,8 +55,9 @@ public class BridgeRemovedCommand implements TransactCommand { Bridge bridge = transaction.getTypedRowSchema(Bridge.class); Optional ovsdbAugmentationOptional = state .getOvsdbBridgeAugmentation(ovsdbManagedNodeIid); - if (ovsdbAugmentationOptional.isPresent() && ovsdbAugmentationOptional.get().getBridgeUuid() != null) { - UUID bridgeUuid = new UUID(ovsdbAugmentationOptional.get().getBridgeUuid().getValue()); + if (ovsdbAugmentationOptional.isPresent() + && ovsdbAugmentationOptional.orElseThrow().getBridgeUuid() != null) { + UUID bridgeUuid = new UUID(ovsdbAugmentationOptional.orElseThrow().getBridgeUuid().getValue()); OpenVSwitch ovs = transaction.getTypedRowSchema(OpenVSwitch.class); transaction.add(op.delete(bridge.getSchema()) .where(bridge.getUuidColumn().getSchema().opEqual(bridgeUuid)).build()); diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeUpdateCommand.java index af5bf9e16..478c0e15b 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeUpdateCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeUpdateCommand.java @@ -91,7 +91,7 @@ public class BridgeUpdateCommand implements TransactCommand { ovsdbManagedNode.getBridgeName(), ovsdbManagedNode.getBridgeUuid()); } else { - String existingBridgeName = operationalBridgeOptional.get().getBridgeName().getValue(); + String existingBridgeName = operationalBridgeOptional.orElseThrow().getBridgeName().getValue(); LOG.debug("Bridge {} already exists in device updating {}", existingBridgeName, iid); // Name is immutable, and so we *can't* update it. So we use extraBridge for the schema stuff Bridge extraBridge = transaction.getTypedRowWrapper(Bridge.class); @@ -120,8 +120,9 @@ public class BridgeUpdateCommand implements TransactCommand { final Optional operationalBridgeOptional) { if (ovsdbManagedNode.getBridgeName() != null) { bridge.setName(ovsdbManagedNode.getBridgeName().getValue()); - } else if (operationalBridgeOptional.isPresent() && operationalBridgeOptional.get().getBridgeName() != null) { - bridge.setName(operationalBridgeOptional.get().getBridgeName().getValue()); + } else if (operationalBridgeOptional.isPresent() + && operationalBridgeOptional.orElseThrow().getBridgeName() != null) { + bridge.setName(operationalBridgeOptional.orElseThrow().getBridgeName().getValue()); } } diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/ControllerRemovedCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/ControllerRemovedCommand.java index 46b825360..8347f91c7 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/ControllerRemovedCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/ControllerRemovedCommand.java @@ -56,7 +56,7 @@ public class ControllerRemovedCommand implements TransactCommand { OvsdbBridgeAugmentation ovsdbBridge = modifiedBridges.get(bridgeIid); Optional controllerEntryOptional = state.getControllerEntry(controllerIid); if (ovsdbBridge != null && controllerEntryOptional.isPresent()) { - ControllerEntry controllerEntry = controllerEntryOptional.get(); + ControllerEntry controllerEntry = controllerEntryOptional.orElseThrow(); Bridge bridge = transaction.getTypedRowWrapper(Bridge.class); bridge.setController(Collections.singleton(new UUID(controllerEntry.getControllerUuid().getValue()))); transaction.add(op.mutate(bridge).addMutation(bridge.getControllerColumn().getSchema(), diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/ControllerUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/ControllerUpdateCommand.java index aa22a291b..98e62de3c 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/ControllerUpdateCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/ControllerUpdateCommand.java @@ -61,7 +61,7 @@ public class ControllerUpdateCommand implements TransactCommand { Optional bridgeOptional = state.getOvsdbBridgeAugmentation(bridgeIid); OvsdbBridgeAugmentation ovsdbBridge = bridgeOptional.isPresent() - ? bridgeOptional.get() : bridges.get(bridgeIid); + ? bridgeOptional.orElseThrow() : bridges.get(bridgeIid); if (ovsdbBridge != null && ovsdbBridge.getBridgeName() != null && entry.getValue() != null diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/DataChangesManagedByOvsdbNodeEvent.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/DataChangesManagedByOvsdbNodeEvent.java index 0f8ce3cdc..fdb84acc4 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/DataChangesManagedByOvsdbNodeEvent.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/DataChangesManagedByOvsdbNodeEvent.java @@ -121,8 +121,7 @@ public class DataChangesManagedByOvsdbNodeEvent implements DataChangeEvent { InstanceIdentifier nodeEntryIid = bridgeIid.firstIdentifierOf(Node.class); Optional bridgeNode = SouthboundUtil.readNode(db.newReadWriteTransaction(),nodeEntryIid); - if (bridgeNode.isPresent() && bridgeNode.get() instanceof Node) { - Node node = (Node)bridgeNode.get(); + if (bridgeNode.isPresent() && bridgeNode.orElseThrow() instanceof Node node) { OvsdbBridgeAugmentation bridge = node.augmentation(OvsdbBridgeAugmentation.class); if (bridge != null && bridge.getManagedBy() != null) { return bridge.getManagedBy().getValue(); diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/ProtocolRemovedCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/ProtocolRemovedCommand.java index 6f1af1e68..946af1b45 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/ProtocolRemovedCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/ProtocolRemovedCommand.java @@ -58,7 +58,7 @@ public class ProtocolRemovedCommand implements TransactCommand { Optional protocolEntryOptional = state.getProtocolEntry(protocolIid); if (ovsdbBridge != null && protocolEntryOptional.isPresent()) { - ProtocolEntry protocolEntry = protocolEntryOptional.get(); + ProtocolEntry protocolEntry = protocolEntryOptional.orElseThrow(); if (protocolEntry != null && protocolEntry.getProtocol() != null) { Bridge bridge = transaction.getTypedRowWrapper(Bridge.class); String protocolString = SouthboundConstants.OVSDB_PROTOCOL_MAP.get(protocolEntry.getProtocol()); diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/ProtocolUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/ProtocolUpdateCommand.java index abede5ed2..16451e954 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/ProtocolUpdateCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/ProtocolUpdateCommand.java @@ -62,7 +62,7 @@ public class ProtocolUpdateCommand implements TransactCommand { state.getOvsdbBridgeAugmentation(bridgeIid); OvsdbBridgeAugmentation ovsdbBridge; if (bridgeOptional.isPresent()) { - ovsdbBridge = bridgeOptional.get(); + ovsdbBridge = bridgeOptional.orElseThrow(); } else { ovsdbBridge = bridges.get(bridgeIid); } diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/QosRemovedCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/QosRemovedCommand.java index bbcb58d33..e46b7cac9 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/QosRemovedCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/QosRemovedCommand.java @@ -59,8 +59,8 @@ public class QosRemovedCommand implements TransactCommand { Map updatedQosEntries = update.getQosEntries(); if (origQosEntries != null && !origQosEntries.isEmpty()) { for (QosEntries origQosEntry : origQosEntries.values()) { - OvsdbNodeAugmentation operNode = - state.getBridgeNode(ovsdbNodeIid).get().augmentation(OvsdbNodeAugmentation.class); + OvsdbNodeAugmentation operNode = state.getBridgeNode(ovsdbNodeIid).orElseThrow() + .augmentation(OvsdbNodeAugmentation.class); if (updatedQosEntries == null || !updatedQosEntries.containsKey(origQosEntry.key())) { LOG.debug("Received request to delete QoS entry {}", origQosEntry.getQosId()); Uuid qosUuid = getQosEntryUuid(operNode.getQosEntries(), origQosEntry.key()); diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/QosUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/QosUpdateCommand.java index d2d49f701..339506416 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/QosUpdateCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/QosUpdateCommand.java @@ -68,7 +68,7 @@ public class QosUpdateCommand implements TransactCommand { return; } OvsdbNodeAugmentation operNode = - state.getBridgeNode(iid).get().augmentation(OvsdbNodeAugmentation.class); + state.getBridgeNode(iid).orElseThrow().augmentation(OvsdbNodeAugmentation.class); QosEntries qosEntry = qosMapEntry.getValue(); Qos qos = transaction.getTypedRowWrapper(Qos.class); diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/QueueRemovedCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/QueueRemovedCommand.java index 48f026ca2..2cee3c1d2 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/QueueRemovedCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/QueueRemovedCommand.java @@ -58,7 +58,7 @@ public class QueueRemovedCommand implements TransactCommand { if (origQueues != null && !origQueues.isEmpty()) { for (Queues origQueue : origQueues.values()) { OvsdbNodeAugmentation operNode = - state.getBridgeNode(ovsdbNodeIid).get().augmentation( + state.getBridgeNode(ovsdbNodeIid).orElseThrow().augmentation( OvsdbNodeAugmentation.class); if (updatedQueues == null || !updatedQueues.containsKey(origQueue.key())) { LOG.debug("Received request to delete Queue entry {}", origQueue.getQueueId()); diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/QueueUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/QueueUpdateCommand.java index ef16402e6..4d40bc02f 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/QueueUpdateCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/QueueUpdateCommand.java @@ -101,7 +101,7 @@ public class QueueUpdateCommand implements TransactCommand { } OvsdbNodeAugmentation operNode = - state.getBridgeNode(iid).get().augmentation(OvsdbNodeAugmentation.class); + state.getBridgeNode(iid).orElseThrow().augmentation(OvsdbNodeAugmentation.class); Uuid operQueueUuid = getQueueEntryUuid(operNode.getQueues(), queueEntry.key()); if (operQueueUuid == null) { UUID namedUuid = new UUID(SouthboundConstants.QUEUE_NAMED_UUID_PREFIX diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointDeleteCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointDeleteCommand.java index c9d96610c..71e84853b 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointDeleteCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointDeleteCommand.java @@ -73,7 +73,7 @@ public class TerminationPointDeleteCommand implements TransactCommand { Optional tpAugmentation = state.getOvsdbTerminationPointAugmentation(removedTpIid); if (tpAugmentation.isPresent()) { - OvsdbTerminationPointAugmentation tp = tpAugmentation.get(); + OvsdbTerminationPointAugmentation tp = tpAugmentation.orElseThrow(); if (tp.getPortUuid() != null) { UUID portUuid = new UUID(tp.getPortUuid().getValue()); Bridge bridge = transaction.getTypedRowSchema(Bridge.class); diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointUpdateCommand.java index 5667cc6f9..883b3833f 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointUpdateCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointUpdateCommand.java @@ -119,7 +119,7 @@ public class TerminationPointUpdateCommand implements TransactCommand { // Bug#6136 Optional ovsdbBridgeOptional = state.getOvsdbBridgeAugmentation(iid); if (ovsdbBridgeOptional != null && ovsdbBridgeOptional.isPresent()) { - OvsdbBridgeAugmentation operBridge = ovsdbBridgeOptional.get(); + OvsdbBridgeAugmentation operBridge = ovsdbBridgeOptional.orElseThrow(); if (operBridge != null) { Port port = transaction.getTypedRowWrapper(Port.class); updatePort(terminationPoint, port, operBridge, opendaylightIid); @@ -194,7 +194,7 @@ public class TerminationPointUpdateCommand implements TransactCommand { try (ReadTransaction transaction = SouthboundProvider.getDb().newReadOnlyTransaction()) { Optional nodeOptional = SouthboundUtil.readNode(transaction, iidNode); if (nodeOptional.isPresent()) { - operNode = nodeOptional.get().augmentation(OvsdbNodeAugmentation.class); + operNode = nodeOptional.orElseThrow().augmentation(OvsdbNodeAugmentation.class); } } catch (Exception exp) { LOG.error("Error in getting the brideNode for {}", iidNode, exp); diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/configuration/BridgeConfigReconciliationTask.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/configuration/BridgeConfigReconciliationTask.java index f4d7faa3e..d970699c7 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/configuration/BridgeConfigReconciliationTask.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/configuration/BridgeConfigReconciliationTask.java @@ -122,7 +122,7 @@ public class BridgeConfigReconciliationTask extends ReconciliationTask { @Override public void onSuccess(@Nullable final Optional optionalTopology) { if (optionalTopology != null && optionalTopology.isPresent()) { - Map nodes = optionalTopology.get().getNode(); + Map nodes = optionalTopology.orElseThrow().getNode(); if (nodes != null) { for (Node node : nodes.values()) { String bridgeNodeIid = node.getNodeId().getValue(); @@ -160,7 +160,7 @@ public class BridgeConfigReconciliationTask extends ReconciliationTask { @Override public void onSuccess(@Nullable final Optional optionalTopology) { if (optionalTopology != null && optionalTopology.isPresent()) { - Node node = optionalTopology.get(); + Node node = optionalTopology.orElseThrow(); if (node != null) { bridgeNodeList.add(node); } diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbAutoAttachRemovedCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbAutoAttachRemovedCommand.java index 196a6b7cb..ad86bc6a3 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbAutoAttachRemovedCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbAutoAttachRemovedCommand.java @@ -54,17 +54,17 @@ public class OvsdbAutoAttachRemovedCommand extends AbstractTransactionCommand { SouthboundMapper.createInstanceIdentifier(getOvsdbConnectionInstance().getNodeId()); // FIXME: Iterate on external_ids instead of uuid when Open vSwitch supports external_ids column for (final UUID autoAttachUuid : removedAutoAttachRows.keySet()) { - final AutoattachKey autoAttachKey = getAutoAttachKeyToRemove(ovsdbNode.get(), autoAttachUuid); + final AutoattachKey autoAttachKey = getAutoAttachKeyToRemove(ovsdbNode.orElseThrow(), autoAttachUuid); if (autoAttachKey != null) { final InstanceIdentifier iid = ovsdbNodeIid .augmentation(OvsdbNodeAugmentation.class) .child(Autoattach.class, autoAttachKey); transaction.delete(LogicalDatastoreType.OPERATIONAL, iid); LOG.debug("AutoAttach table {} for Ovsdb Node {} is deleted", autoAttachUuid, - ovsdbNode.get().getNodeId()); + ovsdbNode.orElseThrow().getNodeId()); } else { LOG.warn("AutoAttach table {} not found for Ovsdb Node {} to delete", autoAttachUuid, - ovsdbNode.get().getNodeId()); + ovsdbNode.orElseThrow().getNodeId()); } } } diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbAutoAttachUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbAutoAttachUpdateCommand.java index 6ec778e09..30d7158ea 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbAutoAttachUpdateCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbAutoAttachUpdateCommand.java @@ -91,7 +91,7 @@ public class OvsdbAutoAttachUpdateCommand extends AbstractTransactionCommand { final Optional optionalAutoattach = transaction.read(LogicalDatastoreType.OPERATIONAL, currentIid).get(); if (optionalAutoattach.isPresent()) { - currentAutoattach = optionalAutoattach.get(); + currentAutoattach = optionalAutoattach.orElseThrow(); } } catch (final InterruptedException | ExecutionException e) { LOG.debug("AutoAttach table entries not found in operational datastore, need to create it.", e); @@ -125,7 +125,7 @@ public class OvsdbAutoAttachUpdateCommand extends AbstractTransactionCommand { final Autoattach autoAttachEntry = autoAttachBuilder.build(); LOG.trace("Update Ovsdb Node {} with AutoAttach table entries {}", - ovsdbNode.get().getNodeId(), autoAttachEntry); + ovsdbNode.orElseThrow().getNodeId(), autoAttachEntry); final InstanceIdentifier iid = nodeIId .augmentation(OvsdbNodeAugmentation.class) .child(Autoattach.class, autoAttachEntry.key()); diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbControllerUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbControllerUpdateCommand.java index a4adc7667..83174cdaf 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbControllerUpdateCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbControllerUpdateCommand.java @@ -143,16 +143,17 @@ public class OvsdbControllerUpdateCommand extends AbstractTransactionCommand { final InstanceIdentifier connectionIId = getOvsdbConnectionInstance().getInstanceIdentifier(); final Optional ovsdbNode = SouthboundUtil.readNode(transaction, connectionIId); if (ovsdbNode.isPresent()) { - OvsdbNodeAugmentation ovsdbNodeAugmentation = ovsdbNode.get().augmentation(OvsdbNodeAugmentation.class); + OvsdbNodeAugmentation ovsdbNodeAugmentation = + ovsdbNode.orElseThrow().augmentation(OvsdbNodeAugmentation.class); if (ovsdbNodeAugmentation != null) { - final Map managedNodeEntries - = ovsdbNodeAugmentation.getManagedNodeEntry(); + final Map managedNodeEntries = + ovsdbNodeAugmentation.getManagedNodeEntry(); for (ManagedNodeEntry managedNodeEntry : managedNodeEntries.values()) { final InstanceIdentifier bridgeIid = (InstanceIdentifier) managedNodeEntry.getBridgeRef().getValue(); final Optional bridgeNode = SouthboundUtil.readNode(transaction, bridgeIid); if (bridgeNode.isPresent()) { - bridgeNodes.put(bridgeIid, bridgeNode.get()); + bridgeNodes.put(bridgeIid, bridgeNode.orElseThrow()); } else { LOG.warn("OVSDB bridge node was not found: {}", bridgeIid); } diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbManagersUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbManagersUpdateCommand.java index 2d56395cf..eb208327c 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbManagersUpdateCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbManagersUpdateCommand.java @@ -117,10 +117,9 @@ public class OvsdbManagersUpdateCommand extends AbstractTransactionCommand { final Optional ovsdbNode = SouthboundUtil.readNode(transaction, connectionIId); if (ovsdbNode.isPresent()) { final List managerEntries = - SouthboundMapper.createManagerEntries(ovsdbNode.get(), newUpdatedManagerRows); + SouthboundMapper.createManagerEntries(ovsdbNode.orElseThrow(), newUpdatedManagerRows); - LOG.debug("Update Ovsdb Node : {} with manager entries : {}", - ovsdbNode.get(), managerEntries); + LOG.debug("Update Ovsdb Node : {} with manager entries : {}", ovsdbNode.orElseThrow(), managerEntries); for (ManagerEntry managerEntry : managerEntries) { InstanceIdentifier iid = connectionIId .augmentation(OvsdbNodeAugmentation.class) diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbNodeRemoveCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbNodeRemoveCommand.java index aa194b5f3..7d5362f05 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbNodeRemoveCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbNodeRemoveCommand.java @@ -44,7 +44,7 @@ public class OvsdbNodeRemoveCommand extends AbstractTransactionCommand { try { ovsdbNodeOptional = ovsdbNodeFuture.get(); if (ovsdbNodeOptional.isPresent()) { - Node ovsdbNode = ovsdbNodeOptional.get(); + Node ovsdbNode = ovsdbNodeOptional.orElseThrow(); OvsdbNodeAugmentation ovsdbNodeAugmentation = ovsdbNode.augmentation(OvsdbNodeAugmentation.class); if (checkIfOnlyConnectedManager(ovsdbNodeAugmentation)) { if (ovsdbNodeAugmentation != null) { diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbPortUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbPortUpdateCommand.java index 17d5f2cea..da833983f 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbPortUpdateCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbPortUpdateCommand.java @@ -128,7 +128,7 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand { } Optional node = readNode(transaction, connectionIId); if (node.isPresent()) { - updateTerminationPoints(transaction, node.get()); + updateTerminationPoints(transaction, node.orElseThrow()); } } @@ -137,19 +137,20 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand { for (Entry portUpdate : portUpdatedRows.entrySet()) { String portName = null; portName = portUpdate.getValue().getNameColumn().getData(); - Optional> bridgeIid = getTerminationPointBridge(portUpdate.getKey()); - if (!bridgeIid.isPresent()) { - bridgeIid = getTerminationPointBridge(transaction, node, portName); + Optional> optBridgeIid = getTerminationPointBridge(portUpdate.getKey()); + if (optBridgeIid.isEmpty()) { + optBridgeIid = getTerminationPointBridge(transaction, node, portName); } - if (bridgeIid.isPresent()) { - NodeId bridgeId = SouthboundMapper.createManagedNodeId(bridgeIid.get()); + if (optBridgeIid.isPresent()) { + InstanceIdentifier bridgeIid = optBridgeIid.orElseThrow(); + NodeId bridgeId = SouthboundMapper.createManagedNodeId(bridgeIid); TerminationPointKey tpKey = new TerminationPointKey(new TpId(portName)); - getOvsdbConnectionInstance().updatePortInterface(portName, bridgeIid.get()); + getOvsdbConnectionInstance().updatePortInterface(portName, bridgeIid); TerminationPointBuilder tpBuilder = new TerminationPointBuilder(); tpBuilder.withKey(tpKey); tpBuilder.setTpId(tpKey.getTpId()); InstanceIdentifier tpPath = - getInstanceIdentifier(bridgeIid.get(), portUpdate.getValue()); + getInstanceIdentifier(bridgeIid, portUpdate.getValue()); OvsdbTerminationPointAugmentationBuilder tpAugmentationBuilder = new OvsdbTerminationPointAugmentationBuilder(); buildTerminationPoint(transaction, tpPath, tpAugmentationBuilder, node, portUpdate); @@ -178,7 +179,7 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand { if (getOvsdbConnectionInstance().getPortInterface(interfaceName) != null) { bridgeIid = Optional.of(getOvsdbConnectionInstance().getPortInterface(interfaceName)); } - if (!bridgeIid.isPresent()) { + if (bridgeIid.isEmpty()) { bridgeIid = getTerminationPointBridge(transaction, node, interfaceName); } if (bridgeIid.isPresent()) { @@ -190,7 +191,7 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand { new OvsdbTerminationPointAugmentationBuilder(); buildTerminationPoint(tpAugmentationBuilder, interfaceUpdate.getValue()); tpBuilder.addAugmentation(tpAugmentationBuilder.build()); - NodeId bridgeId = SouthboundMapper.createManagedNodeId(bridgeIid.get()); + NodeId bridgeId = SouthboundMapper.createManagedNodeId(bridgeIid.orElseThrow()); InstanceIdentifier tpPath = InstanceIdentifier .create(NetworkTopology.class) .child(Topology.class, new TopologyKey(SouthboundConstants.OVSDB_TOPOLOGY_ID)) @@ -205,11 +206,9 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand { protected void updateToDataStore(ReadWriteTransaction transaction, TerminationPointBuilder tpBuilder, InstanceIdentifier tpPath, boolean merge) { if (merge) { - transaction.merge(LogicalDatastoreType.OPERATIONAL, - tpPath, tpBuilder.build()); + transaction.merge(LogicalDatastoreType.OPERATIONAL, tpPath, tpBuilder.build()); } else { - transaction.put(LogicalDatastoreType.OPERATIONAL, - tpPath, tpBuilder.build()); + transaction.put(LogicalDatastoreType.OPERATIONAL, tpPath, tpBuilder.build()); } } @@ -280,7 +279,7 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand { Optional optManagedNode = SouthboundUtil.readNode(transaction, (InstanceIdentifier)managedNodeEntry.getBridgeRef().getValue()); if (optManagedNode.isPresent()) { - Node managedNode = optManagedNode.get(); + Node managedNode = optManagedNode.orElseThrow(); Map tpEntrys = managedNode.getTerminationPoint(); if (tpEntrys != null) { TerminationPoint tpEntry = tpEntrys.get(new TerminationPointKey(tpId)); diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQosRemovedCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQosRemovedCommand.java index 648cb3279..a5851eba3 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQosRemovedCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQosRemovedCommand.java @@ -57,7 +57,7 @@ public class OvsdbQosRemovedCommand extends AbstractTransactionCommand { InstanceIdentifier ovsdbNodeIid = SouthboundMapper.createInstanceIdentifier(getOvsdbConnectionInstance().getNodeId()); for (UUID qosUuid : removedQosRows.keySet()) { - QosEntriesKey qosKey = getQosEntriesKey(ovsdbNode.get(), qosUuid); + QosEntriesKey qosKey = getQosEntriesKey(ovsdbNode.orElseThrow(), qosUuid); if (qosKey != null) { InstanceIdentifier iid = ovsdbNodeIid .augmentation(OvsdbNodeAugmentation.class) diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQosUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQosUpdateCommand.java index c779ff69a..0cafa8e7a 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQosUpdateCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQosUpdateCommand.java @@ -104,20 +104,18 @@ public class OvsdbQosUpdateCommand extends AbstractTransactionCommand { QosEntriesBuilder qosEntryBuilder = new QosEntriesBuilder(); qosEntryBuilder.setQosId(new Uri(getQosId(qos))); qosEntryBuilder.setQosUuid(new Uuid(entry.getKey().toString())); - qosEntryBuilder.setQosType( - SouthboundMapper.createQosType(qos.getTypeColumn().getData())); + qosEntryBuilder.setQosType(SouthboundMapper.createQosType(qos.getTypeColumn().getData())); Qos oldQos = oldQosRows.get(entry.getKey()); setOtherConfig(transaction, qosEntryBuilder, oldQos, qos, nodeIId); setExternalIds(transaction, qosEntryBuilder, oldQos, qos, nodeIId); - setQueueList(transaction, qosEntryBuilder, oldQos, qos, nodeIId, ovsdbNode.get()); + setQueueList(transaction, qosEntryBuilder, oldQos, qos, nodeIId, ovsdbNode.orElseThrow()); QosEntries qosEntry = qosEntryBuilder.build(); - LOG.debug("Update Ovsdb Node {} with qos entries {}",ovsdbNode.get(), qosEntry); + LOG.debug("Update Ovsdb Node {} with qos entries {}", ovsdbNode.orElseThrow(), qosEntry); InstanceIdentifier iid = nodeIId .augmentation(OvsdbNodeAugmentation.class) .child(QosEntries.class, qosEntry.key()); - transaction.merge(LogicalDatastoreType.OPERATIONAL, - iid, qosEntry); + transaction.merge(LogicalDatastoreType.OPERATIONAL, iid, qosEntry); } } } diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQueueRemovedCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQueueRemovedCommand.java index 5dd2a2018..b53800b04 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQueueRemovedCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQueueRemovedCommand.java @@ -56,7 +56,7 @@ public class OvsdbQueueRemovedCommand extends AbstractTransactionCommand { InstanceIdentifier ovsdbNodeIid = SouthboundMapper.createInstanceIdentifier(getOvsdbConnectionInstance().getNodeId()); for (UUID queueUuid : removedQueueRows.keySet()) { - QueuesKey queueKey = getQueueKey(ovsdbNode.get(), queueUuid); + QueuesKey queueKey = getQueueKey(ovsdbNode.orElseThrow(), queueUuid); if (queueKey != null) { InstanceIdentifier iid = ovsdbNodeIid .augmentation(OvsdbNodeAugmentation.class) diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQueueUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQueueUpdateCommand.java index 571256a21..082bad34b 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQueueUpdateCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQueueUpdateCommand.java @@ -99,7 +99,7 @@ public class OvsdbQueueUpdateCommand extends AbstractTransactionCommand { setExternalIds(transaction, queuesBuilder, oldQueue, queue, nodeIId); Queues queues = queuesBuilder.build(); - LOG.debug("Update Ovsdb Node {} with queue entries {}",ovsdbNode.get(), queues); + LOG.debug("Update Ovsdb Node {} with queue entries {}",ovsdbNode.orElseThrow(), queues); InstanceIdentifier iid = nodeIId .augmentation(OvsdbNodeAugmentation.class) .child(Queues.class, queues.key()); diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeOperationalStateTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeOperationalStateTest.java index ad0df27cd..41593d537 100644 --- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeOperationalStateTest.java +++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeOperationalStateTest.java @@ -77,8 +77,7 @@ public class BridgeOperationalStateTest { @Test public void testGetBridgeNode() { - Optional optNodes = briOperationState.getBridgeNode(nodeIid); - assertEquals(brNode, optNodes.get()); + assertEquals(Optional.of(brNode), briOperationState.getBridgeNode(nodeIid)); } @Test @@ -96,7 +95,7 @@ public class BridgeOperationalStateTest { Optional ovsdbBriAugOptional = briOperationState.getOvsdbBridgeAugmentation( InstanceIdentifier.create(NetworkTopology.class)); assertNotNull(ovsdbBriAugOptional); - assertTrue(ovsdbBriAugOptional.get() instanceof OvsdbBridgeAugmentation); + assertTrue(ovsdbBriAugOptional.orElseThrow() instanceof OvsdbBridgeAugmentation); } @Test @@ -136,7 +135,7 @@ public class BridgeOperationalStateTest { Optional ovsdbTermPointOpt = briOperationState .getOvsdbTerminationPointAugmentation(InstanceIdentifier.create(NetworkTopology.class)); assertNotNull(ovsdbTermPointOpt); - assertTrue(ovsdbTermPointOpt.get() instanceof OvsdbTerminationPointAugmentation); + assertTrue(ovsdbTermPointOpt.orElseThrow() instanceof OvsdbTerminationPointAugmentation); } @Test diff --git a/utils/mdsal-utils/src/main/java/org/opendaylight/ovsdb/utils/mdsal/utils/MdsalUtils.java b/utils/mdsal-utils/src/main/java/org/opendaylight/ovsdb/utils/mdsal/utils/MdsalUtils.java index 1460d8bbb..c512f61fa 100644 --- a/utils/mdsal-utils/src/main/java/org/opendaylight/ovsdb/utils/mdsal/utils/MdsalUtils.java +++ b/utils/mdsal-utils/src/main/java/org/opendaylight/ovsdb/utils/mdsal/utils/MdsalUtils.java @@ -117,7 +117,7 @@ public class MdsalUtils { final LogicalDatastoreType store, final InstanceIdentifier path) { Optional optionalDataObject = readOptional(store, path); if (optionalDataObject.isPresent()) { - return optionalDataObject.get(); + return optionalDataObject.orElseThrow(); } LOG.debug("{}: Failed to read {}", Thread.currentThread().getStackTrace()[1], path); diff --git a/utils/mdsal-utils/src/test/java/org/opendaylight/ovsdb/utils/mdsal/utils/MdsalUtilsAsyncTest.java b/utils/mdsal-utils/src/test/java/org/opendaylight/ovsdb/utils/mdsal/utils/MdsalUtilsAsyncTest.java index 0cd742b6e..c687b69a7 100644 --- a/utils/mdsal-utils/src/test/java/org/opendaylight/ovsdb/utils/mdsal/utils/MdsalUtilsAsyncTest.java +++ b/utils/mdsal-utils/src/test/java/org/opendaylight/ovsdb/utils/mdsal/utils/MdsalUtilsAsyncTest.java @@ -170,11 +170,7 @@ public class MdsalUtilsAsyncTest extends AbstractDataBrokerTest { Optional optNode; try { optNode = future.get(); - if (optNode.isPresent()) { - assertEquals(DATA, optNode.get()); - } else { - fail("Couldn't read node"); - } + assertEquals(Optional.of(DATA), optNode); } catch (InterruptedException | ExecutionException e) { fail(e.getMessage()); } @@ -192,7 +188,7 @@ public class MdsalUtilsAsyncTest extends AbstractDataBrokerTest { final Optional result = databroker.newReadOnlyTransaction().read( LogicalDatastoreType.CONFIGURATION, TEST_IID).get(); if (result.isPresent()) { - return result.get(); + return result.orElseThrow(); } } catch (InterruptedException | ExecutionException e) { fail(e.getMessage());