Migrate callers of Optional.get()

Use Optional.orElseThrow() instead.

Change-Id: I0b12efb5a35fa3f5e56b219ee7c213f653eb0aad
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/MdsalUtils.java b/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/MdsalUtils.java
index 80f071dbd9ca1b8a5395a4babfa07b2904632916..4fafebd7d68ab9f3bc0896d544a3c4faa8c07dee 100644 (file)
--- a/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/MdsalUtils.java
+++ b/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/MdsalUtils.java
@@ -143,7 +143,7 @@ public final class MdsalUtils {
         try (ReadTransaction transaction = dataBroker.newReadOnlyTransaction()) {
             Optional<D> optionalDataObject = transaction.read(store, path).get();
             if (optionalDataObject.isPresent()) {
-                return optionalDataObject.get();
+                return optionalDataObject.orElseThrow();
             }
         } catch (InterruptedException | ExecutionException e) {
             LOG.warn("Failed to read {} ", path, e);

diff --git a/aaa-cli-jar/src/main/java/org/opendaylight/aaa/cli/jar/StandaloneCommandLineInterface.java b/aaa-cli-jar/src/main/java/org/opendaylight/aaa/cli/jar/StandaloneCommandLineInterface.java
index 01475df4b927edb725176c284f9a6bc48e6d7dd5..3b85ca6e04f45aaf8a7a9752ebd8ed8253a5629c 100644 (file)
--- a/aaa-cli-jar/src/main/java/org/opendaylight/aaa/cli/jar/StandaloneCommandLineInterface.java
+++ b/aaa-cli-jar/src/main/java/org/opendaylight/aaa/cli/jar/StandaloneCommandLineInterface.java
@@ -62,7 +62,7 @@ public class StandaloneCommandLineInterface {
         if (!optUser.isPresent()) {
             return false;
         } else {
-            User user = optUser.get();
+            User user = optUser.orElseThrow();
             user.setPassword(newPassword);
             identityStore.updateUser(user);
             return true;
@@ -78,7 +78,7 @@ public class StandaloneCommandLineInterface {
         if (!optUser.isPresent()) {
             return false;
         } else {
-            User user = optUser.get();
+            User user = optUser.orElseThrow();
             return passwordService.passwordsMatch(password, user.getPassword(), user.getSalt());
         }
     }

diff --git a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/realm/MDSALDynamicAuthorizationFilter.java b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/realm/MDSALDynamicAuthorizationFilter.java
index 38c6ee8bcebe6e4050c14b5cafff807ebb935a1b..21b743773fe966a090597a0641fe7fdddf491863 100644 (file)
--- a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/realm/MDSALDynamicAuthorizationFilter.java
+++ b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/realm/MDSALDynamicAuthorizationFilter.java
@@ -129,7 +129,7 @@ public class MDSALDynamicAuthorizationFilter extends AuthorizationFilter
             return true;
         }
 
-        final HttpAuthorization httpAuthorization = authorizationOptional.get();
+        final HttpAuthorization httpAuthorization = authorizationOptional.orElseThrow();
         final var policies = httpAuthorization.getPolicies();
         List<Policies> policiesList = policies != null ? policies.getPolicies() : null;
         if (policiesList == null || policiesList.isEmpty()) {

diff --git a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/realm/MdsalRealm.java b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/realm/MdsalRealm.java
index a160d80244731177e2acd7164042ade22de25add..bcc8954c796bbc48d4f059dc5bc7862d1cb0b4b4 100644 (file)
--- a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/realm/MdsalRealm.java
+++ b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/realm/MdsalRealm.java
@@ -113,7 +113,7 @@ public class MdsalRealm extends AuthorizingRealm implements Destroyable {
         final ODLPrincipal odlPrincipal = (ODLPrincipal)principalCollection.getPrimaryPrincipal();
         final Optional<Authentication> opt = getAuthenticationContainer();
         if (opt.isPresent()) {
-            final Authentication auth = opt.get();
+            final Authentication auth = opt.orElseThrow();
 
             // iterate through and determine the appropriate roles based on the programmed grants
             final Grants grants = auth.getGrants();
@@ -155,7 +155,7 @@ public class MdsalRealm extends AuthorizingRealm implements Destroyable {
         final String username = TokenUtils.extractUsername(authenticationToken);
         final Optional<Authentication> opt = getAuthenticationContainer();
         if (opt.isPresent()) {
-            final Authentication auth = opt.get();
+            final Authentication auth = opt.orElseThrow();
             final Users users = auth.getUsers();
             for (org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.aaa.rev161214.authentication.users
                     .Users u : users.nonnullUsers().values()) {