From commits-return-22027-archive-asf-public=cust-asf.ponee.io@accumulo.apache.org Thu Aug 9 19:12:43 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id D26EE180676 for ; Thu, 9 Aug 2018 19:12:42 +0200 (CEST) Received: (qmail 35028 invoked by uid 500); 9 Aug 2018 17:12:42 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 35018 invoked by uid 99); 9 Aug 2018 17:12:41 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Aug 2018 17:12:41 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 6600A850E2; Thu, 9 Aug 2018 17:12:41 +0000 (UTC) Date: Thu, 09 Aug 2018 17:12:41 +0000 To: "commits@accumulo.apache.org" Subject: [accumulo] branch master updated: Fixed a few warnings (#589) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <153383476133.24421.1383086439170558941@gitbox.apache.org> From: kturner@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: accumulo X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 04795533f9311d99466c84c0001aa70d52130fcf X-Git-Newrev: 587afe25c5c6156ed12a4c15c01e5aafc4fa77d4 X-Git-Rev: 587afe25c5c6156ed12a4c15c01e5aafc4fa77d4 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. kturner pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git The following commit(s) were added to refs/heads/master by this push: new 587afe2 Fixed a few warnings (#589) 587afe2 is described below commit 587afe25c5c6156ed12a4c15c01e5aafc4fa77d4 Author: Keith Turner AuthorDate: Thu Aug 9 13:12:39 2018 -0400 Fixed a few warnings (#589) --- .../main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java | 3 --- core/src/test/java/org/apache/accumulo/core/util/MonitorUtilTest.java | 1 - .../java/org/apache/accumulo/minicluster/MiniAccumuloInstance.java | 1 - proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java | 2 ++ server/base/src/main/java/org/apache/accumulo/server/ServerInfo.java | 4 ---- 5 files changed, 2 insertions(+), 9 deletions(-) diff --git a/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java b/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java index cc2d0fe..557cde8 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java +++ b/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java @@ -73,7 +73,6 @@ public class ZooKeeperInstance implements Instance { private final int zooKeepersSessionTimeOut; - @SuppressWarnings("deprecation") private ClientConfiguration clientConf; /** @@ -84,12 +83,10 @@ public class ZooKeeperInstance implements Instance { * A comma separated list of zoo keeper server locations. Each location can contain an * optional port, of the format host:port. */ - @SuppressWarnings("deprecation") public ZooKeeperInstance(String instanceName, String zooKeepers) { this(ClientConfiguration.loadDefault().withInstance(instanceName).withZkHosts(zooKeepers)); } - @SuppressWarnings("deprecation") ZooKeeperInstance(ClientConfiguration config, ZooCacheFactory zcf) { checkArgument(config != null, "config is null"); this.clientConf = config; diff --git a/core/src/test/java/org/apache/accumulo/core/util/MonitorUtilTest.java b/core/src/test/java/org/apache/accumulo/core/util/MonitorUtilTest.java index 932e698..9da945f 100644 --- a/core/src/test/java/org/apache/accumulo/core/util/MonitorUtilTest.java +++ b/core/src/test/java/org/apache/accumulo/core/util/MonitorUtilTest.java @@ -31,7 +31,6 @@ public class MonitorUtilTest { @Test public void testNoNodeFound() throws Exception { - final String instanceId = "12345"; ZooReader zr = mock(ZooReader.class); ClientContext context = mock(ClientContext.class); diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloInstance.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloInstance.java index afe5b4b..c263fa5 100644 --- a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloInstance.java +++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloInstance.java @@ -34,7 +34,6 @@ public class MiniAccumuloInstance extends org.apache.accumulo.core.client.ZooKee * Construct an {@link org.apache.accumulo.core.client.Instance} entry point to Accumulo using a * {@link MiniAccumuloCluster} directory */ - @SuppressWarnings("deprecation") public MiniAccumuloInstance(String instanceName, File directory) throws FileNotFoundException { super(org.apache.accumulo.core.client.ClientConfiguration .fromFile(new File(new File(directory, "conf"), "client.conf")).withInstance(instanceName) 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 abe5965..947d401 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java @@ -220,6 +220,7 @@ public class ProxyServer implements AccumuloProxy.Iface { .maximumSize(1000).removalListener(new CloseConditionalWriter()).build(); } + @SuppressWarnings("deprecation") protected Connector getConnector(ByteBuffer login) throws Exception { String[] pair = ByteBufferUtil.toString(login).split(",", 2); if (instance.getInstanceID().equals(pair[0])) { @@ -2091,6 +2092,7 @@ public class ProxyServer implements AccumuloProxy.Iface { try { AuthenticationToken token = getToken(principal, loginProperties); + @SuppressWarnings("deprecation") ByteBuffer login = ByteBuffer .wrap((instance.getInstanceID() + "," + new Credentials(principal, token).serialize()) .getBytes(UTF_8)); diff --git a/server/base/src/main/java/org/apache/accumulo/server/ServerInfo.java b/server/base/src/main/java/org/apache/accumulo/server/ServerInfo.java index aa607ea..4f3f096 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/ServerInfo.java +++ b/server/base/src/main/java/org/apache/accumulo/server/ServerInfo.java @@ -39,13 +39,9 @@ import org.apache.accumulo.server.fs.VolumeManager; import org.apache.accumulo.server.fs.VolumeManagerImpl; import org.apache.accumulo.server.security.SystemCredentials; import org.apache.hadoop.fs.Path; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class ServerInfo implements ClientInfo { - private static final Logger log = LoggerFactory.getLogger(ServerInfo.class); - private String instanceID; private String instanceName; private String zooKeepers;