You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sentry.apache.org by ja...@apache.org on 2014/06/06 02:51:06 UTC
git commit: SENTRY-231: Fix JDK 6 build
Repository: incubator-sentry
Updated Branches:
refs/heads/master 7a9fd90c3 -> ff30d7ff5
SENTRY-231: Fix JDK 6 build
(Ruiming Zhou via Jarek Jarcec Cecho)
Project: http://git-wip-us.apache.org/repos/asf/incubator-sentry/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-sentry/commit/ff30d7ff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-sentry/tree/ff30d7ff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-sentry/diff/ff30d7ff
Branch: refs/heads/master
Commit: ff30d7ff5cc83bcaa69cb2214e4f7af0016639af
Parents: 7a9fd90
Author: Jarek Jarcec Cecho <ja...@apache.org>
Authored: Thu Jun 5 16:49:57 2014 -0700
Committer: Jarek Jarcec Cecho <ja...@apache.org>
Committed: Thu Jun 5 16:49:57 2014 -0700
----------------------------------------------------------------------
pom.xml | 4 ++--
.../provider/db/service/persistent/SentryStore.java | 2 +-
.../service/thrift/SentryPolicyServiceClient.java | 2 +-
.../service/thrift/SentryPolicyStoreProcessor.java | 16 +++++++++++++---
.../sentry/provider/db/tools/SentrySchemaTool.java | 9 ++++++++-
.../thrift/SentryServiceIntegrationBase.java | 2 +-
.../provider/file/SimpleFileProviderBackend.java | 4 ++--
.../e2e/dbprovider/AbstractTestWithDbProvider.java | 2 +-
8 files changed, 29 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/ff30d7ff/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f4b6583..564a2ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,8 +50,8 @@ limitations under the License.
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compile.source>1.7</maven.compile.source>
- <maven.compile.target>1.7</maven.compile.target>
+ <maven.compile.source>1.6</maven.compile.source>
+ <maven.compile.target>1.6</maven.compile.target>
<!-- versions are in alphabetical order -->
<ant.contrib.version>1.0b3</ant.contrib.version>
<maven.antrun.plugin.version>1.7</maven.antrun.plugin.version>
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/ff30d7ff/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 ff656aa..a959b13 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
@@ -813,7 +813,7 @@ public class SentryStore {
@VisibleForTesting
static String toAuthorizable(MSentryPrivilege privilege) {
- List<String> authorizable = new ArrayList<>(4);
+ List<String> authorizable = new ArrayList<String>(4);
authorizable.add(KV_JOINER.join(AuthorizableType.Server.name().toLowerCase(),
privilege.getServerName()));
if (Strings.nullToEmpty(privilege.getURI()).isEmpty()) {
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/ff30d7ff/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/thrift/SentryPolicyServiceClient.java
----------------------------------------------------------------------
diff --git a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/thrift/SentryPolicyServiceClient.java b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/thrift/SentryPolicyServiceClient.java
index ebcec1b..62113c8 100644
--- a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/thrift/SentryPolicyServiceClient.java
+++ b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/thrift/SentryPolicyServiceClient.java
@@ -75,7 +75,7 @@ public class SentryPolicyServiceClient {
ClientConfig.SERVER_RPC_CONN_TIMEOUT_DEFAULT);
kerberos = ServerConfig.SECURITY_MODE_KERBEROS.equalsIgnoreCase(
conf.get(ServerConfig.SECURITY_MODE, ServerConfig.SECURITY_MODE_KERBEROS).trim());
- transport = new TSocket(serverAddress.getHostString(),
+ transport = new TSocket(serverAddress.getHostName(),
serverAddress.getPort(), connectionTimeout);
if (kerberos) {
String serverPrincipal = Preconditions.checkNotNull(
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/ff30d7ff/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/thrift/SentryPolicyStoreProcessor.java
----------------------------------------------------------------------
diff --git a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/thrift/SentryPolicyStoreProcessor.java b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/thrift/SentryPolicyStoreProcessor.java
index f06568f..322e90e 100644
--- a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/thrift/SentryPolicyStoreProcessor.java
+++ b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/thrift/SentryPolicyStoreProcessor.java
@@ -402,9 +402,19 @@ public class SentryPolicyStoreProcessor implements SentryPolicyService.Iface {
constrctor.setAccessible(true);
groupMappingService = (GroupMappingService) constrctor.newInstance(new Object[] { conf,
authResoruce });
- } catch (NoSuchMethodException | SecurityException | ClassNotFoundException
- | InstantiationException | IllegalAccessException
- | IllegalArgumentException | InvocationTargetException e) {
+ } catch (NoSuchMethodException e) {
+ throw new SentryUserException("Unable to instantiate group mapping", e);
+ } catch (SecurityException e) {
+ throw new SentryUserException("Unable to instantiate group mapping", e);
+ } catch (ClassNotFoundException e) {
+ throw new SentryUserException("Unable to instantiate group mapping", e);
+ } catch (InstantiationException e) {
+ throw new SentryUserException("Unable to instantiate group mapping", e);
+ } catch (IllegalAccessException e) {
+ throw new SentryUserException("Unable to instantiate group mapping", e);
+ } catch (IllegalArgumentException e) {
+ throw new SentryUserException("Unable to instantiate group mapping", e);
+ } catch (InvocationTargetException e) {
throw new SentryUserException("Unable to instantiate group mapping", e);
}
return groupMappingService.getGroups(userName);
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/ff30d7ff/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/tools/SentrySchemaTool.java
----------------------------------------------------------------------
diff --git a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/tools/SentrySchemaTool.java b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/tools/SentrySchemaTool.java
index 0afb00f..164876d 100644
--- a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/tools/SentrySchemaTool.java
+++ b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/tools/SentrySchemaTool.java
@@ -563,7 +563,14 @@ public class SentrySchemaTool {
System.err.println("no valid option supplied");
printAndExit(cmdLineOptions);
}
- } catch (SentryUserException | MalformedURLException e) {
+ } catch (SentryUserException e) {
+ System.err.println(e);
+ if (line.hasOption("verbose")) {
+ e.printStackTrace();
+ }
+ System.err.println("*** Sentry schemaTool failed ***");
+ System.exit(1);
+ } catch (MalformedURLException e) {
System.err.println(e);
if (line.hasOption("verbose")) {
e.printStackTrace();
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/ff30d7ff/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/service/thrift/SentryServiceIntegrationBase.java
----------------------------------------------------------------------
diff --git a/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/service/thrift/SentryServiceIntegrationBase.java b/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/service/thrift/SentryServiceIntegrationBase.java
index a98ddcb..f3142fe 100644
--- a/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/service/thrift/SentryServiceIntegrationBase.java
+++ b/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/service/thrift/SentryServiceIntegrationBase.java
@@ -121,7 +121,7 @@ public abstract class SentryServiceIntegrationBase extends KerberosSecurityTestc
conf.set(ServerConfig.SENTRY_STORE_JDBC_URL,
"jdbc:derby:;databaseName=" + dbDir.getPath() + ";create=true");
server = new SentryServiceFactory().create(conf);
- conf.set(ClientConfig.SERVER_RPC_ADDRESS, server.getAddress().getHostString());
+ conf.set(ClientConfig.SERVER_RPC_ADDRESS, server.getAddress().getHostName());
conf.set(ClientConfig.SERVER_RPC_PORT, String.valueOf(server.getAddress().getPort()));
conf.set(ServerConfig.SENTRY_STORE_GROUP_MAPPING,
ServerConfig.SENTRY_STORE_LOCAL_GROUP_MAPPING);
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/ff30d7ff/sentry-provider/sentry-provider-file/src/main/java/org/apache/sentry/provider/file/SimpleFileProviderBackend.java
----------------------------------------------------------------------
diff --git a/sentry-provider/sentry-provider-file/src/main/java/org/apache/sentry/provider/file/SimpleFileProviderBackend.java b/sentry-provider/sentry-provider-file/src/main/java/org/apache/sentry/provider/file/SimpleFileProviderBackend.java
index 7f4c05c..61eb694 100644
--- a/sentry-provider/sentry-provider-file/src/main/java/org/apache/sentry/provider/file/SimpleFileProviderBackend.java
+++ b/sentry-provider/sentry-provider-file/src/main/java/org/apache/sentry/provider/file/SimpleFileProviderBackend.java
@@ -291,7 +291,7 @@ public class SimpleFileProviderBackend implements ProviderBackend {
String roleName = cell.getColumnKey();
Set<String> privileges = groupRolePrivilegeTable.get(groupName, roleName);
if (privileges == null) {
- privileges = new HashSet<>();
+ privileges = new HashSet<String>();
groupRolePrivilegeTable.put(groupName, roleName, privileges);
}
privileges.addAll(cell.getValue());
@@ -369,7 +369,7 @@ public class SimpleFileProviderBackend implements ProviderBackend {
if (roleNameToPrivilegeMap.containsKey(roleName)) {
Set<String> privileges = groupRolePrivilegeTable.get(groupName, roleName);
if (privileges == null) {
- privileges = new HashSet<>();
+ privileges = new HashSet<String>();
groupRolePrivilegeTable.put(groupName, roleName, privileges);
}
privileges.addAll(roleNameToPrivilegeMap.get(roleName));
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/ff30d7ff/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/dbprovider/AbstractTestWithDbProvider.java
----------------------------------------------------------------------
diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/dbprovider/AbstractTestWithDbProvider.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/dbprovider/AbstractTestWithDbProvider.java
index 09a14bf..5d7428a 100644
--- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/dbprovider/AbstractTestWithDbProvider.java
+++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/dbprovider/AbstractTestWithDbProvider.java
@@ -93,7 +93,7 @@ public abstract class AbstractTestWithDbProvider extends AbstractTestWithHiveSer
server = new SentryServiceFactory().create(conf);
properties.put(ClientConfig.SERVER_RPC_ADDRESS, server.getAddress()
- .getHostString());
+ .getHostName());
properties.put(ClientConfig.SERVER_RPC_PORT,
String.valueOf(server.getAddress().getPort()));