Migrate callers of Optional.get()

[aaa.git] / aaa-shiro / impl / src / main / java / org / opendaylight / aaa / shiro / realm / MdsalRealm.java

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()) {