accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [2/7] accumulo git commit: ACCUMULO-4576 Suppress warnings from deprecations
Date Fri, 21 Apr 2017 00:02:22 GMT
ACCUMULO-4576 Suppress warnings from deprecations

Fix compiler warnings leftover from previous deprecation of
HostRegexTableLoadBalancer.HOST_BALANCER_POOL_RECHECK_KEY


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6b2e430d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6b2e430d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6b2e430d

Branch: refs/heads/1.8
Commit: 6b2e430dc0a00039be63a9eceb49cdc75a866ef3
Parents: 5ac1574
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Thu Apr 20 18:48:55 2017 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Thu Apr 20 18:48:55 2017 -0400

----------------------------------------------------------------------
 .../server/master/balancer/HostRegexTableLoadBalancer.java       | 2 --
 .../server/master/balancer/HostRegexTableLoadBalancerTest.java   | 4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b2e430d/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
index 051f306..3a8017a 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
@@ -76,8 +76,6 @@ public class HostRegexTableLoadBalancer extends TableLoadBalancer implements
Con
   private static final String HOST_BALANCER_OOB_DEFAULT = "5m";
   @Deprecated
   public static final String HOST_BALANCER_POOL_RECHECK_KEY = Property.TABLE_ARBITRARY_PROP_PREFIX.getKey()
+ "balancer.host.regex.pool.check";
-  @Deprecated
-  private static final String HOST_BALANCER_POOL_RECHECK_DEFAULT = "1m";
   public static final String HOST_BALANCER_REGEX_USING_IPS_KEY = Property.TABLE_ARBITRARY_PROP_PREFIX.getKey()
+ "balancer.host.regex.is.ip";
   public static final String HOST_BALANCER_REGEX_MAX_MIGRATIONS_KEY = Property.TABLE_ARBITRARY_PROP_PREFIX.getKey()
       + "balancer.host.regex.concurrent.migrations";

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b2e430d/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java
b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java
index 6ac4096..24054f5 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java
@@ -51,7 +51,9 @@ public class HostRegexTableLoadBalancerTest extends BaseHostRegexTableLoadBalanc
   public void testInit() {
     init(factory);
     Assert.assertEquals("OOB check interval value is incorrect", 2000, this.getOobCheckMillis());
-    Assert.assertEquals("Pool check interval value is incorrect", 0, this.getPoolRecheckMillis());
+    @SuppressWarnings("deprecation")
+    long poolRecheckMillis = this.getPoolRecheckMillis();
+    Assert.assertEquals("Pool check interval value is incorrect", 0, poolRecheckMillis);
     Assert.assertFalse(isIpBasedRegex());
     Map<String,Pattern> patterns = this.getPoolNameToRegexPattern();
     Assert.assertEquals(2, patterns.size());


Mime
View raw message