geode git commit: GEODE-3267: Refactoring QueueCommands
Repository: geode
Updated Branches:
refs/heads/develop 359e3fff6 -> fd47ed660
GEODE-3267: Refactoring QueueCommands
This closes #695
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/fd47ed66
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/fd47ed66
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/fd47ed66
Branch: refs/heads/develop
Commit: fd47ed660168864a6f81b2a4cd7dbceebc99a282
Parents: 359e3ff
Author: YehEmily
Authored: Mon Aug 7 14:47:15 2017 -0700
Committer: Kirk Lund
Committed: Fri Aug 11 14:31:31 2017 -0700
--
.../commands/CreateAsyncEventQueueCommand.java | 171
.../commands/ListAsyncEventQueuesCommand.java | 118 +
.../internal/cli/commands/QueueCommands.java| 259 ---
.../controllers/QueueCommandsController.java| 10 +-
4 files changed, 295 insertions(+), 263 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/geode/blob/fd47ed66/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommand.java
--
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommand.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommand.java
new file mode 100644
index 000..ba9dc94
--- /dev/null
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommand.java
@@ -0,0 +1,171 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express
+ * or implied. See the License for the specific language governing permissions
and limitations under
+ * the License.
+ */
+
+package org.apache.geode.management.internal.cli.commands;
+
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.springframework.shell.core.annotation.CliCommand;
+import org.springframework.shell.core.annotation.CliOption;
+
+import org.apache.geode.SystemFailure;
+import org.apache.geode.cache.execute.ResultCollector;
+import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.management.cli.ConverterHint;
+import org.apache.geode.management.cli.Result;
+import org.apache.geode.management.internal.cli.CliUtil;
+import
org.apache.geode.management.internal.cli.functions.AsyncEventQueueFunctionArgs;
+import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
+import
org.apache.geode.management.internal.cli.functions.CreateAsyncEventQueueFunction;
+import org.apache.geode.management.internal.cli.i18n.CliStrings;
+import org.apache.geode.management.internal.cli.result.ResultBuilder;
+import org.apache.geode.management.internal.cli.result.TabularResultData;
+import org.apache.geode.management.internal.configuration.domain.XmlEntity;
+import org.apache.geode.management.internal.security.ResourceOperation;
+import org.apache.geode.security.ResourcePermission;
+
+public class CreateAsyncEventQueueCommand implements GfshCommand {
+ @CliCommand(value = CliStrings.CREATE_ASYNC_EVENT_QUEUE,
+ help = CliStrings.CREATE_ASYNC_EVENT_QUEUE__HELP)
+ @ResourceOperation(resource = ResourcePermission.Resource.CLUSTER,
+ operation = ResourcePermission.Operation.MANAGE, target =
ResourcePermission.Target.JAR)
+ public Result createAsyncEventQueue(
+ @CliOption(key = CliStrings.CREATE_ASYNC_EVENT_QUEUE__ID, mandatory =
true,
+ help = CliStrings.CREATE_ASYNC_EVENT_QUEUE__ID__HELP) String id,
+ @CliOption(key = {CliStrings.GROUP, CliStrings.GROUPS},
+ optionContext = ConverterHint.MEMBERGROUP,
+ help = CliStrings.CREATE_ASYNC_EVENT_QUEUE__GROUP__HELP) String[]
groups,
+ @CliOption(key = CliStrings.CREATE_ASYNC_EVENT_QUEUE__PARALLEL,
+ unspecifiedDefaultValue = "false", specifiedDefaultValue = "true",
+ help = CliStrings.CREATE_ASYNC_EVENT_QUEUE__PARALLEL__HELP) Boolean
parallel,
+ @CliOption(key =
CliStrings.CREATE_ASYNC_EVENT_QUEUE__ENABLEBATCHCONFLATION,
+ unspecifiedDefaultValue = "false", specifi
[2/2] geode git commit: GEODE-3267: Refactoring QueueCommands - updated based on feedback
GEODE-3267: Refactoring QueueCommands - updated based on feedback
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/957d583e
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/957d583e
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/957d583e
Branch: refs/heads/develop
Commit: 957d583e54dc34c029885f32a54f0b25a3ac1094
Parents: 64de3b6
Author: YehEmily
Authored: Mon Aug 7 15:25:24 2017 -0700
Committer: Kirk Lund
Committed: Fri Aug 11 13:59:14 2017 -0700
--
.../cli/commands/DescribeRegionCommand.java | 62 +---
.../cli/commands/ListRegionCommand.java | 51
.../controllers/RegionCommandsController.java | 7 ++-
.../internal/security/TestCommand.java | 3 -
4 files changed, 43 insertions(+), 80 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/geode/blob/957d583e/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeRegionCommand.java
--
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeRegionCommand.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeRegionCommand.java
index eb74793..65a6153 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeRegionCommand.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeRegionCommand.java
@@ -16,7 +16,6 @@
package org.apache.geode.management.internal.cli.commands;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -234,7 +233,7 @@ public class DescribeRegionCommand implements GfshCommand {
for (String attributeName : attributes) {
String attributeValue = attributesMap.get(attributeName);
-String type, memName;
+String type;
if (!isTypeAdded) {
type = attributeType;
@@ -249,46 +248,39 @@ public class DescribeRegionCommand implements GfshCommand
{
private void writeFixedPartitionAttributesToTable(TabularResultData table,
List fpaList, String member, boolean
isMemberNameAdded) {
+if (fpaList == null) {
+ return;
+}
-if (fpaList != null) {
- boolean isTypeAdded = false;
- final String blank = "";
-
- Iterator fpaIter = fpaList.iterator();
- String type, memName;
-
- while (fpaIter.hasNext()) {
-FixedPartitionAttributesInfo fpa = fpaIter.next();
-StringBuilder fpaBuilder = new StringBuilder();
-fpaBuilder.append(fpa.getPartitionName());
-fpaBuilder.append(',');
+boolean isTypeAdded = false;
+final String blank = "";
+String memName;
-if (fpa.isPrimary()) {
- fpaBuilder.append("Primary");
-} else {
- fpaBuilder.append("Secondary");
-}
-fpaBuilder.append(',');
-fpaBuilder.append(fpa.getNumBuckets());
+for (FixedPartitionAttributesInfo fpa : fpaList) {
+ StringBuilder fpaBuilder = new StringBuilder();
+ fpaBuilder.append(fpa.getPartitionName());
+ fpaBuilder.append(',');
-if (!isTypeAdded) {
- type = "";
- isTypeAdded = true;
-} else {
- type = blank;
-}
+ if (fpa.isPrimary()) {
+fpaBuilder.append("Primary");
+ } else {
+fpaBuilder.append("Secondary");
+ }
+ fpaBuilder.append(',');
+ fpaBuilder.append(fpa.getNumBuckets());
-if (!isMemberNameAdded) {
- memName = member;
- isMemberNameAdded = true;
-} else {
- memName = blank;
-}
+ if (!isTypeAdded) {
+isTypeAdded = true;
+ }
-writeAttributeToTable(table, memName, type, "Fixed Partition",
fpaBuilder.toString());
+ if (!isMemberNameAdded) {
+memName = member;
+isMemberNameAdded = true;
+ } else {
+memName = blank;
}
+ writeAttributeToTable(table, memName, "", "Fixed Partition",
fpaBuilder.toString());
}
-
}
private boolean writeAttributesToTable(TabularResultData table, String
attributeType,
http://git-wip-us.apache.org/repos/asf/geode/blob/957d583e/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListRegionCommand.java
--
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListRegionCommand.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListRegionCommand.java
index 1ca310c..5e379b0 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/Li
