Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id CC0A1200BBF for ; Mon, 14 Nov 2016 19:27:20 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id CACA2160AF4; Mon, 14 Nov 2016 18:27:20 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 0BA2A160B23 for ; Mon, 14 Nov 2016 19:27:18 +0100 (CET) Received: (qmail 26251 invoked by uid 500); 14 Nov 2016 18:27:16 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 25297 invoked by uid 99); 14 Nov 2016 18:27:15 -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; Mon, 14 Nov 2016 18:27:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 77417E3813; Mon, 14 Nov 2016 18:27:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ncole@apache.org To: commits@ambari.apache.org Date: Mon, 14 Nov 2016 18:27:50 -0000 Message-Id: <421bac5bea1742019b991aac5b6f0bb3@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [37/50] [abbrv] ambari git commit: AMBARI-18863 - Upgrade Type Is Incorrectly Quoted When Serialized (jonathanhurley) archived-at: Mon, 14 Nov 2016 18:27:20 -0000 AMBARI-18863 - Upgrade Type Is Incorrectly Quoted When Serialized (jonathanhurley) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e569e972 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e569e972 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e569e972 Branch: refs/heads/branch-dev-patch-upgrade Commit: e569e9722a89d3205a03c43efedbc6cfb7fecde7 Parents: 1807a4a Author: Jonathan Hurley Authored: Fri Nov 11 10:29:43 2016 -0500 Committer: Jonathan Hurley Committed: Fri Nov 11 13:27:03 2016 -0500 ---------------------------------------------------------------------- .../server/controller/internal/UpgradeResourceProvider.java | 8 ++++++-- .../controller/internal/UpgradeResourceProviderTest.java | 7 +++++-- 2 files changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e569e972/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java index 1713b64..1806c64 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java @@ -126,6 +126,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.google.gson.Gson; import com.google.gson.JsonArray; +import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.inject.Inject; import com.google.inject.Provider; @@ -1402,8 +1403,11 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider Map commandParams = getNewParameterMap(request); if (null != context.getType()) { - // use the serialized attributes of the enum to convert it to a string - commandParams.put(COMMAND_PARAM_UPGRADE_TYPE, s_gson.toJson(context.getType())); + // use the serialized attributes of the enum to convert it to a string, + // but first we must convert it into an element so that we don't get a + // quoted string - using toString() actually returns a quoted stirng which is bad + JsonElement json = s_gson.toJsonTree(context.getType()); + commandParams.put(COMMAND_PARAM_UPGRADE_TYPE, json.getAsString()); } commandParams.put(COMMAND_PARAM_VERSION, context.getVersion()); http://git-wip-us.apache.org/repos/asf/ambari/blob/e569e972/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java index 17e4f2d..14e3d08 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java @@ -1246,10 +1246,13 @@ public class UpgradeResourceProviderTest { List stageEntities = stageDAO.findByRequestId(entity.getRequestId()); Gson gson = new Gson(); for (StageEntity se : stageEntities) { - Map map = gson.> fromJson(se.getCommandParamsStage(), - Map.class); + Map map = gson.> fromJson(se.getCommandParamsStage(),Map.class); assertTrue(map.containsKey("upgrade_direction")); assertEquals("upgrade", map.get("upgrade_direction")); + + if(map.containsKey("upgrade_type")){ + assertEquals("rolling_upgrade", map.get("upgrade_type")); + } } List upgradeGroups = entity.getUpgradeGroups();