Migrate aaa-cert to MD-SAL APIs

This performs the very simple migration of aaa-cert.

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

diff --git a/aaa-cert/pom.xml b/aaa-cert/pom.xml
index 92787397901017c0046b0f0c40efce6bb0321532..e89933f946491f8bcf5dc04da6724988b4e5ff47 100644 (file)
--- a/aaa-cert/pom.xml
+++ b/aaa-cert/pom.xml
@@ -26,8 +26,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <artifactId>aaa-encrypt-service</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-api</artifactId>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>

diff --git a/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/AaaCertMdsalProvider.java b/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/AaaCertMdsalProvider.java
index c845bdb395ba67b139fd6d1c0d8a801a4d6934fb..87b2b6e41fa1c59109ecbb9c24d1a1467a244779 100644 (file)
--- a/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/AaaCertMdsalProvider.java
+++ b/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/AaaCertMdsalProvider.java
@@ -15,8 +15,8 @@ import org.opendaylight.aaa.cert.api.IAaaCertMdsalProvider;
 import org.opendaylight.aaa.cert.utils.KeyStoresDataUtils;
 import org.opendaylight.aaa.cert.utils.MdsalUtils;
 import org.opendaylight.aaa.encrypt.AAAEncryptionService;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.mdsal.rev160321.KeyStores;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.mdsal.rev160321.KeyStoresBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.mdsal.rev160321.cipher.suite.CipherSuites;

diff --git a/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/AaaCertRpcServiceImpl.java b/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/AaaCertRpcServiceImpl.java
index 46abb45a2acc4e15e0f6a60bbd44ea8c1e1a793e..437fc6b215636ae6a7901b4507fef33b426c7e89 100644 (file)
--- a/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/AaaCertRpcServiceImpl.java
+++ b/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/AaaCertRpcServiceImpl.java
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.aaa.cert.impl;
 
 import com.google.common.base.Strings;
@@ -13,7 +12,7 @@ import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
 import org.opendaylight.aaa.cert.api.IAaaCertProvider;
 import org.opendaylight.aaa.encrypt.AAAEncryptionService;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rev151126.AaaCertServiceConfig;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.AaaCertRpcService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.GetNodeCertifcateInput;

diff --git a/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/CertificateManagerService.java b/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/CertificateManagerService.java
index 76e004683412d6671d1659159c40ceb6f37c2b57..79cc53318c0bfe447f184a64d706a026a8952fe0 100644 (file)
--- a/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/CertificateManagerService.java
+++ b/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/CertificateManagerService.java
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.aaa.cert.impl;
 
 import java.io.File;
@@ -31,7 +30,7 @@ import org.apache.commons.lang3.RandomStringUtils;
 import org.opendaylight.aaa.cert.api.IAaaCertProvider;
 import org.opendaylight.aaa.cert.api.ICertificateManager;
 import org.opendaylight.aaa.encrypt.AAAEncryptionService;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rev151126.AaaCertServiceConfig;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rev151126.AaaCertServiceConfigBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rev151126.aaa.cert.service.config.CtlKeystore;
@@ -118,17 +117,17 @@ public class CertificateManagerService implements ICertificateManager {
     }
 
     @Override
