Repository: sentry Updated Branches: refs/heads/master 1a97f5ab0 -> 92a183f66
SENTRY-1873 - Upgrade PMD plugin and fix related issues Reviewed by Alexander Kolbasov. Project: http://git-wip-us.apache.org/repos/asf/sentry/repo Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/92a183f6 Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/92a183f6 Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/92a183f6 Branch: refs/heads/master Commit: 92a183f663c16fc8daf806dcb4a0b264dc811376 Parents: 1a97f5a Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Wed Aug 9 09:31:00 2017 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Wed Aug 9 09:31:00 2017 +0100 ---------------------------------------------------------------------- build-tools/sentry-pmd-ruleset.xml | 1 + pom.xml | 4 +- .../sentry/binding/hive/conf/HiveAuthzConf.java | 3 +- .../sentry/kafka/binding/KafkaAuthBinding.java | 9 ++- .../apache/sentry/hdfs/PathImageRetriever.java | 4 - .../indexer/IndexerWildcardPrivilege.java | 1 - .../service/persistent/DelegateSentryStore.java | 1 - .../thrift/SentryGenericPolicyProcessor.java | 1 - .../db/service/model/MAuthzPathsMapping.java | 2 - .../db/service/persistent/SentryStore.java | 18 ----- .../db/service/thrift/SentryAdminServlet.java | 1 - .../sentry/service/thrift/ServiceConstants.java | 2 +- .../db/service/model/TestMSentryUtil.java | 1 - .../TestHMSFollowerSentryStoreIntegration.java | 36 --------- .../db/service/persistent/TestSentryStore.java | 5 +- .../sentry/service/thrift/TestCounterWait.java | 8 +- .../sentry/service/thrift/TestHMSFollower.java | 82 ++++++++++---------- .../component/SecureRealTimeGetComponent.java | 18 ++--- .../e2e/dbprovider/TestDatabaseProvider.java | 55 +++++++------ .../sentry/tests/e2e/hdfs/TestDbHdfsBase.java | 33 +++----- .../tests/e2e/hdfs/TestDbHdfsExtMaxGroups.java | 1 - .../tests/e2e/hdfs/TestDbHdfsMaxGroups.java | 1 - .../AbstractTestWithStaticConfiguration.java | 2 +- .../e2e/hive/fs/TestHiveWarehouseOnExtFs.java | 3 - .../TestSentryListenerSentryDeserializer.java | 28 +++---- .../e2e/tools/CreateSentryTestScaleData.java | 18 ++--- 26 files changed, 132 insertions(+), 206 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sentry/blob/92a183f6/build-tools/sentry-pmd-ruleset.xml ---------------------------------------------------------------------- diff --git a/build-tools/sentry-pmd-ruleset.xml b/build-tools/sentry-pmd-ruleset.xml index 8a26446..8efaed5 100644 --- a/build-tools/sentry-pmd-ruleset.xml +++ b/build-tools/sentry-pmd-ruleset.xml @@ -27,6 +27,7 @@ <rule ref="rulesets/java/basic.xml"> <exclude name="CheckResultSet"/> <exclude name="AvoidUsingOctalValues"/> + <exclude name="AvoidUsingHardCodedIP"/> </rule> <rule ref="rulesets/java/unusedcode.xml"/> <rule ref="rulesets/java/imports.xml"/> http://git-wip-us.apache.org/repos/asf/sentry/blob/92a183f6/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 5a06a41..d668877 100644 --- a/pom.xml +++ b/pom.xml @@ -546,7 +546,7 @@ limitations under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> - <version>3.5</version> + <version>3.7</version> <configuration> <rulesets> <ruleset>${buildtools.dir}/sentry-pmd-ruleset.xml</ruleset> @@ -556,7 +556,7 @@ limitations under the License. <linkXRef>false</linkXRef> <includeTests>true</includeTests> <verbose>true</verbose> - <targetJdk>${targetJdk}</targetJdk> + <targetJdk>1.7</targetJdk> <excludeRoots> <excludeRoot>${basedir}/src/main/generated</excludeRoot> </excludeRoots> http://git-wip-us.apache.org/repos/asf/sentry/blob/92a183f6/sentry-binding/sentry-binding-hive-conf/src/main/java/org/apache/sentry/binding/hive/conf/HiveAuthzConf.java ---------------------------------------------------------------------- diff --git a/sentry-binding/sentry-binding-hive-conf/src/main/java/org/apache/sentry/binding/hive/conf/HiveAuthzConf.java b/sentry-binding/sentry-binding-hive-conf/src/main/java/org/apache/sentry/binding/hive/conf/HiveAuthzConf.java index d651691..8d5286c 100644 --- a/sentry-binding/sentry-binding-hive-conf/src/main/java/org/apache/sentry/binding/hive/conf/HiveAuthzConf.java +++ b/sentry-binding/sentry-binding-hive-conf/src/main/java/org/apache/sentry/binding/hive/conf/HiveAuthzConf.java @@ -18,7 +18,6 @@ package org.apache.sentry.binding.hive.conf; import java.net.MalformedURLException; import java.net.URL; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; @@ -92,7 +91,7 @@ public class HiveAuthzConf extends Configuration { /** * Config setting definitions */ - public static enum AuthzConfVars { + public enum AuthzConfVars { AUTHZ_PROVIDER("sentry.hive.provider", "org.apache.sentry.provider.common.HadoopGroupResourceAuthorizationProvider"), AUTHZ_PROVIDER_RESOURCE("sentry.hive.provider.resource", ""), http://git-wip-us.apache.org/repos/asf/sentry/blob/92a183f6/sentry-binding/sentry-binding-kafka/src/main/java/org/apache/sentry/kafka/binding/KafkaAuthBinding.java ---------------------------------------------------------------------- diff --git a/sentry-binding/sentry-binding-kafka/src/main/java/org/apache/sentry/kafka/binding/KafkaAuthBinding.java b/sentry-binding/sentry-binding-kafka/src/main/java/org/apache/sentry/kafka/binding/KafkaAuthBinding.java index f5d4431..d9dcbb7 100644 --- a/sentry-binding/sentry-binding-kafka/src/main/java/org/apache/sentry/kafka/binding/KafkaAuthBinding.java +++ b/sentry-binding/sentry-binding-kafka/src/main/java/org/apache/sentry/kafka/binding/KafkaAuthBinding.java @@ -265,7 +265,7 @@ public class KafkaAuthBinding { }); } - public void addRoleToGroups(final String role, final java.util.Set<String> groups) { + public void addRoleToGroups(final String role, final Set<String> groups) { execute(new Command<Void>() { @Override public Void run(SentryGenericServiceClient client) throws Exception { @@ -335,8 +335,9 @@ public class KafkaAuthBinding { public scala.collection.immutable.Set<Acl> getAcls(final Resource resource) { final Option<scala.collection.immutable.Set<Acl>> acls = getAcls().get(resource); - if (acls.nonEmpty()) + if (acls.nonEmpty()) { return acls.get(); + } return new scala.collection.immutable.HashSet<Acl>(); } @@ -491,7 +492,7 @@ public class KafkaAuthBinding { return rolePrivilegesMap; } - private void addExistingAclsForResource(java.util.Map<Resource, scala.collection.immutable.Set<Acl>> resourceAclsMap, Resource resource, java.util.Set<Acl> newAclsJava) { + private void addExistingAclsForResource(java.util.Map<Resource, scala.collection.immutable.Set<Acl>> resourceAclsMap, Resource resource, Set<Acl> newAclsJava) { final scala.collection.immutable.Set<Acl> existingAcls = resourceAclsMap.get(resource); if (existingAcls != null) { final Iterator<Acl> aclsIter = existingAcls.iterator(); @@ -550,7 +551,7 @@ public class KafkaAuthBinding { } synchronized (KafkaAuthBinding.class) { if (kerberosInit == null) { - kerberosInit = new Boolean(true); + kerberosInit = Boolean.TRUE; // let's avoid modifying the supplied configuration, just to be conservative final Configuration ugiConf = new Configuration(); ugiConf.set(HADOOP_SECURITY_AUTHENTICATION, ServiceConstants.ServerConfig.SECURITY_MODE_KERBEROS); http://git-wip-us.apache.org/repos/asf/sentry/blob/92a183f6/sentry-hdfs/sentry-hdfs-service/src/main/java/org/apache/sentry/hdfs/PathImageRetriever.java ---------------------------------------------------------------------- diff --git a/sentry-hdfs/sentry-hdfs-service/src/main/java/org/apache/sentry/hdfs/PathImageRetriever.java b/sentry-hdfs/sentry-hdfs-service/src/main/java/org/apache/sentry/hdfs/PathImageRetriever.java index 73239ee..f1e67ca 100644 --- a/sentry-hdfs/sentry-hdfs-service/src/main/java/org/apache/sentry/hdfs/PathImageRetriever.java +++ b/sentry-hdfs/sentry-hdfs-service/src/main/java/org/apache/sentry/hdfs/PathImageRetriever.java @@ -29,10 +29,6 @@ import javax.annotation.concurrent.ThreadSafe; import java.util.Map; import java.util.Set; import java.util.concurrent.locks.ReentrantReadWriteLock; -import javax.annotation.concurrent.ThreadSafe; -import org.apache.sentry.hdfs.service.thrift.TPathChanges; -import org.apache.sentry.provider.db.service.persistent.PathsImage; -import org.apache.sentry.provider.db.service.persistent.SentryStore; /** * PathImageRetriever obtains a complete snapshot of Hive Paths from a persistent http://git-wip-us.apache.org/repos/asf/sentry/blob/92a183f6/sentry-policy/sentry-policy-indexer/src/main/java/org/apache/sentry/policy/indexer/IndexerWildcardPrivilege.java ---------------------------------------------------------------------- diff --git a/sentry-policy/sentry-policy-indexer/src/main/java/org/apache/sentry/policy/indexer/IndexerWildcardPrivilege.java b/sentry-policy/sentry-policy-indexer/src/main/java/org/apache/sentry/policy/indexer/IndexerWildcardPrivilege.java index 10e3496..9e9a0d2 100644 --- a/sentry-policy/sentry-policy-indexer/src/main/java/org/apache/sentry/policy/indexer/IndexerWildcardPrivilege.java +++ b/sentry-policy/sentry-policy-indexer/src/main/java/org/apache/sentry/policy/indexer/IndexerWildcardPrivilege.java @@ -21,7 +21,6 @@ package org.apache.sentry.policy.indexer; -import java.util.ArrayList; import java.util.LinkedList; import java.util.List; http://git-wip-us.apache.org/repos/asf/sentry/blob/92a183f6/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/service/persistent/DelegateSentryStore.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/service/persistent/DelegateSentryStore.java b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/service/persistent/DelegateSentryStore.java index c221c34..4cb46ab 100644 --- a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/service/persistent/DelegateSentryStore.java +++ b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/service/persistent/DelegateSentryStore.java @@ -40,7 +40,6 @@ import org.apache.sentry.provider.db.service.persistent.TransactionBlock; import org.apache.sentry.provider.db.service.thrift.SentryPolicyStoreProcessor; import org.apache.sentry.provider.db.service.thrift.TSentryGroup; import org.apache.sentry.provider.db.service.thrift.TSentryRole; -import org.apache.sentry.service.thrift.SentryServiceUtil; import org.apache.sentry.service.thrift.ServiceConstants.ServerConfig; import com.google.common.annotations.VisibleForTesting; http://git-wip-us.apache.org/repos/asf/sentry/blob/92a183f6/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/service/thrift/SentryGenericPolicyProcessor.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/service/thrift/SentryGenericPolicyProcessor.java b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/service/thrift/SentryGenericPolicyProcessor.java index 18be0fa..5a36433 100644 --- a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/service/thrift/SentryGenericPolicyProcessor.java +++ b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/service/thrift/SentryGenericPolicyProcessor.java @@ -40,7 +40,6 @@ import org.apache.sentry.core.common.exception.SentryAlreadyExistsException; import org.apache.sentry.core.common.exception.SentryInvalidInputException; import org.apache.sentry.core.common.exception.SentryNoSuchObjectException; import org.apache.sentry.core.common.exception.SentryThriftAPIMismatchException; -import org.apache.sentry.core.model.search.Collection; import org.apache.sentry.provider.db.generic.service.persistent.DelegateSentryStore; import org.apache.sentry.provider.db.generic.service.persistent.PrivilegeObject; import org.apache.sentry.provider.db.generic.service.persistent.PrivilegeObject.Builder; http://git-wip-us.apache.org/repos/asf/sentry/blob/92a183f6/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/model/MAuthzPathsMapping.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/model/MAuthzPathsMapping.java b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/model/MAuthzPathsMapping.java index a38772b..fee5279 100644 --- a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/model/MAuthzPathsMapping.java +++ b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/model/MAuthzPathsMapping.java @@ -18,8 +18,6 @@ package org.apache.sentry.provider.db.service.model; -import org.apache.sentry.provider.db.service.persistent.SentryStore; - import javax.jdo.annotations.PersistenceCapable; import java.util.Collection; import java.util.HashSet; http://git-wip-us.apache.org/repos/asf/sentry/blob/92a183f6/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/persistent/SentryStore.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/persistent/SentryStore.java b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/persistent/SentryStore.java index d20de26..4305691 100644 --- a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/persistent/SentryStore.java +++ b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/persistent/SentryStore.java @@ -3842,24 +3842,6 @@ public class SentryStore { } /** - * Return exception for nonexistent path - * @param path path name - * @return SentryNoSuchObjectException with appropriate message - */ - private SentryNoSuchObjectException noSuchPath(final String path) { - return new SentryNoSuchObjectException("nonexistent path + " + path); - } - - /** - * Return exception for nonexistent authzObj - * @param authzObj an authzObj - * @return SentryNoSuchObjectException with appropriate message - */ - private SentryNoSuchObjectException noSuchAuthzObj(final String authzObj) { - return new SentryNoSuchObjectException("nonexistent authzObj + " + authzObj); - } - - /** * Fetch all {@link MSentryChange} in the database. * * @param cls the class of the Sentry delta change. http://git-wip-us.apache.org/repos/asf/sentry/blob/92a183f6/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/thrift/SentryAdminServlet.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/thrift/SentryAdminServlet.java b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/thrift/SentryAdminServlet.java index 17dc13f..8a8bbd3 100644 --- a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/thrift/SentryAdminServlet.java +++ b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/thrift/SentryAdminServlet.java @@ -31,7 +31,6 @@ import java.io.Writer; import java.util.HashMap; import java.util.Map; import java.util.Set; -import org.apache.sentry.service.thrift.SentryServiceUtil; /** * Admin Servlet is only used when SENTRY_WEB_ADMIN_SERVLET_ENABLED is true. http://git-wip-us.apache.org/repos/asf/sentry/blob/92a183f6/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/service/thrift/ServiceConstants.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/service/thrift/ServiceConstants.java b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/service/thrift/ServiceConstants.java index 6e22875..5b6ef53 100644 --- a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/service/thrift/ServiceConstants.java +++ b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/service/thrift/ServiceConstants.java @@ -293,7 +293,7 @@ public class ServiceConstants { } /* Privilege operation scope */ - public static enum PrivilegeScope { + public enum PrivilegeScope { SERVER, URI, DATABASE, http://git-wip-us.apache.org/repos/asf/sentry/blob/92a183f6/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/service/model/TestMSentryUtil.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/service/model/TestMSentryUtil.java b/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/service/model/TestMSentryUtil.java index eb39b0d..6ff79f8 100644 --- a/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/service/model/TestMSentryUtil.java +++ b/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/service/model/TestMSentryUtil.java @@ -21,7 +21,6 @@ package org.apache.sentry.provider.db.service.model; import org.apache.sentry.hdfs.PathsUpdate; import org.apache.sentry.hdfs.PermissionsUpdate; -import org.apache.sentry.hdfs.Updateable; import org.junit.Test; import static org.junit.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/sentry/blob/92a183f6/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/service/persistent/TestHMSFollowerSentryStoreIntegration.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/service/persistent/TestHMSFollowerSentryStoreIntegration.java b/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/service/persistent/TestHMSFollowerSentryStoreIntegration.java index 4ee1597..928d0c8 100644 --- a/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/service/persistent/TestHMSFollowerSentryStoreIntegration.java +++ b/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/service/persistent/TestHMSFollowerSentryStoreIntegration.java @@ -32,8 +32,6 @@ import org.apache.hadoop.security.alias.UserProvider; import org.apache.hive.hcatalog.messaging.HCatEventMessage; import org.apache.hive.hcatalog.messaging.HCatEventMessage.EventType; import org.apache.sentry.binding.metastore.messaging.json.SentryJSONMessageFactory; -import org.apache.sentry.core.common.exception.SentryNoSuchObjectException; -import org.apache.sentry.provider.db.service.thrift.TSentryAuthorizable; import org.apache.sentry.provider.db.service.thrift.TSentryPrivilege; import org.apache.sentry.service.thrift.HiveSimpleConnectionFactory; @@ -131,40 +129,6 @@ public class TestHMSFollowerSentryStoreIntegration { } } - /** - * Fail test if role already exists - * @param roleName Role name to checl - * @throws Exception - */ - private void checkRoleDoesNotExist(String roleName) throws Exception { - try { - sentryStore.getMSentryRoleByName(roleName); - Assert.fail("Role " + roleName + "already exists"); - } catch (SentryNoSuchObjectException e) { - // Ok - } - } - - /** - * Fail test if role doesn't exist - * @param roleName Role name to checl - * @throws Exception - */ - private void checkRoleExists(String roleName) throws Exception { - Assert.assertEquals(roleName.toLowerCase(), - sentryStore.getMSentryRoleByName(roleName).getRoleName()); - } - - private TSentryAuthorizable toTSentryAuthorizable( - TSentryPrivilege tSentryPrivilege) { - TSentryAuthorizable tSentryAuthorizable = new TSentryAuthorizable(); - tSentryAuthorizable.setServer(tSentryPrivilege.getServerName()); - tSentryAuthorizable.setDb(tSentryPrivilege.getDbName()); - tSentryAuthorizable.setTable(tSentryPrivilege.getTableName()); - tSentryAuthorizable.setUri(tSentryPrivilege.getURI()); - return tSentryAuthorizable; - } - protected static void addGroupsToUser(String user, String... groupNames) { policyFile.addGroupsToUser(user, groupNames); } http://git-wip-us.apache.org/repos/asf/sentry/blob/92a183f6/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/service/persistent/TestSentryStore.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/service/persistent/TestSentryStore.java b/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/service/persistent/TestSentryStore.java index 859a9fe..ccfb5ab 100644 --- a/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/service/persistent/TestSentryStore.java +++ b/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/service/persistent/TestSentryStore.java @@ -19,17 +19,19 @@ package org.apache.sentry.provider.db.service.persistent; import java.io.File; -import java.util.*; import java.util.concurrent.CyclicBarrier; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; +import java.util.TreeSet; import java.util.List; import com.google.common.collect.Lists; @@ -3230,7 +3232,6 @@ public class TestSentryStore extends org.junit.Assert { @Test public void testIsAuthzPathsMappingEmpty() throws Exception { // Add "db1.table1" authzObj - Long lastNotificationId = sentryStore.getLastProcessedNotificationID(); PathsUpdate addUpdate = new PathsUpdate(1, false); addUpdate.newPathChange("db1.table"). addToAddPaths(Arrays.asList("db1", "tbl1")); http://git-wip-us.apache.org/repos/asf/sentry/blob/92a183f6/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/service/thrift/TestCounterWait.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/service/thrift/TestCounterWait.java b/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/service/thrift/TestCounterWait.java index 1b732da..e4846d9 100644 --- a/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/service/thrift/TestCounterWait.java +++ b/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/service/thrift/TestCounterWait.java @@ -18,20 +18,24 @@ package org.apache.sentry.service.thrift; -import junit.framework.TestCase; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.util.concurrent.BlockingDeque; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.LinkedBlockingDeque; +import org.junit.Test; + /** * Test for CounterWait class */ -public class TestCounterWait extends TestCase { +public class TestCounterWait { // Used to verify that wakeups happen in the right order private final BlockingDeque<Long> outSyncQueue = new LinkedBlockingDeque<>(); + @Test public void testWaitFor() throws Exception { // Create a thread for each waiter int nthreads = 20; http://git-wip-us.apache.org/repos/asf/sentry/blob/92a183f6/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/service/thrift/TestHMSFollower.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/service/thrift/TestHMSFollower.java b/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/service/thrift/TestHMSFollower.java index 6820a9b..d44212f 100644 --- a/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/service/thrift/TestHMSFollower.java +++ b/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/service/thrift/TestHMSFollower.java @@ -19,6 +19,7 @@ package org.apache.sentry.service.thrift; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import com.google.common.collect.Sets; import java.io.IOException; @@ -91,28 +92,28 @@ public class TestHMSFollower { PathsImage fullSnapshot = new PathsImage(snapshotObjects, HMS_PROCESSED_EVENT_ID, 1); SentryHMSClient sentryHmsClient = Mockito.mock(SentryHMSClient.class); - Mockito.when(sentryHmsClient.getFullSnapshot()).thenReturn(fullSnapshot); - Mockito.when(sentryHmsClient.getCurrentNotificationId()).thenReturn(fullSnapshot.getId()); + when(sentryHmsClient.getFullSnapshot()).thenReturn(fullSnapshot); + when(sentryHmsClient.getCurrentNotificationId()).thenReturn(fullSnapshot.getId()); HMSFollower hmsFollower = new HMSFollower(configuration, sentryStore, null, hiveConnectionFactory, hiveInstance); hmsFollower.setSentryHmsClient(sentryHmsClient); // 1st run should get a full snapshot because AuthzPathsMapping is empty - Mockito.when(sentryStore.getLastProcessedNotificationID()).thenReturn(SENTRY_PROCESSED_EVENT_ID); - Mockito.when(sentryStore.isAuthzPathsMappingEmpty()).thenReturn(true); + when(sentryStore.getLastProcessedNotificationID()).thenReturn(SENTRY_PROCESSED_EVENT_ID); + when(sentryStore.isAuthzPathsMappingEmpty()).thenReturn(true); hmsFollower.run(); - Mockito.verify(sentryStore, times(1)).persistFullPathsImage(fullSnapshot.getPathImage()); - Mockito.verify(sentryStore, times(1)).persistLastProcessedNotificationID(fullSnapshot.getId()); + verify(sentryStore, times(1)).persistFullPathsImage(fullSnapshot.getPathImage()); + verify(sentryStore, times(1)).persistLastProcessedNotificationID(fullSnapshot.getId()); - Mockito.reset(sentryStore); + reset(sentryStore); // 2nd run should not get a snapshot because is already processed - Mockito.when(sentryStore.getLastProcessedNotificationID()).thenReturn(fullSnapshot.getId()); - Mockito.when(sentryStore.isAuthzPathsMappingEmpty()).thenReturn(false); + when(sentryStore.getLastProcessedNotificationID()).thenReturn(fullSnapshot.getId()); + when(sentryStore.isAuthzPathsMappingEmpty()).thenReturn(false); hmsFollower.run(); - Mockito.verify(sentryStore, times(0)).persistFullPathsImage(Mockito.anyMap()); - Mockito.verify(sentryStore, times(0)).persistLastProcessedNotificationID(Mockito.anyLong()); + verify(sentryStore, times(0)).persistFullPathsImage(Mockito.anyMap()); + verify(sentryStore, times(0)).persistLastProcessedNotificationID(Mockito.anyLong()); } @Test @@ -137,28 +138,28 @@ public class TestHMSFollower { PathsImage fullSnapshot = new PathsImage(snapshotObjects, HMS_PROCESSED_EVENT_ID, 1); SentryHMSClient sentryHmsClient = Mockito.mock(SentryHMSClient.class); - Mockito.when(sentryHmsClient.getFullSnapshot()).thenReturn(fullSnapshot); - Mockito.when(sentryHmsClient.getCurrentNotificationId()).thenReturn(fullSnapshot.getId()); + when(sentryHmsClient.getFullSnapshot()).thenReturn(fullSnapshot); + when(sentryHmsClient.getCurrentNotificationId()).thenReturn(fullSnapshot.getId()); HMSFollower hmsFollower = new HMSFollower(configuration, sentryStore, null, hiveConnectionFactory, hiveInstance); hmsFollower.setSentryHmsClient(sentryHmsClient); // 1st run should get a full snapshot - Mockito.when(sentryStore.getLastProcessedNotificationID()).thenReturn(SENTRY_PROCESSED_EVENT_ID); - Mockito.when(sentryStore.isAuthzPathsMappingEmpty()).thenReturn(false); + when(sentryStore.getLastProcessedNotificationID()).thenReturn(SENTRY_PROCESSED_EVENT_ID); + when(sentryStore.isAuthzPathsMappingEmpty()).thenReturn(false); hmsFollower.run(); - Mockito.verify(sentryStore, times(1)).persistFullPathsImage(Mockito.anyMap()); - Mockito.verify(sentryStore, times(1)).persistLastProcessedNotificationID(Mockito.anyLong()); + verify(sentryStore, times(1)).persistFullPathsImage(Mockito.anyMap()); + verify(sentryStore, times(1)).persistLastProcessedNotificationID(Mockito.anyLong()); - Mockito.reset(sentryStore); + reset(sentryStore); // 2nd run should not get a snapshot because is already processed - Mockito.when(sentryStore.getLastProcessedNotificationID()).thenReturn(HMS_PROCESSED_EVENT_ID); - Mockito.when(sentryStore.isAuthzPathsMappingEmpty()).thenReturn(false); + when(sentryStore.getLastProcessedNotificationID()).thenReturn(HMS_PROCESSED_EVENT_ID); + when(sentryStore.isAuthzPathsMappingEmpty()).thenReturn(false); hmsFollower.run(); - Mockito.verify(sentryStore, times(0)).persistFullPathsImage(Mockito.anyMap()); - Mockito.verify(sentryStore, times(0)).persistLastProcessedNotificationID(Mockito.anyLong()); + verify(sentryStore, times(0)).persistFullPathsImage(Mockito.anyMap()); + verify(sentryStore, times(0)).persistLastProcessedNotificationID(Mockito.anyLong()); } @Test @@ -186,9 +187,9 @@ public class TestHMSFollower { PathsImage fullSnapshot = new PathsImage(snapshotObjects, HMS_PROCESSED_EVENT_ID, 1); SentryHMSClient sentryHmsClient = Mockito.mock(SentryHMSClient.class); - Mockito.when(sentryHmsClient.getFullSnapshot()).thenReturn(fullSnapshot); - Mockito.when(sentryHmsClient.getCurrentNotificationId()).thenReturn(fullSnapshot.getId()); - Mockito.when(sentryHmsClient.getNotifications(SENTRY_PROCESSED_EVENT_ID)) + when(sentryHmsClient.getFullSnapshot()).thenReturn(fullSnapshot); + when(sentryHmsClient.getCurrentNotificationId()).thenReturn(fullSnapshot.getId()); + when(sentryHmsClient.getNotifications(SENTRY_PROCESSED_EVENT_ID)) .thenReturn(Collections.singletonList( new NotificationEvent(fullSnapshot.getId(), 0, "", ""))); @@ -197,21 +198,21 @@ public class TestHMSFollower { hmsFollower.setSentryHmsClient(sentryHmsClient); // 1st run should get a full snapshot - Mockito.when(sentryStore.getLastProcessedNotificationID()) + when(sentryStore.getLastProcessedNotificationID()) .thenReturn(SENTRY_PROCESSED_EVENT_ID); - Mockito.when(sentryStore.isAuthzPathsMappingEmpty()).thenReturn(false); + when(sentryStore.isAuthzPathsMappingEmpty()).thenReturn(false); hmsFollower.run(); - Mockito.verify(sentryStore, times(1)).persistFullPathsImage(Mockito.anyMap()); - Mockito.verify(sentryStore, times(1)).persistLastProcessedNotificationID(Mockito.anyLong()); + verify(sentryStore, times(1)).persistFullPathsImage(Mockito.anyMap()); + verify(sentryStore, times(1)).persistLastProcessedNotificationID(Mockito.anyLong()); - Mockito.reset(sentryStore); + reset(sentryStore); // 2nd run should not get a snapshot because is already processed - Mockito.when(sentryStore.getLastProcessedNotificationID()).thenReturn(HMS_PROCESSED_EVENT_ID); - Mockito.when(sentryStore.isAuthzPathsMappingEmpty()).thenReturn(false); + when(sentryStore.getLastProcessedNotificationID()).thenReturn(HMS_PROCESSED_EVENT_ID); + when(sentryStore.isAuthzPathsMappingEmpty()).thenReturn(false); hmsFollower.run(); - Mockito.verify(sentryStore, times(0)).persistFullPathsImage(Mockito.anyMap()); - Mockito.verify(sentryStore, times(0)).persistLastProcessedNotificationID(Mockito.anyLong()); + verify(sentryStore, times(0)).persistFullPathsImage(Mockito.anyMap()); + verify(sentryStore, times(0)).persistLastProcessedNotificationID(Mockito.anyLong()); } /** @@ -701,6 +702,7 @@ public class TestHMSFollower { * * @throws Exception */ + @Test public void testCreateTableAfterInvalidEvent() throws Exception { String dbName = "db1"; String tableName = "table1"; @@ -767,8 +769,8 @@ public class TestHMSFollower { PathsImage fullSnapshot = new PathsImage(snapshotObjects, HMS_PROCESSED_EVENT_ID, 1); SentryHMSClient sentryHmsClient = Mockito.mock(SentryHMSClient.class); - Mockito.when(sentryHmsClient.getFullSnapshot()).thenReturn(fullSnapshot); - Mockito.when(sentryHmsClient.getCurrentNotificationId()).thenReturn(fullSnapshot.getId()); + when(sentryHmsClient.getFullSnapshot()).thenReturn(fullSnapshot); + when(sentryHmsClient.getCurrentNotificationId()).thenReturn(fullSnapshot.getId()); Configuration configuration = new Configuration(); HMSFollower hmsFollower = new HMSFollower(configuration, sentryStore, null, @@ -776,11 +778,11 @@ public class TestHMSFollower { hmsFollower.setSentryHmsClient(sentryHmsClient); // 1st run should get a full snapshot because AuthzPathsMapping is empty - Mockito.when(sentryStore.getLastProcessedNotificationID()).thenReturn(SENTRY_PROCESSED_EVENT_ID); - Mockito.when(sentryStore.isAuthzPathsMappingEmpty()).thenReturn(true); + when(sentryStore.getLastProcessedNotificationID()).thenReturn(SENTRY_PROCESSED_EVENT_ID); + when(sentryStore.isAuthzPathsMappingEmpty()).thenReturn(true); hmsFollower.run(); - Mockito.verify(sentryStore, times(0)).persistFullPathsImage(fullSnapshot.getPathImage()); - Mockito.verify(sentryStore, times(1)).persistLastProcessedNotificationID(fullSnapshot.getId()); + verify(sentryStore, times(0)).persistFullPathsImage(fullSnapshot.getPathImage()); + verify(sentryStore, times(1)).persistLastProcessedNotificationID(fullSnapshot.getId()); } @Test http://git-wip-us.apache.org/repos/asf/sentry/blob/92a183f6/sentry-solr/solr-sentry-handlers/src/main/java/org/apache/solr/handler/component/SecureRealTimeGetComponent.java ---------------------------------------------------------------------- diff --git a/sentry-solr/solr-sentry-handlers/src/main/java/org/apache/solr/handler/component/SecureRealTimeGetComponent.java b/sentry-solr/solr-sentry-handlers/src/main/java/org/apache/solr/handler/component/SecureRealTimeGetComponent.java index 1ac9ccc..7d55a7f 100644 --- a/sentry-solr/solr-sentry-handlers/src/main/java/org/apache/solr/handler/component/SecureRealTimeGetComponent.java +++ b/sentry-solr/solr-sentry-handlers/src/main/java/org/apache/solr/handler/component/SecureRealTimeGetComponent.java @@ -26,13 +26,9 @@ import org.apache.lucene.search.Scorer; import org.apache.lucene.search.Weight; import org.apache.lucene.util.BytesRef; -import org.apache.solr.client.solrj.SolrQuery; import org.apache.solr.common.SolrDocument; import org.apache.solr.common.SolrDocumentList; import org.apache.solr.common.SolrException; -import org.apache.solr.common.params.CommonParams; -import org.apache.solr.common.params.ModifiableSolrParams; -import org.apache.solr.common.util.NamedList; import org.apache.solr.core.SolrCore; import org.apache.solr.schema.FieldType; import org.apache.solr.schema.SchemaField; @@ -44,7 +40,6 @@ import org.apache.solr.response.transform.TransformContext; import org.apache.solr.schema.IndexSchema; import org.apache.solr.search.SolrIndexSearcher; import org.apache.solr.search.SolrReturnFields; -import org.apache.solr.search.ReturnFields; import org.apache.solr.sentry.SentryIndexAuthorizationSingleton; import org.apache.solr.update.AddUpdateCommand; import org.apache.solr.update.UpdateCommand; @@ -58,7 +53,6 @@ import com.google.common.annotations.VisibleForTesting; import java.io.IOException; import java.util.ArrayList; -import java.util.Collection; import java.util.List; import java.util.Set; @@ -174,7 +168,9 @@ public class SecureRealTimeGetComponent extends SearchComponent } int docid = getFilteredInternalDocId(doc, idField, fieldType, filterQuery, searcher); - if (docid < 0) continue; + if (docid < 0) { + continue; + } Document luceneDocument = searcher.doc(docid); SolrDocument newDoc = toSolrDoc(luceneDocument, core.getLatestSchema()); if( transformer != null ) { @@ -205,7 +201,9 @@ public class SecureRealTimeGetComponent extends SearchComponent SchemaField sf = schema.getFieldOrNull(f.name()); // don't return copyField targets - if (sf != null && schema.isCopyFieldTarget(sf)) continue; + if (sf != null && schema.isCopyFieldTarget(sf)) { + continue; + } if (sf != null && sf.multiValued()) { List<Object> vals = new ArrayList<>(); @@ -311,7 +309,9 @@ public class SecureRealTimeGetComponent extends SearchComponent this.originalTransformer = docTransformer; this.filterQuery = filterQuery; final DocTransformers docTransformers = new DocTransformers(); - if (originalTransformer != null) docTransformers.addTransformer(originalTransformer); + if (originalTransformer != null) { + docTransformers.addTransformer(originalTransformer); + } docTransformers.addTransformer(new DocIdAugmenter(ID_FIELD_NAME)); this.transformer = docTransformers; } http://git-wip-us.apache.org/repos/asf/sentry/blob/92a183f6/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/dbprovider/TestDatabaseProvider.java ---------------------------------------------------------------------- diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/dbprovider/TestDatabaseProvider.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/dbprovider/TestDatabaseProvider.java index 63b00e2..a62a0a6 100644 --- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/dbprovider/TestDatabaseProvider.java +++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/dbprovider/TestDatabaseProvider.java @@ -19,10 +19,7 @@ package org.apache.sentry.tests.e2e.dbprovider; import static org.hamcrest.Matchers.equalToIgnoringCase; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.Assert.*; import java.io.File; import java.io.FileOutputStream; @@ -986,7 +983,7 @@ public class TestDatabaseProvider extends AbstractTestWithStaticConfiguration { assertThat(resultSet.getString(5), equalToIgnoringCase("role1"));//principalName assertThat(resultSet.getString(6), equalToIgnoringCase("role"));//principalType assertThat(resultSet.getString(7), equalToIgnoringCase("*")); - assertThat(resultSet.getBoolean(8), is(new Boolean("False")));//grantOption + assertThat(resultSet.getBoolean(8), is(Boolean.FALSE));//grantOption //Create time is not tested //assertThat(resultSet.getLong(9), is(new Long(0))); assertThat(resultSet.getString(10), equalToIgnoringCase("--"));//grantor @@ -1008,7 +1005,7 @@ public class TestDatabaseProvider extends AbstractTestWithStaticConfiguration { assertThat(resultSet.getString(5), equalToIgnoringCase("role1"));//principalName assertThat(resultSet.getString(6), equalToIgnoringCase("role"));//principalType assertThat(resultSet.getString(7), equalToIgnoringCase("*")); - assertThat(resultSet.getBoolean(8), is(new Boolean("False")));//grantOption + assertThat(resultSet.getBoolean(8), is(Boolean.FALSE));//grantOption //Create time is not tested //assertThat(resultSet.getLong(9), is(new Long(0))); assertThat(resultSet.getString(10), equalToIgnoringCase("--"));//grantor @@ -1030,7 +1027,7 @@ public class TestDatabaseProvider extends AbstractTestWithStaticConfiguration { assertThat(resultSet.getString(5), equalToIgnoringCase("role1"));//principalName assertThat(resultSet.getString(6), equalToIgnoringCase("role"));//principalType assertThat(resultSet.getString(7), equalToIgnoringCase("*")); - assertThat(resultSet.getBoolean(8), is(new Boolean("False")));//grantOption + assertThat(resultSet.getBoolean(8), is(Boolean.FALSE));//grantOption //Create time is not tested //assertThat(resultSet.getLong(9), is(new Long(0))); assertThat(resultSet.getString(10), equalToIgnoringCase("--"));//grantor @@ -1051,7 +1048,7 @@ public class TestDatabaseProvider extends AbstractTestWithStaticConfiguration { assertThat(resultSet.getString(5), equalToIgnoringCase("role1"));//principalName assertThat(resultSet.getString(6), equalToIgnoringCase("role"));//principalType assertThat(resultSet.getString(7), equalToIgnoringCase("*")); - assertThat(resultSet.getBoolean(8), is(new Boolean("False")));//grantOption + assertThat(resultSet.getBoolean(8), is(Boolean.FALSE));//grantOption //Create time is not tested //assertThat(resultSet.getLong(9), is(new Long(0))); assertThat(resultSet.getString(10), equalToIgnoringCase("--"));//grantor @@ -1073,7 +1070,7 @@ public class TestDatabaseProvider extends AbstractTestWithStaticConfiguration { assertThat(resultSet.getString(5), equalToIgnoringCase("role1"));//principalName assertThat(resultSet.getString(6), equalToIgnoringCase("role"));//principalType assertThat(resultSet.getString(7), equalToIgnoringCase("insert")); - assertThat(resultSet.getBoolean(8), is(new Boolean("False")));//grantOption + assertThat(resultSet.getBoolean(8), is(Boolean.FALSE));//grantOption //Create time is not tested //assertThat(resultSet.getLong(9), is(new Long(0))); assertThat(resultSet.getString(10), equalToIgnoringCase("--"));//grantor @@ -1095,7 +1092,7 @@ public class TestDatabaseProvider extends AbstractTestWithStaticConfiguration { assertThat(resultSet.getString(5), equalToIgnoringCase("role1"));//principalName assertThat(resultSet.getString(6), equalToIgnoringCase("role"));//principalType assertThat(resultSet.getString(7), equalToIgnoringCase("select")); - assertThat(resultSet.getBoolean(8), is(new Boolean("False")));//grantOption + assertThat(resultSet.getBoolean(8), is(Boolean.FALSE));//grantOption //Create time is not tested //assertThat(resultSet.getLong(9), is(new Long(0))); assertThat(resultSet.getString(10), equalToIgnoringCase("--"));//grantor @@ -1118,7 +1115,7 @@ public class TestDatabaseProvider extends AbstractTestWithStaticConfiguration { assertThat(resultSet.getString(5), equalToIgnoringCase("role1"));//principalName assertThat(resultSet.getString(6), equalToIgnoringCase("role"));//principalType assertThat(resultSet.getString(7), equalToIgnoringCase("select")); - assertThat(resultSet.getBoolean(8), is(new Boolean("False")));//grantOption + assertThat(resultSet.getBoolean(8), is(Boolean.FALSE));//grantOption //Create time is not tested //assertThat(resultSet.getLong(9), is(new Long(0))); assertThat(resultSet.getString(10), equalToIgnoringCase("--"));//grantor @@ -1143,7 +1140,7 @@ public class TestDatabaseProvider extends AbstractTestWithStaticConfiguration { assertThat(resultSet.getString(5), equalToIgnoringCase("role1"));//principalName assertThat(resultSet.getString(6), equalToIgnoringCase("role"));//principalType assertThat(resultSet.getString(7), equalToIgnoringCase("select")); - assertThat(resultSet.getBoolean(8), is(new Boolean("False")));//grantOption + assertThat(resultSet.getBoolean(8), is(Boolean.FALSE));//grantOption //Create time is not tested //assertThat(resultSet.getLong(9), is(new Long(0))); assertThat(resultSet.getString(10), equalToIgnoringCase("--"));//grantor @@ -1164,7 +1161,7 @@ public class TestDatabaseProvider extends AbstractTestWithStaticConfiguration { assertThat(resultSet.getString(5), equalToIgnoringCase("role1"));//principalName assertThat(resultSet.getString(6), equalToIgnoringCase("role"));//principalType assertThat(resultSet.getString(7), equalToIgnoringCase("insert")); - assertThat(resultSet.getBoolean(8), is(new Boolean("False")));//grantOption + assertThat(resultSet.getBoolean(8), is(Boolean.FALSE));//grantOption //Create time is not tested //assertThat(resultSet.getLong(9), is(new Long(0))); assertThat(resultSet.getString(10), equalToIgnoringCase("--"));//grantor @@ -1408,7 +1405,7 @@ public class TestDatabaseProvider extends AbstractTestWithStaticConfiguration { assertThat(resultSetMetaData.getColumnName(4), equalToIgnoringCase("grantor")); while ( resultSet.next()) { assertThat(resultSet.getString(1), equalToIgnoringCase("role1")); - assertThat(resultSet.getBoolean(2), is(new Boolean("False"))); + assertThat(resultSet.getBoolean(2), is(Boolean.FALSE)); //Create time is not tested //assertThat(resultSet.getLong(3), is(new Long(0))); assertThat(resultSet.getString(4), equalToIgnoringCase("--")); @@ -1525,7 +1522,7 @@ public class TestDatabaseProvider extends AbstractTestWithStaticConfiguration { assertThat(resultSet.getString(5), equalToIgnoringCase("role1"));//principalName assertThat(resultSet.getString(6), equalToIgnoringCase("role"));//principalType assertThat(resultSet.getString(7), equalToIgnoringCase("select")); - assertThat(resultSet.getBoolean(8), is(new Boolean("False")));//grantOption + assertThat(resultSet.getBoolean(8), is(Boolean.FALSE));//grantOption //Create time is not tested //assertThat(resultSet.getLong(9), is(new Long(0))); assertThat(resultSet.getString(10), equalToIgnoringCase("--"));//grantor @@ -1573,7 +1570,7 @@ public class TestDatabaseProvider extends AbstractTestWithStaticConfiguration { assertThat(resultSet.getString(5), equalToIgnoringCase("role1"));//principalName assertThat(resultSet.getString(6), equalToIgnoringCase("role"));//principalType assertThat(resultSet.getString(7), equalToIgnoringCase("select")); - assertThat(resultSet.getBoolean(8), is(new Boolean("False")));//grantOption + assertThat(resultSet.getBoolean(8), is(Boolean.FALSE));//grantOption //Create time is not tested //assertThat(resultSet.getLong(9), is(new Long(0))); assertThat(resultSet.getString(10), equalToIgnoringCase("--"));//grantor @@ -1590,7 +1587,7 @@ public class TestDatabaseProvider extends AbstractTestWithStaticConfiguration { assertThat(resultSet.getString(5), equalToIgnoringCase("role1"));//principalName assertThat(resultSet.getString(6), equalToIgnoringCase("role"));//principalType assertThat(resultSet.getString(7), equalToIgnoringCase("select")); - assertThat(resultSet.getBoolean(8), is(new Boolean("False")));//grantOption + assertThat(resultSet.getBoolean(8), is(Boolean.FALSE));//grantOption //Create time is not tested //assertThat(resultSet.getLong(9), is(new Long(0))); assertThat(resultSet.getString(10), equalToIgnoringCase("--"));//grantor @@ -1607,7 +1604,7 @@ public class TestDatabaseProvider extends AbstractTestWithStaticConfiguration { assertThat(resultSet.getString(5), equalToIgnoringCase("role1"));//principalName assertThat(resultSet.getString(6), equalToIgnoringCase("role"));//principalType assertThat(resultSet.getString(7), equalToIgnoringCase("select")); - assertThat(resultSet.getBoolean(8), is(new Boolean("False")));//grantOption + assertThat(resultSet.getBoolean(8), is(Boolean.FALSE));//grantOption //Create time is not tested //assertThat(resultSet.getLong(9), is(new Long(0))); assertThat(resultSet.getString(10), equalToIgnoringCase("--"));//grantor @@ -1624,7 +1621,7 @@ public class TestDatabaseProvider extends AbstractTestWithStaticConfiguration { assertThat(resultSet.getString(5), equalToIgnoringCase("role1"));//principalName assertThat(resultSet.getString(6), equalToIgnoringCase("role"));//principalType assertThat(resultSet.getString(7), equalToIgnoringCase("select")); - assertThat(resultSet.getBoolean(8), is(new Boolean("False")));//grantOption + assertThat(resultSet.getBoolean(8), is(Boolean.FALSE));//grantOption //Create time is not tested //assertThat(resultSet.getLong(9), is(new Long(0))); assertThat(resultSet.getString(10), equalToIgnoringCase("--"));//grantor @@ -1641,7 +1638,7 @@ public class TestDatabaseProvider extends AbstractTestWithStaticConfiguration { assertThat(resultSet.getString(5), equalToIgnoringCase("role1"));//principalName assertThat(resultSet.getString(6), equalToIgnoringCase("role"));//principalType assertThat(resultSet.getString(7), equalToIgnoringCase("select")); - assertThat(resultSet.getBoolean(8), is(new Boolean("True")));//grantOption + assertThat(resultSet.getBoolean(8), is(Boolean.TRUE));//grantOption //Create time is not tested //assertThat(resultSet.getLong(9), is(new Long(0))); assertThat(resultSet.getString(10), equalToIgnoringCase("--"));//grantor @@ -1658,7 +1655,7 @@ public class TestDatabaseProvider extends AbstractTestWithStaticConfiguration { assertThat(resultSet.getString(5), equalToIgnoringCase("role1"));//principalName assertThat(resultSet.getString(6), equalToIgnoringCase("role"));//principalType assertThat(resultSet.getString(7), equalToIgnoringCase("select")); - assertThat(resultSet.getBoolean(8), is(new Boolean("True")));//grantOption + assertThat(resultSet.getBoolean(8), is(Boolean.TRUE));//grantOption //Create time is not tested //assertThat(resultSet.getLong(9), is(new Long(0))); assertThat(resultSet.getString(10), equalToIgnoringCase("--"));//grantor @@ -1706,7 +1703,7 @@ public class TestDatabaseProvider extends AbstractTestWithStaticConfiguration { assertThat(resultSet.getString(5), equalToIgnoringCase("role1"));//principalName assertThat(resultSet.getString(6), equalToIgnoringCase("role"));//principalType assertThat(resultSet.getString(7), equalToIgnoringCase("select")); - assertThat(resultSet.getBoolean(8), is(new Boolean("False")));//grantOption + assertThat(resultSet.getBoolean(8), is(Boolean.FALSE));//grantOption //Create time is not tested //assertThat(resultSet.getLong(9), is(new Long(0))); assertThat(resultSet.getString(10), equalToIgnoringCase("--"));//grantor @@ -1746,7 +1743,7 @@ public class TestDatabaseProvider extends AbstractTestWithStaticConfiguration { assertThat(resultSet.getString(5), equalToIgnoringCase("role1"));//principalName assertThat(resultSet.getString(6), equalToIgnoringCase("role"));//principalType assertThat(resultSet.getString(7), equalToIgnoringCase("*")); - assertThat(resultSet.getBoolean(8), is(new Boolean("False")));//grantOption + assertThat(resultSet.getBoolean(8), is(Boolean.FALSE));//grantOption //Create time is not tested //assertThat(resultSet.getLong(9), is(new Long(0))); assertThat(resultSet.getString(10), equalToIgnoringCase("--"));//grantor @@ -1762,7 +1759,7 @@ public class TestDatabaseProvider extends AbstractTestWithStaticConfiguration { assertThat(resultSet.getString(5), equalToIgnoringCase("role1"));//principalName assertThat(resultSet.getString(6), equalToIgnoringCase("role"));//principalType assertThat(resultSet.getString(7), equalToIgnoringCase("*")); - assertThat(resultSet.getBoolean(8), is(new Boolean("False")));//grantOption + assertThat(resultSet.getBoolean(8), is(Boolean.FALSE));//grantOption //Create time is not tested //assertThat(resultSet.getLong(9), is(new Long(0))); assertThat(resultSet.getString(10), equalToIgnoringCase("--"));//grantor @@ -1800,7 +1797,7 @@ public class TestDatabaseProvider extends AbstractTestWithStaticConfiguration { assertThat(resultSet.getString(5), equalToIgnoringCase("role1"));//principalName assertThat(resultSet.getString(6), equalToIgnoringCase("role"));//principalType assertThat(resultSet.getString(7), equalToIgnoringCase("*")); - assertThat(resultSet.getBoolean(8), is(new Boolean("False")));//grantOption + assertThat(resultSet.getBoolean(8), is(Boolean.FALSE));//grantOption //Create time is not tested //assertThat(resultSet.getLong(9), is(new Long(0))); assertThat(resultSet.getString(10), equalToIgnoringCase("--"));//grantor @@ -1816,7 +1813,7 @@ public class TestDatabaseProvider extends AbstractTestWithStaticConfiguration { assertThat(resultSet.getString(5), equalToIgnoringCase("role1"));//principalName assertThat(resultSet.getString(6), equalToIgnoringCase("role"));//principalType assertThat(resultSet.getString(7), equalToIgnoringCase("*")); - assertThat(resultSet.getBoolean(8), is(new Boolean("False")));//grantOption + assertThat(resultSet.getBoolean(8), is(Boolean.FALSE));//grantOption //Create time is not tested //assertThat(resultSet.getLong(9), is(new Long(0))); assertThat(resultSet.getString(10), equalToIgnoringCase("--"));//grantor @@ -1848,7 +1845,7 @@ public class TestDatabaseProvider extends AbstractTestWithStaticConfiguration { assertThat(resultSet.getString(5), equalToIgnoringCase("role1"));//principalName assertThat(resultSet.getString(6), equalToIgnoringCase("role"));//principalType assertThat(resultSet.getString(7), equalToIgnoringCase("*")); - assertThat(resultSet.getBoolean(8), is(new Boolean("False")));//grantOption + assertThat(resultSet.getBoolean(8), is(Boolean.FALSE));//grantOption //Create time is not tested //assertThat(resultSet.getLong(9), is(new Long(0))); assertThat(resultSet.getString(10), equalToIgnoringCase("--"));//grantor @@ -1993,7 +1990,7 @@ public class TestDatabaseProvider extends AbstractTestWithStaticConfiguration { assertThat(resultSet.getString(5), equalToIgnoringCase("role1"));//principalName assertThat(resultSet.getString(6), equalToIgnoringCase("role"));//principalType assertThat(resultSet.getString(7), equalToIgnoringCase("*")); - assertThat(resultSet.getBoolean(8), is(new Boolean("False")));//grantOption + assertThat(resultSet.getBoolean(8), is(Boolean.FALSE));//grantOption //Create time is not tested //assertThat(resultSet.getLong(9), is(new Long(0))); assertThat(resultSet.getString(10), equalToIgnoringCase("--"));//grantor @@ -2216,7 +2213,7 @@ public class TestDatabaseProvider extends AbstractTestWithStaticConfiguration { assertThat(resultSet.getString(5), equalToIgnoringCase("role1"));//principalName assertThat(resultSet.getString(6), equalToIgnoringCase("role"));//principalType assertThat(resultSet.getString(7), equalToIgnoringCase("select")); - assertThat(resultSet.getBoolean(8), is(new Boolean("False")));//grantOption + assertThat(resultSet.getBoolean(8), is(Boolean.FALSE));//grantOption assertThat(resultSet.getString(10), equalToIgnoringCase("--"));//grantor } statement.close(); http://git-wip-us.apache.org/repos/asf/sentry/blob/92a183f6/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestDbHdfsBase.java ---------------------------------------------------------------------- diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestDbHdfsBase.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestDbHdfsBase.java index 17bc612..a75a765 100644 --- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestDbHdfsBase.java +++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestDbHdfsBase.java @@ -34,24 +34,15 @@ import org.apache.hadoop.fs.permission.AclEntry; import org.apache.hadoop.fs.permission.AclStatus; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.security.UserGroupInformation; - -import static org.apache.sentry.tests.e2e.hive.fs.DFSFactory.DFSType; -import static org.apache.sentry.tests.e2e.hive.hiveserver.HiveServerFactory.HiveServer2Type; - +import org.apache.sentry.tests.e2e.hive.fs.DFSFactory.DFSType; import org.apache.sentry.tests.e2e.hive.fs.TestFSContants; +import org.apache.sentry.tests.e2e.hive.hiveserver.HiveServerFactory.HiveServer2Type; import org.junit.After; -import org.junit.Assume; import org.junit.BeforeClass; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.equalToIgnoringCase; -import static org.hamcrest.Matchers.lessThan; - -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assume.assumeThat; -import static org.junit.Assume.assumeNotNull; -import static org.junit.Assert.fail; +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; +import static org.junit.Assume.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -103,7 +94,7 @@ public abstract class TestDbHdfsBase extends AbstractTestWithStaticConfiguration public static void setupTestStaticConfiguration() throws Exception { if (!Strings.isNullOrEmpty(storageUriStr)) { LOGGER.warn("Skip HDFS tests if HDFS fileSystem is not configured on hdfs"); - Assume.assumeTrue(storageUriStr.toLowerCase().startsWith("hdfs")); + assumeTrue(storageUriStr.toLowerCase().startsWith("hdfs")); } useSentryService = true; enableHDFSAcls = true; @@ -229,13 +220,13 @@ public abstract class TestDbHdfsBase extends AbstractTestWithStaticConfiguration retry += 1; if (!actualAcls.isEmpty() && !actualAcls.contains(expectedAcls.get(expectedAcls.size()-1))) { Thread.sleep(WAIT_SECS_FOR_ACLS); - continue; - } - for (AclEntry expected : expectedAcls) { - assertTrue("Fail to find aclEntry: " + expected.toString(), - actualAcls.contains(expected)); + } else { + for (AclEntry expected : expectedAcls) { + assertTrue("Fail to find aclEntry: " + expected.toString(), + actualAcls.contains(expected)); + } + break; } - break; } assertThat(retry, lessThan(NUM_RETRIES_FOR_ACLS)); if (recursive && fileSystem.getFileStatus(path).isDirectory()) { http://git-wip-us.apache.org/repos/asf/sentry/blob/92a183f6/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestDbHdfsExtMaxGroups.java ---------------------------------------------------------------------- diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestDbHdfsExtMaxGroups.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestDbHdfsExtMaxGroups.java index 5784d85..e00f664 100644 --- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestDbHdfsExtMaxGroups.java +++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestDbHdfsExtMaxGroups.java @@ -30,7 +30,6 @@ import org.apache.hadoop.fs.permission.AclEntry; import static org.junit.Assume.assumeThat; import static org.hamcrest.Matchers.not; -import org.apache.sentry.tests.e2e.hive.PrivilegeResultSet; import org.junit.Test; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/sentry/blob/92a183f6/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestDbHdfsMaxGroups.java ---------------------------------------------------------------------- diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestDbHdfsMaxGroups.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestDbHdfsMaxGroups.java index 6dd03d5..e05757c 100644 --- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestDbHdfsMaxGroups.java +++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestDbHdfsMaxGroups.java @@ -215,7 +215,6 @@ public class TestDbHdfsMaxGroups extends TestDbHdfsBase { dropRecreateRole(statement, TEST_ROLE1); exec(statement, "GRANT SELECT ON TABLE " + TEST_TBL + " TO ROLE " + TEST_ROLE1); - List<AclEntry> dbacls = new ArrayList<>(); List<AclEntry> tblacls = new ArrayList<>(); for (int i = 0; i < MAX_NUM_OF_GROUPS; i ++) { String tblgrp = "tblgrp" + String.valueOf(i); http://git-wip-us.apache.org/repos/asf/sentry/blob/92a183f6/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/AbstractTestWithStaticConfiguration.java ---------------------------------------------------------------------- diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/AbstractTestWithStaticConfiguration.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/AbstractTestWithStaticConfiguration.java index 6ea6763..0a39f59 100644 --- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/AbstractTestWithStaticConfiguration.java +++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/AbstractTestWithStaticConfiguration.java @@ -163,7 +163,7 @@ public abstract class AbstractTestWithStaticConfiguration extends RulesForE2ETes private static LoginContext clientLoginContext; protected static SentryPolicyServiceClient client; - private static boolean startSentry = new Boolean(System.getProperty(EXTERNAL_SENTRY_SERVICE, "false")); + private static boolean startSentry = Boolean.getBoolean(EXTERNAL_SENTRY_SERVICE); protected static boolean enableHDFSAcls = false; protected static String dfsType; http://git-wip-us.apache.org/repos/asf/sentry/blob/92a183f6/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/fs/TestHiveWarehouseOnExtFs.java ---------------------------------------------------------------------- diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/fs/TestHiveWarehouseOnExtFs.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/fs/TestHiveWarehouseOnExtFs.java index 31000d4..0a56453 100644 --- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/fs/TestHiveWarehouseOnExtFs.java +++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/fs/TestHiveWarehouseOnExtFs.java @@ -16,8 +16,6 @@ */ package org.apache.sentry.tests.e2e.hive.fs; -import com.google.common.base.Strings; -import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.fs.Path; import org.junit.Before; import org.junit.Test; @@ -30,7 +28,6 @@ import java.sql.Statement; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.junit.Assume.assumeTrue; /** * Configure Hive warehouse dir to an external storage FS system: http://git-wip-us.apache.org/repos/asf/sentry/blob/92a183f6/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/metastore/TestSentryListenerSentryDeserializer.java ---------------------------------------------------------------------- diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/metastore/TestSentryListenerSentryDeserializer.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/metastore/TestSentryListenerSentryDeserializer.java index fe72b91..f43b316 100644 --- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/metastore/TestSentryListenerSentryDeserializer.java +++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/metastore/TestSentryListenerSentryDeserializer.java @@ -100,7 +100,7 @@ public class TestSentryListenerSentryDeserializer extends AbstractMetastoreTestW assertEquals(testDB, createDatabaseMessage.getDB()); //dbName String expectedLocation = warehouseDir + "/" + testDB + ".db"; if(!useDbNotificationListener) { - Assert.assertEquals(expectedLocation.toLowerCase(), createDatabaseMessage.getLocation()); + assertEquals(expectedLocation.toLowerCase(), createDatabaseMessage.getLocation()); } //Alter database location and rename are not supported. See HIVE-4847 @@ -118,7 +118,7 @@ public class TestSentryListenerSentryDeserializer extends AbstractMetastoreTestW assertEquals(HCatEventMessage.EventType.DROP_DATABASE, dropDatabaseMessage.getEventType()); //Event type assertThat(dropDatabaseMessage.getDB(), IsEqualIgnoringCase.equalToIgnoringCase(testDB)); // dbName if(!useDbNotificationListener) { - Assert.assertEquals(expectedLocation.toLowerCase(), dropDatabaseMessage.getLocation()); //location + assertEquals(expectedLocation.toLowerCase(), dropDatabaseMessage.getLocation()); //location } } @@ -148,7 +148,7 @@ public class TestSentryListenerSentryDeserializer extends AbstractMetastoreTestW assertEquals(testTable, createTableMessage.getTable()); //tableName String expectedLocation = warehouseDir + "/" + testDB + ".db/" + testTable; if(!useDbNotificationListener) { - Assert.assertEquals(expectedLocation.toLowerCase(), createTableMessage.getLocation()); + assertEquals(expectedLocation.toLowerCase(), createTableMessage.getLocation()); } @@ -167,7 +167,7 @@ public class TestSentryListenerSentryDeserializer extends AbstractMetastoreTestW assertThat(dropTableMessage.getDB(), IsEqualIgnoringCase.equalToIgnoringCase(testDB));//dbName assertThat(dropTableMessage.getTable(), IsEqualIgnoringCase.equalToIgnoringCase(testTable));//tableName if(!useDbNotificationListener) { - Assert.assertEquals(expectedLocation.toLowerCase(), dropTableMessage.getLocation()); //location + assertEquals(expectedLocation.toLowerCase(), dropTableMessage.getLocation()); //location } } @@ -195,7 +195,7 @@ public class TestSentryListenerSentryDeserializer extends AbstractMetastoreTestW assertEquals(testTable, createTableMessage.getTable()); //tableName String expectedLocation = warehouseDir + "/" + testDB + ".db/" + testTable; if(!useDbNotificationListener) { - Assert.assertEquals(expectedLocation.toLowerCase(), createTableMessage.getLocation()); + assertEquals(expectedLocation.toLowerCase(), createTableMessage.getLocation()); } //Drop table @@ -213,7 +213,7 @@ public class TestSentryListenerSentryDeserializer extends AbstractMetastoreTestW assertThat(dropTableMessage.getDB(), IsEqualIgnoringCase.equalToIgnoringCase(testDB));//dbName assertThat(dropTableMessage.getTable(), IsEqualIgnoringCase.equalToIgnoringCase(testTable));//tableName if(!useDbNotificationListener) { - Assert.assertEquals(expectedLocation.toLowerCase(), dropTableMessage.getLocation()); //location + assertEquals(expectedLocation.toLowerCase(), dropTableMessage.getLocation()); //location } } @@ -247,7 +247,7 @@ public class TestSentryListenerSentryDeserializer extends AbstractMetastoreTestW assertThat(addPartitionMessage.getTable(), IsEqualIgnoringCase.equalToIgnoringCase(testTable));// tableName (returns lowered version) String expectedLocation = warehouseDir + "/" + testDB + ".db/" + testTable + "/" + partColName + "=" + partColValue; if(!useDbNotificationListener) { - Assert.assertEquals(expectedLocation.toLowerCase(), addPartitionMessage.getLocations().get(0)); + assertEquals(expectedLocation.toLowerCase(), addPartitionMessage.getLocations().get(0)); } //Drop partition @@ -265,7 +265,7 @@ public class TestSentryListenerSentryDeserializer extends AbstractMetastoreTestW assertThat(dropPartitionMessage.getDB(), IsEqualIgnoringCase.equalToIgnoringCase(testDB)); //dbName assertThat(dropPartitionMessage.getTable(), IsEqualIgnoringCase.equalToIgnoringCase(testTable)); //tableName if(!useDbNotificationListener) { - Assert.assertEquals(Arrays.asList(expectedLocation.toLowerCase()), dropPartitionMessage.getLocations()); + assertEquals(Arrays.asList(expectedLocation.toLowerCase()), dropPartitionMessage.getLocations()); } } @@ -301,8 +301,8 @@ public class TestSentryListenerSentryDeserializer extends AbstractMetastoreTestW assertThat(alterTableMessage.getDB(), IsEqualIgnoringCase.equalToIgnoringCase(testDB));//dbName assertThat(alterTableMessage.getTable(), IsEqualIgnoringCase.equalToIgnoringCase(testTable));//tableName if(!useDbNotificationListener) { - Assert.assertEquals(oldLocation, alterTableMessage.getOldLocation()); //oldLocation - Assert.assertEquals(tbl1.getSd().getLocation(), alterTableMessage.getNewLocation()); //newLocation + assertEquals(oldLocation, alterTableMessage.getOldLocation()); //oldLocation + assertEquals(tbl1.getSd().getLocation(), alterTableMessage.getNewLocation()); //newLocation } //Alter table rename managed table - location also changes @@ -333,8 +333,8 @@ public class TestSentryListenerSentryDeserializer extends AbstractMetastoreTestW assertThat(response.getEvents().get(0).getDbName(), IsEqualIgnoringCase.equalToIgnoringCase(newDBName));//newDbName assertThat(response.getEvents().get(0).getTableName(), IsEqualIgnoringCase.equalToIgnoringCase(newTableName));//newTableName if(!useDbNotificationListener) { - Assert.assertEquals(oldLocation, alterTableMessage.getOldLocation()); //oldLocation - Assert.assertEquals(tbl1.getSd().getLocation(), alterTableMessage.getNewLocation()); //newLocation + assertEquals(oldLocation, alterTableMessage.getOldLocation()); //oldLocation + assertEquals(tbl1.getSd().getLocation(), alterTableMessage.getNewLocation()); //newLocation } } @@ -372,8 +372,8 @@ public class TestSentryListenerSentryDeserializer extends AbstractMetastoreTestW assertThat(alterPartitionMessage.getDB(), IsEqualIgnoringCase.equalToIgnoringCase(testDB));// dbName assertThat(alterPartitionMessage.getTable(), IsEqualIgnoringCase.equalToIgnoringCase(testTable));// tableName if(!useDbNotificationListener) { - Assert.assertEquals(oldLocation.toLowerCase(), alterPartitionMessage.getOldLocation()); - Assert.assertEquals(newLocation.toLowerCase(), alterPartitionMessage.getNewLocation()); + assertEquals(oldLocation.toLowerCase(), alterPartitionMessage.getOldLocation()); + assertEquals(newLocation.toLowerCase(), alterPartitionMessage.getNewLocation()); assertEquals(partVals1, alterPartitionMessage.getValues()); assertEquals(partVals1, alterPartitionMessage.getNewValues()); } http://git-wip-us.apache.org/repos/asf/sentry/blob/92a183f6/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/tools/CreateSentryTestScaleData.java ---------------------------------------------------------------------- diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/tools/CreateSentryTestScaleData.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/tools/CreateSentryTestScaleData.java index cd9fa28..b234c85 100644 --- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/tools/CreateSentryTestScaleData.java +++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/tools/CreateSentryTestScaleData.java @@ -103,7 +103,9 @@ public class CreateSentryTestScaleData { private static Configuration scaleConfig = new Configuration(); static { StringBuilder fullPath = new StringBuilder(); - if (CONFIG_PATH != null && CONFIG_PATH.length() > 0 ) fullPath.append(CONFIG_PATH); + if (CONFIG_PATH != null && CONFIG_PATH.length() > 0 ) { + fullPath.append(CONFIG_PATH); + } if (fullPath.length() > 0 && fullPath.lastIndexOf("/") != fullPath.length() - 1) { fullPath.append("/"); } @@ -186,9 +188,10 @@ public class CreateSentryTestScaleData { //private functions start from here private static String getKeytabPath(String runAsUser) { - if (KEYTAB_LOCATION != null || KEYTAB_LOCATION.length() > 0) + if (KEYTAB_LOCATION != null && KEYTAB_LOCATION.length() > 0) { return KEYTAB_LOCATION + "/" + runAsUser + ".keytab"; - else return runAsUser + ".keytab"; //in classpath + } + return runAsUser + ".keytab"; //in classpath } private void print(String msg, String level) { @@ -451,9 +454,7 @@ public class CreateSentryTestScaleData { threadTestStatus.failed += 1; print("create() throws exception: " + ex + ", Stacktrace: " + Arrays.deepToString(ex.getStackTrace()), "ERROR"); } - finally { - return threadTestStatus; - } + return threadTestStatus; } }); jobs.add(job); @@ -493,10 +494,9 @@ public class CreateSentryTestScaleData { } } catch (InterruptedException ex) { print("Failed to shut down pool: " + ex, "ERROR"); - } finally { - testStatus.elapsed_time = (System.currentTimeMillis() - createStartTime) / 1000L; //secs - return testStatus; } + testStatus.elapsed_time = (System.currentTimeMillis() - createStartTime) / 1000L; //secs + return testStatus; } /**
