You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2018/12/04 03:28:31 UTC
[accumulo] branch master updated (2723e5d -> 2b11a93)
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git.
from 2723e5d Make auths optional in new MR API (#789)
new a5e341c Fix warnings by adding missing generic types
new ab8fe4c Merge branch '1.9'
new 2b11a93 Fix warnings
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../test/java/org/apache/accumulo/hadoop/its/mapred/TokenFileIT.java | 1 -
.../java/org/apache/accumulo/hadoop/its/mapreduce/TokenFileIT.java | 1 -
proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java | 5 ++---
3 files changed, 2 insertions(+), 5 deletions(-)
[accumulo] 02/02: Fix warnings
Posted by ct...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 2b11a93f65d14fa33df5477b1cf0d2e4e32b57b7
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Mon Dec 3 22:25:39 2018 -0500
Fix warnings
Remove unnecessary warnings suppressions
Inline deprecated import
---
.../test/java/org/apache/accumulo/hadoop/its/mapred/TokenFileIT.java | 1 -
.../java/org/apache/accumulo/hadoop/its/mapreduce/TokenFileIT.java | 1 -
proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java | 5 ++---
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/TokenFileIT.java b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/TokenFileIT.java
index 563ee4c..dbf42d0 100644
--- a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/TokenFileIT.java
+++ b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/TokenFileIT.java
@@ -94,7 +94,6 @@ public class TokenFileIT extends AccumuloClusterHarness {
}
- @SuppressWarnings("deprecation")
@SuppressFBWarnings(value = "PATH_TRAVERSAL_IN", justification = "path provided by test")
@Override
public int run(String[] args) throws Exception {
diff --git a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/TokenFileIT.java b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/TokenFileIT.java
index 9eb5be9..6837c79 100644
--- a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/TokenFileIT.java
+++ b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/TokenFileIT.java
@@ -84,7 +84,6 @@ public class TokenFileIT extends AccumuloClusterHarness {
}
}
- @SuppressWarnings("deprecation")
@SuppressFBWarnings(value = "PATH_TRAVERSAL_IN", justification = "path provided by test")
@Override
public int run(String[] args) throws Exception {
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java b/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
index 0fc83d6..fedb986 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
@@ -65,7 +65,6 @@ import org.apache.accumulo.core.client.security.SecurityErrorCode;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
import org.apache.accumulo.core.clientImpl.ClientConfConverter;
-import org.apache.accumulo.core.clientImpl.ConnectorImpl;
import org.apache.accumulo.core.clientImpl.Credentials;
import org.apache.accumulo.core.clientImpl.Namespace;
import org.apache.accumulo.core.clientImpl.thrift.TableOperationExceptionType;
@@ -226,8 +225,8 @@ public class ProxyServer implements AccumuloProxy.Iface {
String[] pair = ByteBufferUtil.toString(login).split(",", 2);
if (instance.getInstanceID().equals(pair[0])) {
Credentials creds = Credentials.deserialize(pair[1]);
- return ((ConnectorImpl) instance.getConnector(creds.getPrincipal(), creds.getToken()))
- .getAccumuloClient();
+ return ((org.apache.accumulo.core.clientImpl.ConnectorImpl) instance
+ .getConnector(creds.getPrincipal(), creds.getToken())).getAccumuloClient();
} else {
throw new org.apache.accumulo.core.client.AccumuloSecurityException(pair[0],
org.apache.accumulo.core.clientImpl.thrift.SecurityErrorCode.INVALID_INSTANCEID);
[accumulo] 01/02: Merge branch '1.9'
Posted by ct...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit ab8fe4c4731a1645d4a58621e58b510a62eabd6d
Merge: 2723e5d a5e341c
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Mon Dec 3 22:08:18 2018 -0500
Merge branch '1.9'