RANGER-5517: retaining package name for duplicated classes

Author: mneethiraj

…a/org/apache/ranger/common/XMLUtils.java …/apache/ranger/plugin/util/XMLUtils.javakms/src/main/java/org/apache/ranger/common/XMLUtils.java renamed to embeddedwebserver/src/main/java/org/apache/ranger/plugin/util/XMLUtils.java kms/src/main/java/org/apache/ranger/common/XMLUtils.java renamed to embeddedwebserver/src/main/java/org/apache/ranger/plugin/util/XMLUtils.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.ranger.common;
+package org.apache.ranger.plugin.util;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServerUtil.java

@@ -20,6 +20,7 @@
 package org.apache.ranger.server.tomcat;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.ranger.plugin.util.XMLUtils;
 
 import java.util.ArrayList;
 import java.util.List;

kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStore.java

@@ -24,10 +24,10 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.crypto.key.KeyProvider.Metadata;
 import org.apache.hadoop.crypto.key.RangerKeyStoreProvider.KeyMetadata;
-import org.apache.ranger.common.JsonUtilsV2;
 import org.apache.ranger.entity.XXRangerKeyStore;
 import org.apache.ranger.kms.dao.DaoManager;
 import org.apache.ranger.kms.dao.RangerKMSDao;
+import org.apache.ranger.plugin.util.JsonUtilsV2;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStoreProvider.java

@@ -22,12 +22,12 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.crypto.CipherSuite;
 import org.apache.hadoop.fs.Path;
-import org.apache.ranger.common.AutoClosableLock.AutoClosableReadLock;
-import org.apache.ranger.common.AutoClosableLock.AutoClosableTryWriteLock;
-import org.apache.ranger.common.AutoClosableLock.AutoClosableWriteLock;
-import org.apache.ranger.common.JsonUtilsV2;
 import org.apache.ranger.credentialapi.CredentialReader;
 import org.apache.ranger.kms.dao.DaoManager;
+import org.apache.ranger.plugin.util.AutoClosableLock.AutoClosableReadLock;
+import org.apache.ranger.plugin.util.AutoClosableLock.AutoClosableTryWriteLock;
+import org.apache.ranger.plugin.util.AutoClosableLock.AutoClosableWriteLock;
+import org.apache.ranger.plugin.util.JsonUtilsV2;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

kms/src/main/java/org/apache/hadoop/crypto/key/RangerMasterKey.java

@@ -23,10 +23,10 @@
 import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
 import org.apache.hadoop.thirdparty.com.google.common.base.Splitter;
 import org.apache.hadoop.thirdparty.com.google.common.collect.Lists;
-import org.apache.ranger.common.XMLUtils;
 import org.apache.ranger.entity.XXRangerMasterKey;
 import org.apache.ranger.kms.dao.DaoManager;
 import org.apache.ranger.kms.dao.RangerMasterKeyDao;
+import org.apache.ranger.plugin.util.XMLUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONReader.java

@@ -18,7 +18,7 @@
 package org.apache.hadoop.crypto.key.kms.server;
 
 import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.ranger.common.JsonUtilsV2;
+import org.apache.ranger.plugin.util.JsonUtilsV2;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.WebApplicationException;

kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSJSONWriter.java

@@ -18,7 +18,7 @@
 package org.apache.hadoop.crypto.key.kms.server;
 
 import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.ranger.common.JsonUtilsV2;
+import org.apache.ranger.plugin.util.JsonUtilsV2;
 
 import javax.ws.rs.Produces;
 import javax.ws.rs.WebApplicationException;

kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KeyAuthorizationKeyProvider.java

@@ -27,8 +27,8 @@
 import org.apache.hadoop.security.authorize.AuthorizationException;
 import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
 import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableMap;
-import org.apache.ranger.common.AutoClosableLock.AutoClosableReadLock;
-import org.apache.ranger.common.AutoClosableLock.AutoClosableWriteLock;
+import org.apache.ranger.plugin.util.AutoClosableLock.AutoClosableReadLock;
+import org.apache.ranger.plugin.util.AutoClosableLock.AutoClosableWriteLock;
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;

kms/src/main/java/org/apache/ranger/common/RangerJsonProvider.java

@@ -19,6 +19,7 @@
 package org.apache.ranger.common;
 
 import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
+import org.apache.ranger.plugin.util.JsonUtilsV2;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;

kms/src/main/java/org/apache/ranger/kms/metrics/KMSMetricWrapper.java

@@ -18,11 +18,11 @@
 
 package org.apache.ranger.kms.metrics;
 
-import org.apache.ranger.common.JsonUtilsV2;
 import org.apache.ranger.kms.metrics.collector.KMSMetricsCollector;
 import org.apache.ranger.kms.metrics.source.KMSMetricSource;
 import org.apache.ranger.metrics.RangerMetricsSystemWrapper;
 import org.apache.ranger.metrics.wrapper.RangerMetricsSourceWrapper;
+import org.apache.ranger.plugin.util.JsonUtilsV2;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;