Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-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 2D09118C5F for ; Thu, 19 Nov 2015 07:33:37 +0000 (UTC) Received: (qmail 3833 invoked by uid 500); 19 Nov 2015 07:33:36 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 3384 invoked by uid 500); 19 Nov 2015 07:33:36 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 2477 invoked by uid 99); 19 Nov 2015 07:33:36 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Nov 2015 07:33:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C7E58E1080; Thu, 19 Nov 2015 07:33:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: syuanjiang@apache.org To: commits@hbase.apache.org Date: Thu, 19 Nov 2015 07:33:38 -0000 Message-Id: <3b057e0802114a5cb12b6867150585bf@git.apache.org> In-Reply-To: <391b178201284a11a522ce2c919d74be@git.apache.org> References: <391b178201284a11a522ce2c919d74be@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [04/26] hbase git commit: HBASE-14584 TestNamespacesInstanceModel fails on jdk8 HBASE-14584 TestNamespacesInstanceModel fails on jdk8 Signed-off-by: Andrew Purtell Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/dadfe7da Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/dadfe7da Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/dadfe7da Branch: refs/heads/hbase-12439 Commit: dadfe7da0484be81ae09ad61f976967b9893c38d Parents: a591df1 Author: Matt Warhaftig Authored: Sun Oct 11 16:55:49 2015 -0400 Committer: Andrew Purtell Committed: Tue Nov 17 13:15:22 2015 -0800 ---------------------------------------------------------------------- .../hadoop/hbase/rest/model/NamespacesInstanceModel.java | 3 --- .../org/apache/hadoop/hbase/rest/model/TestModelBase.java | 7 +++---- .../hadoop/hbase/rest/model/TestNamespacesInstanceModel.java | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/dadfe7da/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/NamespacesInstanceModel.java ---------------------------------------------------------------------- diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/NamespacesInstanceModel.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/NamespacesInstanceModel.java index 8b61b2c..b31ecf9 100644 --- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/NamespacesInstanceModel.java +++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/NamespacesInstanceModel.java @@ -25,10 +25,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessOrder; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAccessorOrder; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlTransient; @@ -51,7 +49,6 @@ import org.apache.hadoop.hbase.rest.protobuf */ @XmlRootElement(name="NamespaceProperties") @XmlAccessorType(XmlAccessType.FIELD) -@XmlAccessorOrder(XmlAccessOrder.ALPHABETICAL) @InterfaceAudience.Private public class NamespacesInstanceModel implements Serializable, ProtobufMessageHandler { http://git-wip-us.apache.org/repos/asf/hbase/blob/dadfe7da/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestModelBase.java ---------------------------------------------------------------------- diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestModelBase.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestModelBase.java index 427bb9f..9cba485 100644 --- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestModelBase.java +++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestModelBase.java @@ -112,11 +112,10 @@ public abstract class TestModelBase extends TestCase { checkModel(fromXML(AS_XML)); } - /** - * COMMENTED OUT FOR NOW. GIVES DIFFERENT RESULTS ON JDK7 vs JDK8 public void testToXML() throws Exception { - assertEquals(AS_XML, toXML(buildTestModel())); - }**/ + // Uses fromXML to check model because XML element ordering can be random. + checkModel(fromXML(toXML(buildTestModel()))); + } public void testToJSON() throws Exception { try { http://git-wip-us.apache.org/repos/asf/hbase/blob/dadfe7da/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestNamespacesInstanceModel.java ---------------------------------------------------------------------- diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestNamespacesInstanceModel.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestNamespacesInstanceModel.java index af75aa2..fe371d5 100644 --- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestNamespacesInstanceModel.java +++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestNamespacesInstanceModel.java @@ -86,7 +86,7 @@ public class TestNamespacesInstanceModel extends TestModelBase