Repository: incubator-ranger Updated Branches: refs/heads/master f04e11101 -> 1fe2d3ec6
RANGER-883 - Fix remaining "imports" issues Signed-off-by: Alok Lal <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/1fe2d3ec Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/1fe2d3ec Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/1fe2d3ec Branch: refs/heads/master Commit: 1fe2d3ec612587abb2cb59dd9776de701cd288ca Parents: f04e111 Author: Colm O hEigeartaigh <[email protected]> Authored: Mon Mar 14 14:21:25 2016 +0000 Committer: Alok Lal <[email protected]> Committed: Mon Mar 14 12:32:06 2016 -0700 ---------------------------------------------------------------------- .../ranger/audit/destination/HDFSAuditDestination.java | 3 +-- .../ranger/audit/destination/SolrAuditDestination.java | 1 - .../java/org/apache/ranger/audit/provider/MiscUtil.java | 4 ++-- .../ranger/audit/provider/hdfs/HdfsLogDestination.java | 2 +- .../plugin/policyengine/RangerPolicyEngineCache.java | 1 - .../ranger/plugin/store/file/ServiceFileStore.java | 1 - dev-support/ranger-pmd-ruleset.xml | 5 +---- .../hbase/RangerAuthorizationCoprocessor.java | 8 ++++---- .../services/hbase/client/HBaseConnectionMgr.java | 1 - .../hadoop/agent/HadoopAuthClassTransformer.java | 2 +- .../ranger/services/hdfs/client/HdfsConnectionMgr.java | 1 - .../hadoop/crypto/key/RangerKeyStoreProvider.java | 2 -- .../ranger/services/knox/client/KnoxConnectionMgr.java | 1 - .../kafka/authorizer/RangerKafkaAuthorizer.java | 2 +- .../solr/authorizer/RangerSolrAuthorizer.java | 3 +-- .../apache/ranger/services/yarn/client/YarnClient.java | 1 - .../apache/ranger/policyengine/CommandLineParser.java | 6 +++++- .../src/main/java/org/apache/ranger/biz/AssetMgr.java | 12 ++++++------ .../org/apache/ranger/patch/PatchMigration_J10002.java | 1 - 19 files changed, 23 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1fe2d3ec/agents-audit/src/main/java/org/apache/ranger/audit/destination/HDFSAuditDestination.java ---------------------------------------------------------------------- diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/destination/HDFSAuditDestination.java b/agents-audit/src/main/java/org/apache/ranger/audit/destination/HDFSAuditDestination.java index 96755be..519d943 100644 --- a/agents-audit/src/main/java/org/apache/ranger/audit/destination/HDFSAuditDestination.java +++ b/agents-audit/src/main/java/org/apache/ranger/audit/destination/HDFSAuditDestination.java @@ -214,8 +214,7 @@ public class HDFSAuditDestination extends AuditDestination { currentTime.getTime()); Configuration conf = createConfiguration(); - String fullPath = parentFolder - + org.apache.hadoop.fs.Path.SEPARATOR + fileName; + String fullPath = parentFolder + Path.SEPARATOR + fileName; String defaultPath = fullPath; URI uri = URI.create(fullPath); FileSystem fileSystem = FileSystem.get(uri, conf); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1fe2d3ec/agents-audit/src/main/java/org/apache/ranger/audit/destination/SolrAuditDestination.java ---------------------------------------------------------------------- diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/destination/SolrAuditDestination.java b/agents-audit/src/main/java/org/apache/ranger/audit/destination/SolrAuditDestination.java index df471c3..43b8244 100644 --- a/agents-audit/src/main/java/org/apache/ranger/audit/destination/SolrAuditDestination.java +++ b/agents-audit/src/main/java/org/apache/ranger/audit/destination/SolrAuditDestination.java @@ -26,7 +26,6 @@ import java.util.Properties; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.ranger.audit.destination.AuditDestination; import org.apache.ranger.audit.model.AuditEventBase; import org.apache.ranger.audit.model.AuthzAuditEvent; import org.apache.ranger.audit.provider.MiscUtil; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1fe2d3ec/agents-audit/src/main/java/org/apache/ranger/audit/provider/MiscUtil.java ---------------------------------------------------------------------- diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/MiscUtil.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/MiscUtil.java index b7b28ed..752a6df 100644 --- a/agents-audit/src/main/java/org/apache/ranger/audit/provider/MiscUtil.java +++ b/agents-audit/src/main/java/org/apache/ranger/audit/provider/MiscUtil.java @@ -438,7 +438,7 @@ public class MiscUtil { if (subject != null) { logger.info("SUBJECT.PRINCIPALS.size()=" + subject.getPrincipals().size()); - java.util.Set<Principal> principals = subject.getPrincipals(); + Set<Principal> principals = subject.getPrincipals(); for (Principal principal : principals) { logger.info("SUBJECT.PRINCIPAL.NAME=" + principal.getName()); } @@ -534,7 +534,7 @@ public class MiscUtil { .createRemoteUser(userName); String groups[] = ugi.getGroupNames(); if (groups != null && groups.length > 0) { - java.util.Set<String> groupsSet = new java.util.HashSet<String>(); + Set<String> groupsSet = new java.util.HashSet<String>(); for (int i = 0; i < groups.length; i++) { groupsSet.add(groups[i]); } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1fe2d3ec/agents-audit/src/main/java/org/apache/ranger/audit/provider/hdfs/HdfsLogDestination.java ---------------------------------------------------------------------- diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/hdfs/HdfsLogDestination.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/hdfs/HdfsLogDestination.java index 61e8135..0951c64 100644 --- a/agents-audit/src/main/java/org/apache/ranger/audit/provider/hdfs/HdfsLogDestination.java +++ b/agents-audit/src/main/java/org/apache/ranger/audit/provider/hdfs/HdfsLogDestination.java @@ -260,7 +260,7 @@ public class HdfsLogDestination<T> implements LogDestination<T> { long startTime = MiscUtil.getRolloverStartTime(mNextRolloverTime, (mRolloverIntervalSeconds * 1000L)); - mHdfsFilename = MiscUtil.replaceTokens(mDirectory + org.apache.hadoop.fs.Path.SEPARATOR + mFile, startTime); + mHdfsFilename = MiscUtil.replaceTokens(mDirectory + Path.SEPARATOR + mFile, startTime); FSDataOutputStream ostream = null; FileSystem fileSystem = null; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1fe2d3ec/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineCache.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineCache.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineCache.java index f345ca2..03ea811 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineCache.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineCache.java @@ -25,7 +25,6 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.ranger.plugin.policyengine.RangerPolicyEngineOptions; import org.apache.ranger.plugin.store.ServiceStore; import org.apache.ranger.plugin.util.ServicePolicies; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1fe2d3ec/agents-common/src/main/java/org/apache/ranger/plugin/store/file/ServiceFileStore.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/store/file/ServiceFileStore.java b/agents-common/src/main/java/org/apache/ranger/plugin/store/file/ServiceFileStore.java index a68a6ed..3a37517 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/store/file/ServiceFileStore.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/store/file/ServiceFileStore.java @@ -39,7 +39,6 @@ import org.apache.ranger.plugin.model.RangerServiceDef; import org.apache.ranger.plugin.store.AbstractServiceStore; import org.apache.ranger.plugin.store.EmbeddedServiceDefsUtil; import org.apache.ranger.plugin.store.ServicePredicateUtil; -import org.apache.ranger.plugin.store.file.FileStoreUtil; import org.apache.ranger.plugin.util.SearchFilter; import org.apache.ranger.plugin.util.ServicePolicies; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1fe2d3ec/dev-support/ranger-pmd-ruleset.xml ---------------------------------------------------------------------- diff --git a/dev-support/ranger-pmd-ruleset.xml b/dev-support/ranger-pmd-ruleset.xml index 741601e..4db1881 100644 --- a/dev-support/ranger-pmd-ruleset.xml +++ b/dev-support/ranger-pmd-ruleset.xml @@ -42,10 +42,7 @@ <exclude name="UnusedPrivateField" /> <exclude name="UnusedPrivateMethod" /> </rule> - <rule ref="rulesets/java/imports.xml" > - <exclude name="ImportFromSamePackage" /> - <exclude name="UnnecessaryFullyQualifiedName" /> - </rule> + <rule ref="rulesets/java/imports.xml" /> <rule ref="rulesets/java/braces.xml"> <exclude name="ForLoopsMustUseBraces" /> <exclude name="IfElseStmtsMustUseBraces" /> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1fe2d3ec/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java ---------------------------------------------------------------------- diff --git a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java index c40b7de..fb912c3 100644 --- a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java +++ b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java @@ -1232,8 +1232,8 @@ public class RangerAuthorizationCoprocessor extends RangerAuthorizationCoprocess } private GrantRevokeRequest createGrantData(AccessControlProtos.GrantRequest request) throws Exception { - org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission up = request.getUserPermission(); - org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission perm = up == null ? null : up.getPermission(); + AccessControlProtos.UserPermission up = request.getUserPermission(); + AccessControlProtos.Permission perm = up == null ? null : up.getPermission(); UserPermission userPerm = up == null ? null : ProtobufUtil.toUserPermission(up); Permission.Action[] actions = userPerm == null ? null : userPerm.getActions(); @@ -1334,8 +1334,8 @@ public class RangerAuthorizationCoprocessor extends RangerAuthorizationCoprocess } private GrantRevokeRequest createRevokeData(AccessControlProtos.RevokeRequest request) throws Exception { - org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.UserPermission up = request.getUserPermission(); - org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.Permission perm = up == null ? null : up.getPermission(); + AccessControlProtos.UserPermission up = request.getUserPermission(); + AccessControlProtos.Permission perm = up == null ? null : up.getPermission(); UserPermission userPerm = up == null ? null : ProtobufUtil.toUserPermission(up); String userName = userPerm == null ? null : Bytes.toString(userPerm.getUser()); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1fe2d3ec/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseConnectionMgr.java ---------------------------------------------------------------------- diff --git a/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseConnectionMgr.java b/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseConnectionMgr.java index a69c907..8dd1c17 100644 --- a/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseConnectionMgr.java +++ b/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseConnectionMgr.java @@ -27,7 +27,6 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.TimeUnit; import org.apache.log4j.Logger; -import org.apache.ranger.services.hbase.client.HBaseClient; import org.apache.ranger.plugin.util.TimedEventUtil; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1fe2d3ec/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/agent/HadoopAuthClassTransformer.java ---------------------------------------------------------------------- diff --git a/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/agent/HadoopAuthClassTransformer.java b/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/agent/HadoopAuthClassTransformer.java index ce71607..ace400b 100644 --- a/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/agent/HadoopAuthClassTransformer.java +++ b/hdfs-agent/src/main/java/org/apache/ranger/authorization/hadoop/agent/HadoopAuthClassTransformer.java @@ -209,7 +209,7 @@ public class HadoopAuthClassTransformer implements ClassFileTransformer { ClassPool cp = ClassPool.getDefault(); ret = cp.get(className); - } catch (javassist.NotFoundException nfe) { + } catch (NotFoundException nfe) { System.err.println("Unable to find Class for [" + className + "]" + nfe); ret = null; } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1fe2d3ec/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsConnectionMgr.java ---------------------------------------------------------------------- diff --git a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsConnectionMgr.java b/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsConnectionMgr.java index 400a379..998db9c 100644 --- a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsConnectionMgr.java +++ b/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsConnectionMgr.java @@ -28,7 +28,6 @@ import java.util.concurrent.TimeUnit; import org.apache.log4j.Logger; import org.apache.ranger.plugin.util.TimedEventUtil; -import org.apache.ranger.services.hdfs.client.HdfsClient; public class HdfsConnectionMgr { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1fe2d3ec/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStoreProvider.java ---------------------------------------------------------------------- diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStoreProvider.java b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStoreProvider.java index 23547a7..a9e43fc 100755 --- a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStoreProvider.java +++ b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStoreProvider.java @@ -40,8 +40,6 @@ import javax.crypto.spec.SecretKeySpec; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.crypto.key.KeyProvider; -import org.apache.hadoop.crypto.key.KeyProviderFactory; import org.codehaus.jackson.map.ObjectMapper; import org.apache.hadoop.fs.Path; import org.apache.ranger.credentialapi.CredentialReader; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1fe2d3ec/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxConnectionMgr.java ---------------------------------------------------------------------- diff --git a/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxConnectionMgr.java b/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxConnectionMgr.java index 5c1bcbe..00ac2ef 100644 --- a/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxConnectionMgr.java +++ b/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxConnectionMgr.java @@ -22,7 +22,6 @@ package org.apache.ranger.services.knox.client; import java.util.Map; import org.apache.log4j.Logger; -import org.apache.ranger.services.knox.client.KnoxClient; import org.apache.ranger.plugin.model.RangerService; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1fe2d3ec/plugin-kafka/src/main/java/org/apache/ranger/authorization/kafka/authorizer/RangerKafkaAuthorizer.java ---------------------------------------------------------------------- diff --git a/plugin-kafka/src/main/java/org/apache/ranger/authorization/kafka/authorizer/RangerKafkaAuthorizer.java b/plugin-kafka/src/main/java/org/apache/ranger/authorization/kafka/authorizer/RangerKafkaAuthorizer.java index 0709919..59bac13 100644 --- a/plugin-kafka/src/main/java/org/apache/ranger/authorization/kafka/authorizer/RangerKafkaAuthorizer.java +++ b/plugin-kafka/src/main/java/org/apache/ranger/authorization/kafka/authorizer/RangerKafkaAuthorizer.java @@ -77,7 +77,7 @@ public class RangerKafkaAuthorizer implements Authorizer { public void configure(Map<String, ?> configs) { if (rangerPlugin == null) { try { - LoginManager loginManager = org.apache.kafka.common.security.kerberos.LoginManager.acquireLoginManager(LoginType.SERVER, configs); + LoginManager loginManager = LoginManager.acquireLoginManager(LoginType.SERVER, configs); Subject subject = loginManager.subject(); UserGroupInformation ugi = MiscUtil .createUGIFromSubject(subject); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1fe2d3ec/plugin-solr/src/main/java/org/apache/ranger/authorization/solr/authorizer/RangerSolrAuthorizer.java ---------------------------------------------------------------------- diff --git a/plugin-solr/src/main/java/org/apache/ranger/authorization/solr/authorizer/RangerSolrAuthorizer.java b/plugin-solr/src/main/java/org/apache/ranger/authorization/solr/authorizer/RangerSolrAuthorizer.java index a1b5817..151f23e 100644 --- a/plugin-solr/src/main/java/org/apache/ranger/authorization/solr/authorizer/RangerSolrAuthorizer.java +++ b/plugin-solr/src/main/java/org/apache/ranger/authorization/solr/authorizer/RangerSolrAuthorizer.java @@ -120,8 +120,7 @@ public class RangerSolrAuthorizer implements AuthorizationPlugin { // logger.info("DEFAULT UGI=" + // UserGroupInformation.getLoginUser()); - Configuration config = javax.security.auth.login.Configuration - .getConfiguration(); + Configuration config = Configuration.getConfiguration(); MiscUtil.authWithConfig(solrAppName, config); logger.info("POST AUTH UGI=" + UserGroupInformation.getLoginUser()); } catch (Throwable t) { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1fe2d3ec/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnClient.java ---------------------------------------------------------------------- diff --git a/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnClient.java b/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnClient.java index 0a06190..eb47e0c 100644 --- a/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnClient.java +++ b/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnClient.java @@ -32,7 +32,6 @@ import javax.security.auth.Subject; import org.apache.log4j.Logger; import org.apache.ranger.plugin.client.BaseClient; import org.apache.ranger.plugin.client.HadoopException; -import org.apache.ranger.services.yarn.client.YarnClient; import org.apache.ranger.services.yarn.client.json.model.YarnSchedulerResponse; import com.google.gson.Gson; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1fe2d3ec/ranger-tools/src/main/java/org/apache/ranger/policyengine/CommandLineParser.java ---------------------------------------------------------------------- diff --git a/ranger-tools/src/main/java/org/apache/ranger/policyengine/CommandLineParser.java b/ranger-tools/src/main/java/org/apache/ranger/policyengine/CommandLineParser.java index abc88d7..ab7d532 100644 --- a/ranger-tools/src/main/java/org/apache/ranger/policyengine/CommandLineParser.java +++ b/ranger-tools/src/main/java/org/apache/ranger/policyengine/CommandLineParser.java @@ -19,7 +19,11 @@ package org.apache.ranger.policyengine; -import org.apache.commons.cli.*; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.DefaultParser; +import org.apache.commons.cli.HelpFormatter; +import org.apache.commons.cli.Options; + import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1fe2d3ec/security-admin/src/main/java/org/apache/ranger/biz/AssetMgr.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/biz/AssetMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/AssetMgr.java index acd6336..4bc57fb 100644 --- a/security-admin/src/main/java/org/apache/ranger/biz/AssetMgr.java +++ b/security-admin/src/main/java/org/apache/ranger/biz/AssetMgr.java @@ -250,7 +250,7 @@ public class AssetMgr extends AssetMgrBase { } if (commonName == null) { policyExportAudit - .setHttpRetCode(javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST); + .setHttpRetCode(HttpServletResponse.SC_BAD_REQUEST); createPolicyAudit(policyExportAudit); throw restErrorUtil.createRESTException( @@ -260,7 +260,7 @@ public class AssetMgr extends AssetMgrBase { } } catch (InvalidNameException e) { policyExportAudit - .setHttpRetCode(javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST); + .setHttpRetCode(HttpServletResponse.SC_BAD_REQUEST); createPolicyAudit(policyExportAudit); logger.error("Invalid Common Name.", e); @@ -282,7 +282,7 @@ public class AssetMgr extends AssetMgrBase { if (cnFromConfig == null || !commonName.equalsIgnoreCase(cnFromConfig)) { policyExportAudit - .setHttpRetCode(javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST); + .setHttpRetCode(HttpServletResponse.SC_BAD_REQUEST); createPolicyAudit(policyExportAudit); throw restErrorUtil.createRESTException( @@ -299,7 +299,7 @@ public class AssetMgr extends AssetMgrBase { if (policyCount == resourceListSz) { policyExportAudit - .setHttpRetCode(javax.servlet.http.HttpServletResponse.SC_NOT_MODIFIED); + .setHttpRetCode(HttpServletResponse.SC_NOT_MODIFIED); createPolicyAudit(policyExportAudit); throw restErrorUtil.createRESTException( @@ -449,7 +449,7 @@ public class AssetMgr extends AssetMgrBase { } } else { policyExportAudit - .setHttpRetCode(javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST); + .setHttpRetCode(HttpServletResponse.SC_BAD_REQUEST); createPolicyAudit(policyExportAudit); throw restErrorUtil.createRESTException( "The operation isn't yet supported for the repository", @@ -478,7 +478,7 @@ public class AssetMgr extends AssetMgrBase { // } policyExportAudit - .setHttpRetCode(javax.servlet.http.HttpServletResponse.SC_OK); + .setHttpRetCode(HttpServletResponse.SC_OK); createPolicyAudit(policyExportAudit); return updatedPolicyStr; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1fe2d3ec/security-admin/src/main/java/org/apache/ranger/patch/PatchMigration_J10002.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/patch/PatchMigration_J10002.java b/security-admin/src/main/java/org/apache/ranger/patch/PatchMigration_J10002.java index 621159d..54148f1 100644 --- a/security-admin/src/main/java/org/apache/ranger/patch/PatchMigration_J10002.java +++ b/security-admin/src/main/java/org/apache/ranger/patch/PatchMigration_J10002.java @@ -48,7 +48,6 @@ import org.apache.ranger.entity.XXResource; import org.apache.ranger.entity.XXServiceConfigDef; import org.apache.ranger.entity.XXServiceDef; import org.apache.ranger.entity.XXUser; -import org.apache.ranger.patch.BaseLoader; import org.apache.ranger.plugin.model.RangerPolicy; import org.apache.ranger.plugin.model.RangerService; import org.apache.ranger.plugin.model.RangerPolicy.RangerPolicyItem;
