Eliminate org.opendaylight.aaa.cert.utils

A separate package does not make sense, and it is not used anywhere,
fold it into aaa.cert.impl.

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

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 87b2b6e41fa1c59109ecbb9c24d1a1467a244779..0fe547a201980834f44c6ae4b087932240235c7a 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
@@ -12,8 +12,6 @@ import java.security.KeyStore;
 import java.util.ArrayList;
 import java.util.List;
 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.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;

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/impl/KeyStoresDataUtils.java
similarity index 98%
rename from aaa-cert/src/main/java/org/opendaylight/aaa/cert/utils/KeyStoresDataUtils.java
rename to aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/KeyStoresDataUtils.java
index fbdb0c134a01b49591086b93bc72b7559a2d5020..58f04682d868e866ac3abfd25206556e55187fe9 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/impl/KeyStoresDataUtils.java
@@ -5,11 +5,9 @@
  * 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;
+package org.opendaylight.aaa.cert.impl;
 
 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.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;

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/impl/MdsalUtils.java
similarity index 99%
rename from aaa-cert/src/main/java/org/opendaylight/aaa/cert/utils/MdsalUtils.java
rename to aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/MdsalUtils.java
index a5bee25b333ec9e79eb27bed8f1b1a4dea3584c7..80f071dbd9ca1b8a5395a4babfa07b2904632916 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/impl/MdsalUtils.java
@@ -5,7 +5,7 @@
  * 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;
+package org.opendaylight.aaa.cert.impl;
 
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;

diff --git a/aaa-cert/src/test/java/org/opendaylight/aaa/cert/impl/AaaCertMdsalProviderTest.java b/aaa-cert/src/test/java/org/opendaylight/aaa/cert/impl/AaaCertMdsalProviderTest.java
index bc7aa3cc2f1105504a333d5af34af8ea9bbf2276..d65b7044a0202ab8cdfcd3cc5b634ed2b8bece96 100644 (file)
--- a/aaa-cert/src/test/java/org/opendaylight/aaa/cert/impl/AaaCertMdsalProviderTest.java
+++ b/aaa-cert/src/test/java/org/opendaylight/aaa/cert/impl/AaaCertMdsalProviderTest.java
@@ -23,7 +23,6 @@ import java.util.List;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.opendaylight.aaa.cert.utils.KeyStoresDataUtils;
 import org.opendaylight.aaa.encrypt.AAAEncryptionService;
 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/test/java/org/opendaylight/aaa/cert/impl/AaaCertRpcServiceImplTest.java b/aaa-cert/src/test/java/org/opendaylight/aaa/cert/impl/AaaCertRpcServiceImplTest.java
index e54b7f657fbd01f8654fedcce609e11da5d76dee..044b3d2c002d5149cbb8baab50fe38181ade0375 100644 (file)
--- a/aaa-cert/src/test/java/org/opendaylight/aaa/cert/impl/AaaCertRpcServiceImplTest.java
+++ b/aaa-cert/src/test/java/org/opendaylight/aaa/cert/impl/AaaCertRpcServiceImplTest.java
@@ -22,7 +22,6 @@ import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.opendaylight.aaa.cert.api.IAaaCertProvider;
-import org.opendaylight.aaa.cert.utils.KeyStoresDataUtils;
 import org.opendaylight.aaa.encrypt.AAAEncryptionService;
 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/utils/KeyStoresDataUtilsTest.java b/aaa-cert/src/test/java/org/opendaylight/aaa/cert/impl/KeyStoresDataUtilsTest.java
similarity index 98%
rename from aaa-cert/src/test/java/org/opendaylight/aaa/cert/utils/KeyStoresDataUtilsTest.java
rename to aaa-cert/src/test/java/org/opendaylight/aaa/cert/impl/KeyStoresDataUtilsTest.java
index 978d5106d287577abb7794d83733aae512f18ee2..aceabf958b3249fdd816e44e2f7e6c02137f9d8b 100644 (file)
--- a/aaa-cert/src/test/java/org/opendaylight/aaa/cert/utils/KeyStoresDataUtilsTest.java
+++ b/aaa-cert/src/test/java/org/opendaylight/aaa/cert/impl/KeyStoresDataUtilsTest.java
@@ -5,7 +5,7 @@
  * 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;
+package org.opendaylight.aaa.cert.impl;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -24,8 +24,6 @@ import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.junit.MockitoJUnitRunner;
-import org.opendaylight.aaa.cert.impl.KeyStoreConstant;
-import org.opendaylight.aaa.cert.impl.ODLKeyTool;
 import org.opendaylight.aaa.encrypt.AAAEncryptionService;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.ReadTransaction;

diff --git a/aaa-cert/src/test/java/org/opendaylight/aaa/cert/utils/MdsalUtilsTest.java b/aaa-cert/src/test/java/org/opendaylight/aaa/cert/impl/MdsalUtilsTest.java
similarity index 96%
rename from aaa-cert/src/test/java/org/opendaylight/aaa/cert/utils/MdsalUtilsTest.java
rename to aaa-cert/src/test/java/org/opendaylight/aaa/cert/impl/MdsalUtilsTest.java
index 1a61036efcfdb825000927c2f3991b0db7d848ce..a91977f01add6d7e0f67b429f2f7db206a1e0999 100644 (file)
--- a/aaa-cert/src/test/java/org/opendaylight/aaa/cert/utils/MdsalUtilsTest.java
+++ b/aaa-cert/src/test/java/org/opendaylight/aaa/cert/impl/MdsalUtilsTest.java
@@ -5,14 +5,12 @@
  * 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;
+package org.opendaylight.aaa.cert.impl;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.opendaylight.aaa.cert.impl.KeyStoreConstant;
-import org.opendaylight.aaa.cert.impl.TestUtils;
 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;