You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jc...@apache.org on 2018/11/22 00:32:53 UTC
[geode] branch jdbc-availability-162020739 updated (a0f0d02 ->
7f16670)
This is an automated email from the ASF dual-hosted git repository.
jchen21 pushed a change to branch jdbc-availability-162020739
in repository https://gitbox.apache.org/repos/asf/geode.git.
discard a0f0d02 Enable command availability for JDBC commands
new 7f16670 Enable command availability for JDBC commands
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (a0f0d02)
\
N -- N -- N refs/heads/jdbc-availability-162020739 (7f16670)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
[geode] 01/01: Enable command availability for JDBC commands
Posted by jc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jchen21 pushed a commit to branch jdbc-availability-162020739
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 7f16670a0fc38eab376b8a28ecb954566d6bc90c
Author: Scott Jewell <sj...@pivotal.io>
AuthorDate: Wed Nov 21 16:28:08 2018 -0800
Enable command availability for JDBC commands
* All commands set to only be available when connected
[#162020739]
Co-authored-by: Scott Jewell <sj...@pivotal.io>
Co-authored-by: Jianxia Chen <jc...@pivotal.io>
---
.../connectors/jdbc/internal/cli/CreateDataSourceCommand.java | 10 ++++++++++
.../connectors/jdbc/internal/cli/CreateMappingCommand.java | 10 ++++++++++
.../jdbc/internal/cli/DescribeDataSourceCommand.java | 10 ++++++++++
.../connectors/jdbc/internal/cli/DescribeMappingCommand.java | 10 ++++++++++
.../connectors/jdbc/internal/cli/DestroyMappingCommand.java | 10 ++++++++++
.../geode/connectors/jdbc/internal/cli/ListMappingCommand.java | 10 ++++++++++
6 files changed, 60 insertions(+)
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateDataSourceCommand.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateDataSourceCommand.java
index c0c94b7..2479b54 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateDataSourceCommand.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateDataSourceCommand.java
@@ -17,6 +17,7 @@ package org.apache.geode.connectors.jdbc.internal.cli;
import java.util.List;
import java.util.Set;
+import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
import org.springframework.shell.core.annotation.CliCommand;
import org.springframework.shell.core.annotation.CliOption;
@@ -148,6 +149,15 @@ public class CreateDataSourceCommand extends SingleGfshCommand {
return true;
}
+ @CliAvailabilityIndicator({CREATE_DATA_SOURCE})
+ public boolean commandAvailable() {
+ boolean isAvailable = true;
+ if (Boolean.getBoolean("gfsh")) {
+ isAvailable = isConnectedAndReady();
+ }
+ return isAvailable;
+ }
+
public static class PoolProperty {
private String name;
private String value;
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java
index 8a726f7..c8d1c5d 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java
@@ -19,6 +19,7 @@ package org.apache.geode.connectors.jdbc.internal.cli;
import java.util.List;
import java.util.Set;
+import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
import org.springframework.shell.core.annotation.CliCommand;
import org.springframework.shell.core.annotation.CliOption;
@@ -202,6 +203,15 @@ public class CreateMappingCommand extends SingleGfshCommand {
return true;
}
+ @CliAvailabilityIndicator({CREATE_MAPPING})
+ public boolean commandAvailable() {
+ boolean isAvailable = true;
+ if (Boolean.getBoolean("gfsh")) {
+ isAvailable = isConnectedAndReady();
+ }
+ return isAvailable;
+ }
+
private void alterRegion(String queueName, RegionAttributesType attributes, boolean synchronous) {
setCacheLoader(attributes);
if (synchronous) {
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeDataSourceCommand.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeDataSourceCommand.java
index 611fe74..feb784f 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeDataSourceCommand.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeDataSourceCommand.java
@@ -18,6 +18,7 @@ package org.apache.geode.connectors.jdbc.internal.cli;
import java.util.List;
import java.util.stream.Collectors;
+import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
import org.springframework.shell.core.annotation.CliCommand;
import org.springframework.shell.core.annotation.CliOption;
@@ -133,4 +134,13 @@ public class DescribeDataSourceCommand extends InternalGfshCommand {
table.accumulate("Property", property);
table.accumulate("Value", value != null ? value : "");
}
+
+ @CliAvailabilityIndicator({DESCRIBE_DATA_SOURCE})
+ public boolean commandAvailable() {
+ boolean isAvailable = true;
+ if (Boolean.getBoolean("gfsh")) {
+ isAvailable = isConnectedAndReady();
+ }
+ return isAvailable;
+ }
}
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommand.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommand.java
index 2a9ac67..8b6fe09 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommand.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommand.java
@@ -21,6 +21,7 @@ import static org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand
import java.util.Set;
+import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
import org.springframework.shell.core.annotation.CliCommand;
import org.springframework.shell.core.annotation.CliOption;
@@ -85,4 +86,13 @@ public class DescribeMappingCommand extends GfshCommand {
sectionModel.addData(CREATE_MAPPING__TABLE_NAME, mapping.getTableName());
sectionModel.addData(CREATE_MAPPING__PDX_NAME, mapping.getPdxName());
}
+
+ @CliAvailabilityIndicator({DESCRIBE_MAPPING})
+ public boolean commandAvailable() {
+ boolean isAvailable = true;
+ if (Boolean.getBoolean("gfsh")) {
+ isAvailable = isConnectedAndReady();
+ }
+ return isAvailable;
+ }
}
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommand.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommand.java
index ccdace0..1a257e5 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommand.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommand.java
@@ -17,6 +17,7 @@ package org.apache.geode.connectors.jdbc.internal.cli;
import java.util.List;
import java.util.Set;
+import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
import org.springframework.shell.core.annotation.CliCommand;
import org.springframework.shell.core.annotation.CliOption;
@@ -77,4 +78,13 @@ public class DestroyMappingCommand extends SingleGfshCommand {
}
return false;
}
+
+ @CliAvailabilityIndicator({DESTROY_MAPPING})
+ public boolean commandAvailable() {
+ boolean isAvailable = true;
+ if (Boolean.getBoolean("gfsh")) {
+ isAvailable = isConnectedAndReady();
+ }
+ return isAvailable;
+ }
}
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommand.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommand.java
index e24712b..a5a6e92 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommand.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommand.java
@@ -18,6 +18,7 @@ package org.apache.geode.connectors.jdbc.internal.cli;
import java.util.Collection;
import java.util.Set;
+import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
import org.springframework.shell.core.annotation.CliCommand;
import org.apache.geode.annotations.Experimental;
@@ -87,4 +88,13 @@ public class ListMappingCommand extends GfshCommand {
}
return !mappings.isEmpty();
}
+
+ @CliAvailabilityIndicator({LIST_MAPPING})
+ public boolean commandAvailable() {
+ boolean isAvailable = true;
+ if (Boolean.getBoolean("gfsh")) {
+ isAvailable = isConnectedAndReady();
+ }
+ return isAvailable;
+ }
}