-    public String getCertificateTrustStore(String storePasswd, String alias, boolean withTag) {
+    public String getCertificateTrustStore(final String storePasswd, final String alias, final boolean withTag) {
         return aaaCertProvider.getCertificateTrustStore(storePasswd, alias, withTag);
     }
 
     @Override
-    public String getODLKeyStoreCertificate(String storePasswd, boolean withTag) {
+    public String getODLKeyStoreCertificate(final String storePasswd, final boolean withTag) {
         return aaaCertProvider.getODLKeyStoreCertificate(storePasswd, withTag);
     }
 
     @Override
-    public String genODLKeyStoreCertificateReq(String storePasswd, boolean withTag) {
+    public String genODLKeyStoreCertificateReq(final String storePasswd, final boolean withTag) {
         return aaaCertProvider.genODLKeyStoreCertificateReq(storePasswd, withTag);
     }
 
@@ -161,8 +160,9 @@ public class CertificateManagerService implements ICertificateManager {
     }
 
     @Override
-    public boolean importSslDataKeystores(String odlKeystoreName, String odlKeystorePwd, String odlKeystoreAlias,
-            String trustKeystoreName, String trustKeystorePwd, String[] cipherSuites, String tlsProtocols) {
+    public boolean importSslDataKeystores(final String odlKeystoreName, final String odlKeystorePwd,
+            final String odlKeystoreAlias, final String trustKeystoreName, final String trustKeystorePwd,
+            final String[] cipherSuites, final String tlsProtocols) {
         DefaultMdsalSslData mdsalCertProvider = (DefaultMdsalSslData) aaaCertProvider;
         if (mdsalCertProvider == null) {
             LOG.debug("aaaCertProvider is not MD-Sal Certificate Provider");
@@ -182,7 +182,7 @@ public class CertificateManagerService implements ICertificateManager {
         mdsalCertProvider.exportSslDataKeystores();
     }
 
-    private void updateCertManagerSrvConfig(String ctlPwd, String trustPwd) {
+    private static void updateCertManagerSrvConfig(final String ctlPwd, final String trustPwd) {
         try {
             LOG.debug("Update Certificate manager service config file");
             final File configFile = new File(DEFAULT_CONFIG_FILE_PATH);

diff --git a/aaa-cert/src/main/java/org/opendaylight/aaa/cert/utils/KeyStoresDataUtils.java b/aaa-cert/src/main/java/org/opendaylight/aaa/cert/utils/KeyStoresDataUtils.java
index 9e697f30701481b04b710b2b1f470ff972fcd854..fbdb0c134a01b49591086b93bc72b7559a2d5020 100644 (file)
--- a/aaa-cert/src/main/java/org/opendaylight/aaa/cert/utils/KeyStoresDataUtils.java
+++ b/aaa-cert/src/main/java/org/opendaylight/aaa/cert/utils/KeyStoresDataUtils.java
@@ -5,15 +5,14 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.aaa.cert.utils;
 
 import java.util.List;
 import org.opendaylight.aaa.cert.impl.KeyStoreConstant;
 import org.opendaylight.aaa.cert.impl.ODLKeyTool;
 import org.opendaylight.aaa.encrypt.AAAEncryptionService;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.mdsal.rev160321.KeyStores;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.mdsal.rev160321.cipher.suite.CipherSuites;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.mdsal.rev160321.cipher.suite.CipherSuitesBuilder;

diff --git a/aaa-cert/src/main/java/org/opendaylight/aaa/cert/utils/MdsalUtils.java b/aaa-cert/src/main/java/org/opendaylight/aaa/cert/utils/MdsalUtils.java
index 23f39980cca29fa3bf10a19dfddaf1b473f28b7a..7e3003fff1394fe27c0c29228ec58b29583ee48e 100644 (file)
--- a/aaa-cert/src/main/java/org/opendaylight/aaa/cert/utils/MdsalUtils.java
+++ b/aaa-cert/src/main/java/org/opendaylight/aaa/cert/utils/MdsalUtils.java
@@ -5,19 +5,18 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.aaa.cert.utils;
 
-import com.google.common.base.Optional;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.MoreExecutors;
+import java.util.Optional;
 import java.util.concurrent.ExecutionException;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
-import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.ReadTransaction;
+import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.mdsal.common.api.CommitInfo;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
@@ -143,7 +142,7 @@ public final class MdsalUtils {
      */
     public static <D extends org.opendaylight.yangtools.yang.binding.DataObject> D read(
             final DataBroker dataBroker, final LogicalDatastoreType store, final InstanceIdentifier<D> path)  {
-        try (ReadOnlyTransaction transaction = dataBroker.newReadOnlyTransaction()) {
+        try (ReadTransaction transaction = dataBroker.newReadOnlyTransaction()) {
             Optional<D> optionalDataObject = transaction.read(store, path).get();
             if (optionalDataObject.isPresent()) {
                 return optionalDataObject.get();

diff --git a/aaa-cert/src/main/resources/org/opendaylight/blueprint/aaaCert.xml b/aaa-cert/src/main/resources/org/opendaylight/blueprint/aaaCert.xml
index 71af6d731fd684b07bd66197df829e37de516264..4b54c6cfa9dde2836fd4bad7962f11829492423c 100644 (file)
--- a/aaa-cert/src/main/resources/org/opendaylight/blueprint/aaaCert.xml
+++ b/aaa-cert/src/main/resources/org/opendaylight/blueprint/aaaCert.xml
@@ -6,7 +6,7 @@
                             binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rev151126.AaaCertServiceConfig">
   </odl:clustered-app-config>
 
-  <reference id="dataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker" odl:type="default"/>
+  <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker" odl:type="default"/>
 
   <reference id="encryService" interface="org.opendaylight.aaa.encrypt.AAAEncryptionService"/>
 
@@ -26,4 +26,4 @@
 
   <odl:rpc-implementation ref="aaaCertRpcService" />
 
-</blueprint>
\ No newline at end of file
+</blueprint>

diff --git a/aaa-cert/src/test/java/org/opendaylight/aaa/cert/test/KeyStoresDataUtilsTest.java b/aaa-cert/src/test/java/org/opendaylight/aaa/cert/test/KeyStoresDataUtilsTest.java
index edab73d45c301d0ce19654808fd0598eba64e45b..5abd4ba90f528ae582cd4461cd0e293474ea6406 100644 (file)
--- a/aaa-cert/src/test/java/org/opendaylight/aaa/cert/test/KeyStoresDataUtilsTest.java
+++ b/aaa-cert/src/test/java/org/opendaylight/aaa/cert/test/KeyStoresDataUtilsTest.java
@@ -5,12 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.aaa.cert.test;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.isA;
+import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.mock;
 
 import java.io.File;
@@ -27,8 +26,8 @@ import org.opendaylight.aaa.cert.impl.ODLKeyTool;
 import org.opendaylight.aaa.cert.utils.KeyStoresDataUtils;
 import org.opendaylight.aaa.cert.utils.MdsalUtils;
 import org.opendaylight.aaa.encrypt.AAAEncryptionService;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.mdsal.rev160321.cipher.suite.CipherSuites;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.mdsal.rev160321.cipher.suite.CipherSuitesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.mdsal.rev160321.key.stores.SslData;

diff --git a/aaa-cert/src/test/java/org/opendaylight/aaa/cert/test/MdsalUtilsTest.java b/aaa-cert/src/test/java/org/opendaylight/aaa/cert/test/MdsalUtilsTest.java
index 7c3ff7019a3c70e0aa7cda2d8906944ad7029c08..fe2c3a3645afc9c1fae8850c6a271c24e521e73b 100644 (file)
--- a/aaa-cert/src/test/java/org/opendaylight/aaa/cert/test/MdsalUtilsTest.java
+++ b/aaa-cert/src/test/java/org/opendaylight/aaa/cert/test/MdsalUtilsTest.java
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.aaa.cert.test;
 
 import static org.junit.Assert.assertTrue;
@@ -14,8 +13,8 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.opendaylight.aaa.cert.impl.KeyStoreConstant;
 import org.opendaylight.aaa.cert.utils.MdsalUtils;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.mdsal.rev160321.KeyStores;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.mdsal.rev160321.key.stores.SslData;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.mdsal.rev160321.key.stores.SslDataBuilder;

diff --git a/aaa-cert/src/test/java/org/opendaylight/aaa/cert/test/TestUtils.java b/aaa-cert/src/test/java/org/opendaylight/aaa/cert/test/TestUtils.java
index 717a1563388987268f592c8c155d96781fe788d4..b5215cfd4c920dc890ce3f94683290a557b8f12e 100644 (file)
--- a/aaa-cert/src/test/java/org/opendaylight/aaa/cert/test/TestUtils.java
+++ b/aaa-cert/src/test/java/org/opendaylight/aaa/cert/test/TestUtils.java
@@ -7,19 +7,19 @@
  */
 package org.opendaylight.aaa.cert.test;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import com.google.common.base.Optional;
-import com.google.common.util.concurrent.Futures;
+import java.util.Optional;
 import org.opendaylight.aaa.cert.impl.KeyStoreConstant;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
-import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.ReadTransaction;
+import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.mdsal.common.api.CommitInfo;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.mdsal.rev160321.key.stores.SslData;
+import org.opendaylight.yangtools.util.concurrent.FluentFutures;
 
 /**
  * Utilities for test, the certificate needs to be updated yearly.
@@ -53,9 +53,10 @@ public final class TestUtils {
 
     }
 
-    public static DataBroker mockDataBroker(SslData sslData) throws Exception {
-        final ReadOnlyTransaction readOnlyTransaction = mock(ReadOnlyTransaction.class);
-        when(readOnlyTransaction.read(any(), any())).thenReturn(Futures.immediateCheckedFuture(Optional.of(sslData)));
+    public static DataBroker mockDataBroker(final SslData sslData) throws Exception {
+        final ReadTransaction readOnlyTransaction = mock(ReadTransaction.class);
+        when(readOnlyTransaction.read(any(), any())).thenReturn(FluentFutures.immediateFluentFuture(
+            Optional.of(sslData)));
 
         final WriteTransaction writeTransaction = mock(WriteTransaction.class);
         doReturn(CommitInfo.emptyFluentFuture()).when(writeTransaction).commit();