[GitHub] keith-turner closed pull request #589: Fixed a few warnings

[GitBox <gi...@apache.org>]

keith-turner closed pull request #589: Fixed a few warnings
URL: https://github.com/apache/accumulo/pull/589
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

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 cc2d0fe5d6..557cde8e87 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 @@
 
   private final int zooKeepersSessionTimeOut;
 
-  @SuppressWarnings("deprecation")
   private ClientConfiguration clientConf;
 
   /**
@@ -84,12 +83,10 @@
    *          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 932e698e46..9da945f519 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 @@
 
   @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 afe5b4b82a..c263fa5790 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 @@
    * 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 abe59657c7..947d401e12 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 ProxyServer(Properties props) {
         .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 ByteBuffer login(String principal, Map<String,String> loginProperties)
 
     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 aa607ead35..4f3f096f80 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.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;


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services