Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 46E23C642 for ; Sat, 13 Dec 2014 19:23:39 +0000 (UTC) Received: (qmail 39966 invoked by uid 500); 13 Dec 2014 19:23:39 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 39936 invoked by uid 500); 13 Dec 2014 19:23:39 -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 39927 invoked by uid 99); 13 Dec 2014 19:23:39 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 13 Dec 2014 19:23:39 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B85F1955016; Sat, 13 Dec 2014 19:23:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Date: Sat, 13 Dec 2014 19:23:39 -0000 Message-Id: <001ed22642fa4b9fae3bb9a176626cf5@git.apache.org> In-Reply-To: <217cfbe7fe4449fcbf86888689f0fdae@git.apache.org> References: <217cfbe7fe4449fcbf86888689f0fdae@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] accumulo git commit: ACCUMULO-2981 Fix warnings building in JDK8 ACCUMULO-2981 Fix warnings building in JDK8 Remove use of single underscore as an identifier (replaced with U+2054). And fix type safety check failure with EasyMock in JDK8. Make it easier to switch Java version by moving it to a Maven property. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c07e3d06 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c07e3d06 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c07e3d06 Branch: refs/heads/master Commit: c07e3d0636d7922ff2040200cde7831e2100f624 Parents: 1a944c0 Author: Christopher Tubbs Authored: Sat Dec 13 14:00:13 2014 -0500 Committer: Christopher Tubbs Committed: Sat Dec 13 14:09:11 2014 -0500 ---------------------------------------------------------------------- .../minicluster/impl/CleanShutdownMacTest.java | 2 +- pom.xml | 9 +++++---- .../java/org/apache/accumulo/master/Master.java | 16 ++++++++-------- 3 files changed, 14 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c07e3d06/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/CleanShutdownMacTest.java ---------------------------------------------------------------------- diff --git a/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/CleanShutdownMacTest.java b/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/CleanShutdownMacTest.java index 2ac8d6f..09ee9f4 100644 --- a/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/CleanShutdownMacTest.java +++ b/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/CleanShutdownMacTest.java @@ -44,7 +44,7 @@ public class CleanShutdownMacTest { cluster.setShutdownExecutor(mockService); EasyMock.expect(future.get()).andReturn(0).anyTimes(); - EasyMock.expect(mockService.submit(EasyMock.anyObject(Callable.class))).andReturn(future).anyTimes(); + EasyMock.expect(mockService.submit(EasyMock.anyObject(Callable.class))).andReturn(future).anyTimes(); EasyMock.expect(mockService.shutdownNow()).andReturn(Collections. emptyList()).once(); EasyMock.replay(mockService, future); http://git-wip-us.apache.org/repos/asf/accumulo/blob/c07e3d06/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 824f56c..f40a650 100644 --- a/pom.xml +++ b/pom.xml @@ -123,6 +123,7 @@ 2.2.0 3.1 + 1.6 8.1.15.v20140411 3.0.4 @@ -572,8 +573,8 @@ maven-compiler-plugin - 1.6 - 1.6 + ${java.ver} + ${java.ver} true true true @@ -598,7 +599,7 @@ ${project.reporting.outputEncoding} true docs - 1.6 + ${java.ver} -J-Xmx512m @@ -977,7 +978,7 @@ html true - 1.6 + ${java.ver} http://git-wip-us.apache.org/repos/asf/accumulo/blob/c07e3d06/server/master/src/main/java/org/apache/accumulo/master/Master.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java b/server/master/src/main/java/org/apache/accumulo/master/Master.java index 83e83cf..496b6a9 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/Master.java +++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java @@ -188,17 +188,17 @@ public class Master implements LiveTServerSet.Listener, TableObserver, CurrentSt } static final boolean X = true; - static final boolean _ = false; + static final boolean ⁔ = false; // use U+2054 because a single underscore is deprecated as an identifier in Java 8. // @formatter:off static final boolean transitionOK[][] = { // INITIAL HAVE_LOCK SAFE_MODE NORMAL UNLOAD_META UNLOAD_ROOT STOP - /* INITIAL */ {X, X, _, _, _, _, X}, - /* HAVE_LOCK */ {_, X, X, X, _, _, X}, - /* SAFE_MODE */ {_, _, X, X, X, _, X}, - /* NORMAL */ {_, _, X, X, X, _, X}, - /* UNLOAD_METADATA_TABLETS */ {_, _, X, X, X, X, X}, - /* UNLOAD_ROOT_TABLET */ {_, _, _, X, X, X, X}, - /* STOP */ {_, _, _, _, _, X, X}}; + /* INITIAL */ {X, X, ⁔, ⁔, ⁔, ⁔, X}, + /* HAVE_LOCK */ {⁔, X, X, X, ⁔, ⁔, X}, + /* SAFE_MODE */ {⁔, ⁔, X, X, X, ⁔, X}, + /* NORMAL */ {⁔, ⁔, X, X, X, ⁔, X}, + /* UNLOAD_METADATA_TABLETS */ {⁔, ⁔, X, X, X, X, X}, + /* UNLOAD_ROOT_TABLET */ {⁔, ⁔, ⁔, X, X, X, X}, + /* STOP */ {⁔, ⁔, ⁔, ⁔, ⁔, X, X}}; //@formatter:on synchronized void setMasterState(MasterState newState) { if (state.equals(newState))