try {
Optional<DeviceTransaction> deviceTxOpt = deviceTxFuture.get();
if (deviceTxOpt.isPresent()) {
- deviceTx = deviceTxOpt.get();
+ deviceTx = deviceTxOpt.orElseThrow();
} else {
LOG.error("Device transaction for device {} was not found!", deviceId);
return Optional.empty();
.container.org.openroadm.device.OduConnection> otnXc = getOtnCrossConnect(deviceId, connectionName);
if (otnXc.isPresent()) {
- interfList.add(otnXc.get().getSource().getSrcIf());
- interfList.add(otnXc.get().getDestination().getDstIf());
+ interfList.add(otnXc.orElseThrow().getSource().getSrcIf());
+ interfList.add(otnXc.orElseThrow().getDestination().getDstIf());
} else {
LOG.warn("Cross connect {} does not exist, halting delete", connectionName);
return null;
try {
Optional<DeviceTransaction> deviceTxOpt = deviceTxFuture.get();
if (deviceTxOpt.isPresent()) {
- deviceTx = deviceTxOpt.get();
+ deviceTx = deviceTxOpt.orElseThrow();
} else {
LOG.error("Device transaction for device {} was not found!", deviceId);
return null;