Fix warnings in aaa-shiro

We have a few deprecation warnings, fix them up.

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

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 282fef53a89da6d2ae530e7ae58c5dbf55bd2b81..2106925998f8e9d7909a9974813ff9fe72d2515f 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
@@ -26,7 +26,6 @@ import org.apache.shiro.web.filter.authz.AuthorizationFilter;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.DataListener;
 import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
-import org.opendaylight.mdsal.binding.api.ReadTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.aaa.rev161214.HttpAuthorization;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.aaa.rev161214.http.authorization.policies.Policies;
@@ -48,7 +47,7 @@ import org.slf4j.LoggerFactory;
 public class MDSALDynamicAuthorizationFilter extends AuthorizationFilter implements DataListener<HttpAuthorization> {
     private static final Logger LOG = LoggerFactory.getLogger(MDSALDynamicAuthorizationFilter.class);
 
-    private static final DataTreeIdentifier<HttpAuthorization> AUTHZ_CONTAINER = DataTreeIdentifier.create(
+    private static final DataTreeIdentifier<HttpAuthorization> AUTHZ_CONTAINER = DataTreeIdentifier.of(
             LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(HttpAuthorization.class));
 
     private static final ThreadLocal<DataBroker> DATABROKER_TL = new ThreadLocal<>();
@@ -73,8 +72,8 @@ public class MDSALDynamicAuthorizationFilter extends AuthorizationFilter impleme
 
     @Override
     public Filter processPathConfig(final String path, final String config) {
-        try (ReadTransaction tx = dataBroker.newReadOnlyTransaction()) {
-            authContainer = tx.read(AUTHZ_CONTAINER.getDatastoreType(), AUTHZ_CONTAINER.getRootIdentifier());
+        try (var tx = dataBroker.newReadOnlyTransaction()) {
+            authContainer = tx.read(AUTHZ_CONTAINER.datastore(), AUTHZ_CONTAINER.path());
         }
         reg = dataBroker.registerDataListener(AUTHZ_CONTAINER, this);
         return super.processPathConfig(path, config);

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 2f6853fbd507f47eb770060305a6400ad74d15e4..b6ba41d5ffb62479ea61173cb7d6fb5e9a2339ea 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
@@ -31,7 +31,6 @@ import org.opendaylight.aaa.shiro.realm.util.TokenUtils;
 import org.opendaylight.aaa.shiro.realm.util.http.header.HeaderUtils;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
-import org.opendaylight.mdsal.binding.api.ReadTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.aaa.rev161214.Authentication;
 import org.opendaylight.yangtools.concepts.Registration;
@@ -48,7 +47,7 @@ public class MdsalRealm extends AuthorizingRealm implements Destroyable {
     /**
      * InstanceIdentifier for the authentication container.
      */
-    private static final DataTreeIdentifier<Authentication> AUTH_TREE_ID = DataTreeIdentifier.create(
+    private static final DataTreeIdentifier<Authentication> AUTH_TREE_ID = DataTreeIdentifier.of(
             LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(Authentication.class));
 
     private static final ThreadLocal<PasswordHashService> PASSWORD_HASH_SERVICE_TL = new ThreadLocal<>();
@@ -70,8 +69,8 @@ public class MdsalRealm extends AuthorizingRealm implements Destroyable {
     public MdsalRealm(final PasswordHashService passwordHashService, final DataBroker dataBroker) {
         this.passwordHashService = requireNonNull(passwordHashService);
 
-        try (ReadTransaction tx = dataBroker.newReadOnlyTransaction()) {
-            authentication = tx.read(AUTH_TREE_ID.getDatastoreType(), AUTH_TREE_ID.getRootIdentifier());
+        try (var tx = dataBroker.newReadOnlyTransaction()) {
+            authentication = tx.read(AUTH_TREE_ID.datastore(), AUTH_TREE_ID.path());
         }
 
         reg = dataBroker.registerDataListener(AUTH_TREE_ID, this::onAuthenticationChanged);