Cleanup java.util.Optional references

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

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/FrontendReadWriteTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/FrontendReadWriteTransaction.java
index e2ae16f097fb1bac74a74065fe252bb3d389d692..28ab70a351bc15b56b68e5057abea8faf721dc78 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/FrontendReadWriteTransaction.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/FrontendReadWriteTransaction.java
@@ -509,12 +509,11 @@ final class FrontendReadWriteTransaction extends FrontendTransaction {
             throw new UnsupportedRequestException(request);
         }
 
-        final java.util.Optional<Exception> optFailure = request.getDelayedFailure();
+        final Optional<Exception> optFailure = request.getDelayedFailure();
         if (optFailure.isPresent()) {
             state = new Ready(history().createFailedCohort(getIdentifier(), sealedModification, optFailure.get()));
         } else {
-            state = new Ready(history().createReadyCohort(getIdentifier(), sealedModification,
-                    java.util.Optional.empty()));
+            state = new Ready(history().createReadyCohort(getIdentifier(), sealedModification, Optional.empty()));
         }
 
         if (request.isCoordinated()) {
@@ -562,7 +561,7 @@ final class FrontendReadWriteTransaction extends FrontendTransaction {
             final RequestEnvelope envelope, final long now) throws RequestException {
         // We need to examine the persistence protocol first to see if this is an idempotent request. If there is no
         // protocol, there is nothing for us to do.
-        final java.util.Optional<PersistenceProtocol> maybeProto = request.getPersistenceProtocol();
+        final Optional<PersistenceProtocol> maybeProto = request.getPersistenceProtocol();
         if (!maybeProto.isPresent()) {
             applyModifications(request.getModifications());
             return replyModifySuccess(request.getSequence());
@@ -608,7 +607,7 @@ final class FrontendReadWriteTransaction extends FrontendTransaction {
         }
 
         applyModifications(modifications);
-        state = new Ready(checkOpen().ready(java.util.Optional.empty()));
+        state = new Ready(checkOpen().ready(Optional.empty()));
         LOG.debug("{}: transitioned {} to ready", persistenceId(), getIdentifier());
     }