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 805AC200CBD for ; Thu, 22 Jun 2017 01:16:01 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 7F1D2160BF7; Wed, 21 Jun 2017 23:16:01 +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 12DA3160BFC for ; Thu, 22 Jun 2017 01:15:59 +0200 (CEST) Received: (qmail 19305 invoked by uid 500); 21 Jun 2017 23:15:59 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 18984 invoked by uid 99); 21 Jun 2017 23:15:58 -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; Wed, 21 Jun 2017 23:15:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A90B4E93E1; Wed, 21 Jun 2017 23:15:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: klund@apache.org To: commits@geode.apache.org Date: Wed, 21 Jun 2017 23:16:08 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [13/25] geode git commit: GEODE-3092: fix specifiedDefaultValue for cacheLoader and cacheWriter archived-at: Wed, 21 Jun 2017 23:16:01 -0000 GEODE-3092: fix specifiedDefaultValue for cacheLoader and cacheWriter Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/c6d88f74 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/c6d88f74 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/c6d88f74 Branch: refs/heads/feature/GEODE-3062-2 Commit: c6d88f748f32293edfb2c92e914a12b21969c061 Parents: 87c26be Author: Jinmei Liao Authored: Mon Jun 19 09:08:35 2017 -0700 Committer: Jinmei Liao Committed: Mon Jun 19 14:02:24 2017 -0700 ---------------------------------------------------------------------- .../CreateAlterDestroyRegionCommands.java | 45 ++++++++++---------- .../internal/cli/GfshParserParsingTest.java | 19 +++++++-- 2 files changed, 38 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/c6d88f74/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java index 842802b..bf22854 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java @@ -14,7 +14,28 @@ */ package org.apache.geode.management.internal.cli.commands; +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import java.util.TreeSet; +import java.util.concurrent.atomic.AtomicReference; +import java.util.regex.Pattern; + +import javax.management.MBeanServer; +import javax.management.MalformedObjectNameException; +import javax.management.ObjectName; + import org.apache.commons.lang.StringUtils; +import org.springframework.shell.core.annotation.CliCommand; +import org.springframework.shell.core.annotation.CliOption; + import org.apache.geode.LogWriter; import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.ExpirationAttributes; @@ -58,26 +79,6 @@ import org.apache.geode.management.internal.configuration.domain.XmlEntity; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission.Operation; import org.apache.geode.security.ResourcePermission.Resource; -import org.springframework.shell.core.annotation.CliAvailabilityIndicator; -import org.springframework.shell.core.annotation.CliCommand; -import org.springframework.shell.core.annotation.CliOption; - -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.TreeSet; -import java.util.concurrent.atomic.AtomicReference; -import java.util.regex.Pattern; -import javax.management.MBeanServer; -import javax.management.MalformedObjectNameException; -import javax.management.ObjectName; /** * @since GemFire 7.0 @@ -408,9 +409,9 @@ public class CreateAlterDestroyRegionCommands implements GfshCommand { help = CliStrings.ALTER_REGION__REGIONEXPIRATIONTTLACTION__HELP) String regionExpirationTTLAction, @CliOption(key = CliStrings.ALTER_REGION__CACHELISTENER, specifiedDefaultValue = "", help = CliStrings.ALTER_REGION__CACHELISTENER__HELP) String[] cacheListeners, - @CliOption(key = CliStrings.ALTER_REGION__CACHELOADER, specifiedDefaultValue = "null", + @CliOption(key = CliStrings.ALTER_REGION__CACHELOADER, specifiedDefaultValue = "", help = CliStrings.ALTER_REGION__CACHELOADER__HELP) String cacheLoader, - @CliOption(key = CliStrings.ALTER_REGION__CACHEWRITER, specifiedDefaultValue = "null", + @CliOption(key = CliStrings.ALTER_REGION__CACHEWRITER, specifiedDefaultValue = "", help = CliStrings.ALTER_REGION__CACHEWRITER__HELP) String cacheWriter, @CliOption(key = CliStrings.ALTER_REGION__ASYNCEVENTQUEUEID, specifiedDefaultValue = "", help = CliStrings.ALTER_REGION__ASYNCEVENTQUEUEID__HELP) String[] asyncEventQueueIds, http://git-wip-us.apache.org/repos/asf/geode/blob/c6d88f74/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserParsingTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserParsingTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserParsingTest.java index 47d150d..961cdf8 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserParsingTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserParsingTest.java @@ -17,15 +17,16 @@ package org.apache.geode.management.internal.cli; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; -import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.test.dunit.rules.GfshParserRule; -import org.apache.geode.test.junit.categories.IntegrationTest; +import java.util.Map; + import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.springframework.shell.event.ParseResult; -import java.util.Map; +import org.apache.geode.management.internal.cli.i18n.CliStrings; +import org.apache.geode.test.dunit.rules.GfshParserRule; +import org.apache.geode.test.junit.categories.IntegrationTest; @Category(IntegrationTest.class) public class GfshParserParsingTest { @@ -290,4 +291,14 @@ public class GfshParserParsingTest { GfshParseResult result = parser.parse(command); assertThat(result.getParamValue("name")).isEqualTo("\\u0005Name"); } + + @Test + public void testAlterRegion() throws Exception { + String command = + "alter region --name=/Person --cache-writer='' --cache-listener='' --cache-loader=''"; + GfshParseResult result = parser.parse(command); + assertThat(result.getParamValue("cache-writer")).isNotNull().isEmpty(); + assertThat(result.getParamValue("cache-listener")).isNotNull().isEmpty(); + assertThat(result.getParamValue("cache-loader")).isNotNull().isEmpty(); + } }