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 C19FF10B26 for ; Wed, 2 Apr 2014 21:05:55 +0000 (UTC) Received: (qmail 52942 invoked by uid 500); 2 Apr 2014 21:05:55 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 52875 invoked by uid 500); 2 Apr 2014 21:05:54 -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 52867 invoked by uid 99); 2 Apr 2014 21:05:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Apr 2014 21:05:54 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Apr 2014 21:05:52 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A74C72388868; Wed, 2 Apr 2014 21:05:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1584186 - in /hbase/branches/0.89-fb/src: main/java/org/apache/hadoop/hbase/master/AssignmentPlanData.java main/java/org/apache/hadoop/hbase/master/RegionPlacement.java test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java Date: Wed, 02 Apr 2014 21:05:29 -0000 To: commits@hbase.apache.org From: liyin@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140402210529.A74C72388868@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: liyin Date: Wed Apr 2 21:05:29 2014 New Revision: 1584186 URL: http://svn.apache.org/r1584186 Log: Remove Gson from dependencies. Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/master/AssignmentPlanData.java hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/master/RegionPlacement.java hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/master/AssignmentPlanData.java URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/master/AssignmentPlanData.java?rev=1584186&r1=1584185&r2=1584186&view=diff ============================================================================== --- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/master/AssignmentPlanData.java (original) +++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/master/AssignmentPlanData.java Wed Apr 2 21:05:29 2014 @@ -23,6 +23,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HServerAddress; +import org.codehaus.jackson.annotate.JsonCreator; +import org.codehaus.jackson.annotate.JsonProperty; import java.util.ArrayList; import java.util.List; @@ -43,7 +45,8 @@ public class AssignmentPlanData { private List assignments; - public AssignmentPlanData(List assignments) { + @JsonCreator + public AssignmentPlanData(@JsonProperty("assignments") List assignments) { this.assignments = assignments; } @@ -56,9 +59,12 @@ public class AssignmentPlanData { */ public static class Assignment { private String regionname; + private List favored; - public Assignment(String regionname, List favored) { + @JsonCreator + public Assignment(@JsonProperty("regionname") String regionname, + @JsonProperty("favored") List favored) { this.regionname = regionname; this.favored = favored; } Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/master/RegionPlacement.java URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/master/RegionPlacement.java?rev=1584186&r1=1584185&r2=1584186&view=diff ============================================================================== --- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/master/RegionPlacement.java (original) +++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/master/RegionPlacement.java Wed Apr 2 21:05:29 2014 @@ -63,9 +63,8 @@ import org.apache.hadoop.hbase.util.Pair import org.apache.log4j.Level; import org.apache.log4j.Logger; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonSyntaxException; +import org.codehaus.jackson.JsonParseException; +import org.codehaus.jackson.map.ObjectMapper; public class RegionPlacement implements RegionPlacementPolicy{ private static final Log LOG = LogFactory.getLog(RegionPlacement.class @@ -1564,10 +1563,10 @@ public class RegionPlacement implements rp.updateAssignmentPlan(newPlan); } s.close(); + } catch (JsonParseException je) { + LOG.error("Unable to parse json file", je); } catch (IOException e) { - LOG.error("Unable to load plan file: " + e); - } catch (JsonSyntaxException je) { - LOG.error("Unable to parse json file: " + je); + LOG.error("Unable to load plan file" , e); } } else if (cmd.hasOption("download")) { String path = cmd.getOptionValue("download"); @@ -1575,9 +1574,9 @@ public class RegionPlacement implements RegionAssignmentSnapshot snapshot = rp.getRegionAssignmentSnapshot(); AssignmentPlan plan = snapshot.getExistingAssignmentPlan(); AssignmentPlanData data = AssignmentPlanData.constructFromAssignmentPlan(plan); - Gson prettyGson = new GsonBuilder().setPrettyPrinting().create(); - String jsonOutput = prettyGson.toJson(data); - FileUtils.write(new File(path), jsonOutput); + + ObjectMapper jsonMapper = new ObjectMapper(); + jsonMapper.defaultPrettyPrintingWriter().writeValue(new File(path), data); } catch (Exception e) { LOG.error("Unable to download current assignment plan" + e); e.printStackTrace(); @@ -1915,12 +1914,11 @@ public class RegionPlacement implements * Convert json string to assignment plan * @param jsonStr * @return assignment plan converted from json string - * @throws JsonSyntaxException * @throws IOException */ public AssignmentPlan loadPlansFromJson(String jsonStr) - throws JsonSyntaxException, IOException { - AssignmentPlanData data = new Gson().fromJson(jsonStr, AssignmentPlanData.class); + throws IOException { + AssignmentPlanData data = new ObjectMapper().readValue(jsonStr, AssignmentPlanData.class); AssignmentPlan newPlan = new AssignmentPlan(); RegionAssignmentSnapshot snapshot = this.getRegionAssignmentSnapshot(); Map map = snapshot.getRegionNameToRegionInfoMap(); Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java?rev=1584186&r1=1584185&r2=1584186&view=diff ============================================================================== --- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java (original) +++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java Wed Apr 2 21:05:29 2014 @@ -60,13 +60,12 @@ import org.apache.hadoop.hbase.util.Byte import org.apache.hadoop.hbase.util.TagRunner; import org.apache.hadoop.hbase.util.TestTag; import org.apache.hadoop.hbase.util.Writables; +import org.codehaus.jackson.map.ObjectMapper; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; -import com.google.gson.Gson; - @RunWith(TagRunner.class) public class TestRegionPlacement { final static Log LOG = LogFactory.getLog(TestRegionPlacement.class); @@ -409,7 +408,7 @@ public class TestRegionPlacement { /** * Verify the number of user regions is assigned to the primary * region server based on the plan is expected - * @param expectedNum. + * @param expectedNum * @throws IOException */ private void verifyRegionOnPrimaryRS(int expectedNum) @@ -422,7 +421,7 @@ public class TestRegionPlacement { /** * Verify the meta has updated to the latest assignment plan - * @param plan + * @param expectedPlan * @throws IOException */ private void verifyMETAUpdated(AssignmentPlan expectedPlan) @@ -634,7 +633,7 @@ public class TestRegionPlacement { RegionPlacement.printAssignmentPlan(currentPlan); AssignmentPlanData data = AssignmentPlanData.constructFromAssignmentPlan(currentPlan); - String jsonStr = new Gson().toJson(data); + String jsonStr = new ObjectMapper().defaultPrettyPrintingWriter().writeValueAsString(data); LOG.info("Json version of current assignment plan: " + jsonStr); AssignmentPlan loadedPlan = rp.loadPlansFromJson(jsonStr); RegionPlacement.printAssignmentPlan(loadedPlan);