This is an automated email from the ASF dual-hosted git repository.

agingade pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 4e249f7  GEODE-5057: Removed experimental tag from Jdbc connector code 
base (#1789)
4e249f7 is described below

commit 4e249f7c2f834a056a85b14de8728bce60d73e27
Author: agingade <aging...@pivotal.io>
AuthorDate: Mon Apr 16 10:23:09 2018 -0700

    GEODE-5057: Removed experimental tag from Jdbc connector code base (#1789)
    
    * GEODE-5057: Removed experimental tag from Jdbc connector
---
 geode-connectors/build.gradle                              |  3 ++-
 .../org/apache/geode/connectors/jdbc/JdbcAsyncWriter.java  |  6 +++---
 .../geode/connectors/jdbc/JdbcConnectorException.java      |  8 ++++----
 .../java/org/apache/geode/connectors/jdbc/JdbcLoader.java  |  3 +--
 .../java/org/apache/geode/connectors/jdbc/JdbcWriter.java  |  3 +--
 .../connectors/jdbc/internal/AbstractJdbcCallback.java     |  3 +--
 .../jdbc/internal/ConnectionConfigExistsException.java     |  3 ---
 .../jdbc/internal/ConnectionConfigNotFoundException.java   |  3 ---
 .../connectors/jdbc/internal/JdbcConnectorService.java     |  3 +--
 .../connectors/jdbc/internal/JdbcConnectorServiceImpl.java |  3 +--
 .../jdbc/internal/RegionMappingExistsException.java        |  3 ---
 .../jdbc/internal/RegionMappingNotFoundException.java      |  3 ---
 .../apache/geode/connectors/jdbc/internal/SqlHandler.java  |  3 +--
 .../connectors/jdbc/internal/SqlToPdxInstanceCreator.java  |  3 +--
 .../jdbc/internal/cli/AlterConnectionCommand.java          |  8 ++------
 .../jdbc/internal/cli/AlterConnectionFunction.java         |  4 ++--
 .../connectors/jdbc/internal/cli/AlterMappingCommand.java  |  9 ++-------
 .../connectors/jdbc/internal/cli/AlterMappingFunction.java |  3 +--
 .../jdbc/internal/cli/CreateConnectionCommand.java         | 11 ++---------
 .../jdbc/internal/cli/CreateConnectionFunction.java        |  3 +--
 .../connectors/jdbc/internal/cli/CreateMappingCommand.java |  6 ++----
 .../jdbc/internal/cli/CreateMappingFunction.java           |  2 --
 .../jdbc/internal/cli/DescribeConnectionCommand.java       | 11 +++--------
 .../jdbc/internal/cli/DescribeMappingCommand.java          | 12 +++---------
 .../jdbc/internal/cli/DestroyConnectionCommand.java        |  9 ++-------
 .../jdbc/internal/cli/DestroyConnectionFunction.java       |  3 +--
 .../jdbc/internal/cli/DestroyMappingCommand.java           |  6 ++----
 .../jdbc/internal/cli/DestroyMappingFunction.java          |  3 +--
 .../connectors/jdbc/internal/cli/JdbcCliFunction.java      |  2 --
 .../jdbc/internal/cli/ListConnectionCommand.java           | 11 ++++-------
 .../connectors/jdbc/internal/cli/ListMappingCommand.java   | 10 ++++------
 .../jdbc/internal/configuration/ConnectorService.java      |  2 --
 .../connectors/jdbc/JdbcAsyncWriterIntegrationTest.java    | 11 +++++++++--
 .../geode/connectors/jdbc/JdbcConnectorExceptionTest.java  |  2 +-
 .../geode/connectors/jdbc/internal/SqlHandlerTest.java     |  1 -
 .../jdbc/internal/cli/AlterConnectionCommandDUnitTest.java | 12 +++++++++++-
 .../jdbc/internal/cli/AlterConnectionFunctionTest.java     | 10 +++++++++-
 .../jdbc/internal/cli/AlterMappingFunctionTest.java        | 10 +++++++++-
 .../cli/CreateConnectionCommandIntegrationTest.java        | 14 ++++++++++++--
 .../internal/cli/CreateMappingCommandIntegrationTest.java  | 14 ++++++++++++--
 .../internal/cli/DescribeConnectionCommandDUnitTest.java   |  3 +--
 .../jdbc/internal/cli/DescribeMappingCommandDUnitTest.java |  3 +--
 .../jdbc/internal/cli/ListConnectionCommandTest.java       |  4 ++--
 .../jdbc/internal/cli/ListMappingCommandTest.java          |  4 ++--
 44 files changed, 117 insertions(+), 136 deletions(-)

diff --git a/geode-connectors/build.gradle b/geode-connectors/build.gradle
index f4dbb5e..c5423b9 100644
--- a/geode-connectors/build.gradle
+++ b/geode-connectors/build.gradle
@@ -17,7 +17,8 @@
 
 repositories {
     maven {
-        url 'https://dl.bintray.com/palantir/releases' // docker-compose-rule 
is published on bintray
+        url 'https://dl.bintray.com/palantir/releases'
+        // docker-compose-rule is published on bintray
     }
 }
 
diff --git 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriter.java
 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriter.java
index e36469d..169e65d 100644
--- 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriter.java
+++ 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriter.java
@@ -21,7 +21,6 @@ import java.util.concurrent.atomic.LongAdder;
 import org.apache.logging.log4j.Logger;
 
 import org.apache.geode.CopyHelper;
-import org.apache.geode.annotations.Experimental;
 import org.apache.geode.cache.asyncqueue.AsyncEvent;
 import org.apache.geode.cache.asyncqueue.AsyncEventListener;
 import org.apache.geode.connectors.jdbc.internal.AbstractJdbcCallback;
@@ -31,11 +30,12 @@ import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.pdx.PdxInstance;
 
 /**
- * This class provides write behind cache semantics for a JDBC data source 
using AsyncEventListener.
+ * This class provides write behind cache semantics for a JDBC data source 
using
+ * AsyncEventListener.
  *
  * @since Geode 1.4
  */
-@Experimental
+
 public class JdbcAsyncWriter extends AbstractJdbcCallback implements 
AsyncEventListener {
   private static final Logger logger = LogService.getLogger();
 
diff --git 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcConnectorException.java
 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcConnectorException.java
index 7403415..e5c998d 100644
--- 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcConnectorException.java
+++ 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcConnectorException.java
@@ -21,10 +21,10 @@ import org.apache.commons.lang.exception.ExceptionUtils;
 import org.apache.geode.cache.CacheRuntimeException;
 
 /**
- * An exception thrown when communication with an external JDBC data source 
fails and can be used
- * to diagnose the cause of database communication failures. In cases where 
the cause of this
- * exception is not safe to serialize to clients, the stack trace is included 
in the message of the
- * exception and the cause is left empty.
+ * An exception thrown when communication with an external JDBC data source 
fails and can be used to
+ * diagnose the cause of database communication failures. In cases where the 
cause of this exception
+ * is not safe to serialize to clients, the stack trace is included in the 
message of the exception
+ * and the cause is left empty.
  *
  * @since Geode 1.5
  */
diff --git 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcLoader.java
 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcLoader.java
index d76baf9..53ebea4 100644
--- 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcLoader.java
+++ 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcLoader.java
@@ -16,7 +16,6 @@ package org.apache.geode.connectors.jdbc;
 
 import java.sql.SQLException;
 
-import org.apache.geode.annotations.Experimental;
 import org.apache.geode.cache.CacheLoader;
 import org.apache.geode.cache.CacheLoaderException;
 import org.apache.geode.cache.LoaderHelper;
@@ -29,7 +28,7 @@ import org.apache.geode.internal.cache.InternalCache;
  *
  * @since Geode 1.4
  */
-@Experimental
+
 public class JdbcLoader<K, V> extends AbstractJdbcCallback implements 
CacheLoader<K, V> {
 
   @SuppressWarnings("unused")
diff --git 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcWriter.java
 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcWriter.java
index 998cb8a..3a3eb11 100644
--- 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcWriter.java
+++ 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcWriter.java
@@ -18,7 +18,6 @@ import java.sql.SQLException;
 import java.util.concurrent.atomic.LongAdder;
 
 import org.apache.geode.CopyHelper;
-import org.apache.geode.annotations.Experimental;
 import org.apache.geode.cache.CacheWriter;
 import org.apache.geode.cache.CacheWriterException;
 import org.apache.geode.cache.EntryEvent;
@@ -34,7 +33,7 @@ import org.apache.geode.pdx.PdxInstance;
  *
  * @since Geode 1.4
  */
-@Experimental
+
 public class JdbcWriter<K, V> extends AbstractJdbcCallback implements 
CacheWriter<K, V> {
 
   private final LongAdder totalEvents = new LongAdder();
diff --git 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/AbstractJdbcCallback.java
 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/AbstractJdbcCallback.java
index dc6b265..926bf4c 100644
--- 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/AbstractJdbcCallback.java
+++ 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/AbstractJdbcCallback.java
@@ -14,12 +14,11 @@
  */
 package org.apache.geode.connectors.jdbc.internal;
 
-import org.apache.geode.annotations.Experimental;
 import org.apache.geode.cache.CacheCallback;
 import org.apache.geode.cache.Operation;
 import org.apache.geode.internal.cache.InternalCache;
 
-@Experimental
+
 public abstract class AbstractJdbcCallback implements CacheCallback {
 
   private volatile SqlHandler sqlHandler;
diff --git 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/ConnectionConfigExistsException.java
 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/ConnectionConfigExistsException.java
index de7b895..9094b10 100644
--- 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/ConnectionConfigExistsException.java
+++ 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/ConnectionConfigExistsException.java
@@ -14,9 +14,6 @@
  */
 package org.apache.geode.connectors.jdbc.internal;
 
-import org.apache.geode.annotations.Experimental;
-
-@Experimental
 public class ConnectionConfigExistsException extends Exception {
 
   public ConnectionConfigExistsException() {
diff --git 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/ConnectionConfigNotFoundException.java
 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/ConnectionConfigNotFoundException.java
index 10830ea..0c74d3b 100644
--- 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/ConnectionConfigNotFoundException.java
+++ 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/ConnectionConfigNotFoundException.java
@@ -14,9 +14,6 @@
  */
 package org.apache.geode.connectors.jdbc.internal;
 
-import org.apache.geode.annotations.Experimental;
-
-@Experimental
 public class ConnectionConfigNotFoundException extends Exception {
 
   public ConnectionConfigNotFoundException() {
diff --git 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorService.java
 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorService.java
index 2b8aacd..ca1d7c8 100644
--- 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorService.java
+++ 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorService.java
@@ -16,11 +16,10 @@ package org.apache.geode.connectors.jdbc.internal;
 
 import java.util.Set;
 
-import org.apache.geode.annotations.Experimental;
 import 
org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
 import org.apache.geode.internal.cache.CacheService;
 
-@Experimental
+
 public interface JdbcConnectorService extends CacheService {
 
   void createConnectionConfig(ConnectorService.Connection config)
diff --git 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceImpl.java
 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceImpl.java
index 72da9dc..c850f95 100644
--- 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceImpl.java
+++ 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceImpl.java
@@ -19,14 +19,13 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.geode.annotations.Experimental;
 import org.apache.geode.cache.Cache;
 import 
org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
 import org.apache.geode.internal.cache.CacheService;
 import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.management.internal.beans.CacheServiceMBeanBase;
 
-@Experimental
+
 public class JdbcConnectorServiceImpl implements JdbcConnectorService {
 
   private final Map<String, ConnectorService.Connection> connectionsByName =
diff --git 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/RegionMappingExistsException.java
 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/RegionMappingExistsException.java
index 2b55721..0696061 100644
--- 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/RegionMappingExistsException.java
+++ 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/RegionMappingExistsException.java
@@ -14,9 +14,6 @@
  */
 package org.apache.geode.connectors.jdbc.internal;
 
-import org.apache.geode.annotations.Experimental;
-
-@Experimental
 public class RegionMappingExistsException extends Exception {
 
   public RegionMappingExistsException() {
diff --git 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/RegionMappingNotFoundException.java
 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/RegionMappingNotFoundException.java
index 7b0375e..cd88c71 100644
--- 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/RegionMappingNotFoundException.java
+++ 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/RegionMappingNotFoundException.java
@@ -14,9 +14,6 @@
  */
 package org.apache.geode.connectors.jdbc.internal;
 
-import org.apache.geode.annotations.Experimental;
-
-@Experimental
 public class RegionMappingNotFoundException extends Exception {
 
   public RegionMappingNotFoundException() {
diff --git 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/SqlHandler.java
 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/SqlHandler.java
index dbdf074..b96b1a7 100644
--- 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/SqlHandler.java
+++ 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/SqlHandler.java
@@ -24,7 +24,6 @@ import java.util.Date;
 import java.util.List;
 
 import org.apache.geode.InternalGemFireException;
-import org.apache.geode.annotations.Experimental;
 import org.apache.geode.cache.Operation;
 import org.apache.geode.cache.Region;
 import org.apache.geode.connectors.jdbc.JdbcConnectorException;
@@ -32,7 +31,7 @@ import 
org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
 import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.pdx.PdxInstance;
 
-@Experimental
+
 public class SqlHandler {
   private final JdbcConnectorService configService;
   private final DataSourceManager manager;
diff --git 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstanceCreator.java
 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstanceCreator.java
index 915db55..a619637 100644
--- 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstanceCreator.java
+++ 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstanceCreator.java
@@ -217,8 +217,7 @@ class SqlToPdxInstanceCreator {
   }
 
   /**
-   * If the given column contains a Blob returns its data as a byte array;
-   * otherwise return null.
+   * If the given column contains a Blob returns its data as a byte array; 
otherwise return null.
    *
    * @throws JdbcConnectorException if blob is too big to fit in a byte array
    */
diff --git 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommand.java
 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommand.java
index a8bc313..0781b24 100644
--- 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommand.java
+++ 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommand.java
@@ -20,7 +20,6 @@ import java.util.Set;
 import org.springframework.shell.core.annotation.CliCommand;
 import org.springframework.shell.core.annotation.CliOption;
 
-import org.apache.geode.annotations.Experimental;
 import 
org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
 import org.apache.geode.distributed.ClusterConfigurationService;
 import org.apache.geode.distributed.DistributedMember;
@@ -35,11 +34,10 @@ import 
org.apache.geode.management.internal.cli.result.ResultBuilder;
 import org.apache.geode.management.internal.security.ResourceOperation;
 import org.apache.geode.security.ResourcePermission;
 
-@Experimental
 public class AlterConnectionCommand extends GfshCommand {
   static final String ALTER_JDBC_CONNECTION = "alter jdbc-connection";
   static final String ALTER_JDBC_CONNECTION__HELP =
-      EXPERIMENTAL + "Alter properties for an existing jdbc connection.";
+      "Alter properties for an existing jdbc connection.";
 
   static final String ALTER_CONNECTION__NAME = "name";
   static final String ALTER_CONNECTION__NAME__HELP = "Name of the connection 
to be altered.";
@@ -55,8 +53,6 @@ public class AlterConnectionCommand extends GfshCommand {
   static final String ALTER_CONNECTION__PARAMS__HELP =
       "New additional parameters to use when connecting to the database. This 
replaces all previously existing parameters.";
 
-  private static final String ERROR_PREFIX = "ERROR: ";
-
   @CliCommand(value = ALTER_JDBC_CONNECTION, help = 
ALTER_JDBC_CONNECTION__HELP)
   @CliMetaData(relatedTopic = CliStrings.DEFAULT_TOPIC_GEODE)
   @ResourceOperation(resource = ResourcePermission.Resource.CLUSTER,
@@ -115,7 +111,7 @@ public class AlterConnectionCommand extends GfshCommand {
       persisted = true;
     }
 
-    CommandResult commandResult = ResultBuilder.buildResult(results, 
EXPERIMENTAL, null);
+    CommandResult commandResult = ResultBuilder.buildResult(results);
     commandResult.setCommandPersisted(persisted);
     return commandResult;
   }
diff --git 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionFunction.java
 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionFunction.java
index d5e2fac..1a92c4e 100644
--- 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionFunction.java
+++ 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionFunction.java
@@ -14,14 +14,14 @@
  */
 package org.apache.geode.connectors.jdbc.internal.cli;
 
-import org.apache.geode.annotations.Experimental;
+
 import org.apache.geode.cache.execute.FunctionContext;
 import 
org.apache.geode.connectors.jdbc.internal.ConnectionConfigNotFoundException;
 import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
 import 
org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
 import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
 
-@Experimental
+
 public class AlterConnectionFunction
     extends JdbcCliFunction<ConnectorService.Connection, CliFunctionResult> {
 
diff --git 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommand.java
 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommand.java
index a7bf949..c51a265 100644
--- 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommand.java
+++ 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommand.java
@@ -20,7 +20,6 @@ import java.util.Set;
 import org.springframework.shell.core.annotation.CliCommand;
 import org.springframework.shell.core.annotation.CliOption;
 
-import org.apache.geode.annotations.Experimental;
 import 
org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
 import org.apache.geode.distributed.ClusterConfigurationService;
 import org.apache.geode.distributed.DistributedMember;
@@ -35,11 +34,9 @@ import 
org.apache.geode.management.internal.cli.result.ResultBuilder;
 import org.apache.geode.management.internal.security.ResourceOperation;
 import org.apache.geode.security.ResourcePermission;
 
-@Experimental
 public class AlterMappingCommand extends InternalGfshCommand {
   static final String ALTER_MAPPING = "alter jdbc-mapping";
-  static final String ALTER_MAPPING__HELP =
-      EXPERIMENTAL + "Alter properties for an existing jdbc mapping.";
+  static final String ALTER_MAPPING__HELP = "Alter properties for an existing 
jdbc mapping.";
 
   static final String ALTER_MAPPING__REGION_NAME = "region";
   static final String ALTER_MAPPING__REGION_NAME__HELP =
@@ -59,8 +56,6 @@ public class AlterMappingCommand extends InternalGfshCommand {
   static final String ALTER_MAPPING__FIELD_MAPPING__HELP =
       "New key value pairs of entry value fields to database columns.";
 
-  private static final String ERROR_PREFIX = "ERROR: ";
-
   @CliCommand(value = ALTER_MAPPING, help = ALTER_MAPPING__HELP)
   @CliMetaData(relatedTopic = CliStrings.DEFAULT_TOPIC_GEODE)
   @ResourceOperation(resource = ResourcePermission.Resource.CLUSTER,
@@ -123,7 +118,7 @@ public class AlterMappingCommand extends 
InternalGfshCommand {
       persisted = true;
     }
 
-    CommandResult commandResult = ResultBuilder.buildResult(results, 
EXPERIMENTAL, null);
+    CommandResult commandResult = ResultBuilder.buildResult(results);
     commandResult.setCommandPersisted(persisted);
     return commandResult;
   }
diff --git 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunction.java
 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunction.java
index 6e84ba3..0798760 100644
--- 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunction.java
+++ 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunction.java
@@ -16,14 +16,13 @@ package org.apache.geode.connectors.jdbc.internal.cli;
 
 import java.util.List;
 
-import org.apache.geode.annotations.Experimental;
 import org.apache.geode.cache.execute.FunctionContext;
 import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
 import 
org.apache.geode.connectors.jdbc.internal.RegionMappingNotFoundException;
 import 
org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
 import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
 
-@Experimental
+
 public class AlterMappingFunction
     extends JdbcCliFunction<ConnectorService.RegionMapping, CliFunctionResult> 
{
 
diff --git 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommand.java
 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommand.java
index ffe557c..e0e7da1 100644
--- 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommand.java
+++ 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommand.java
@@ -18,15 +18,12 @@ import java.util.List;
 import java.util.Set;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.logging.log4j.Logger;
 import org.springframework.shell.core.annotation.CliCommand;
 import org.springframework.shell.core.annotation.CliOption;
 
-import org.apache.geode.annotations.Experimental;
 import 
org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
 import org.apache.geode.distributed.ClusterConfigurationService;
 import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.management.cli.CliMetaData;
 import org.apache.geode.management.cli.Result;
 import org.apache.geode.management.internal.cli.AbstractCliAroundInterceptor;
@@ -39,13 +36,11 @@ import 
org.apache.geode.management.internal.cli.result.ResultBuilder;
 import org.apache.geode.management.internal.security.ResourceOperation;
 import org.apache.geode.security.ResourcePermission;
 
-@Experimental
 public class CreateConnectionCommand extends InternalGfshCommand {
-  private static final Logger logger = LogService.getLogger();
 
   static final String CREATE_CONNECTION = "create jdbc-connection";
   static final String CREATE_CONNECTION__HELP =
-      EXPERIMENTAL + "Create a connection for communicating with a database 
through jdbc.";
+      "Create a connection for communicating with a database through jdbc.";
   static final String CREATE_CONNECTION__NAME = "name";
   static final String CREATE_CONNECTION__NAME__HELP = "Name of the connection 
to be created.";
   static final String CREATE_CONNECTION__URL = "url";
@@ -60,8 +55,6 @@ public class CreateConnectionCommand extends 
InternalGfshCommand {
   static final String CREATE_CONNECTION__PARAMS__HELP =
       "Additional parameters to use when connecting to the database formatted 
like \"key:value(,key:value)*\".";
 
-  private static final String ERROR_PREFIX = "ERROR: ";
-
   @CliCommand(value = CREATE_CONNECTION, help = CREATE_CONNECTION__HELP)
   @CliMetaData(relatedTopic = CliStrings.DEFAULT_TOPIC_GEODE,
       interceptor = 
"org.apache.geode.connectors.jdbc.internal.cli.CreateConnectionCommand$Interceptor")
@@ -101,7 +94,7 @@ public class CreateConnectionCommand extends 
InternalGfshCommand {
       persisted = true;
     }
 
-    CommandResult commandResult = ResultBuilder.buildResult(results, 
EXPERIMENTAL, null);
+    CommandResult commandResult = ResultBuilder.buildResult(results);
     commandResult.setCommandPersisted(persisted);
     return commandResult;
   }
diff --git 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionFunction.java
 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionFunction.java
index 010c24a..3b7a495 100644
--- 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionFunction.java
+++ 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionFunction.java
@@ -14,7 +14,6 @@
  */
 package org.apache.geode.connectors.jdbc.internal.cli;
 
-import org.apache.geode.annotations.Experimental;
 import org.apache.geode.cache.execute.FunctionContext;
 import 
org.apache.geode.connectors.jdbc.internal.ConnectionConfigExistsException;
 import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
@@ -22,7 +21,7 @@ import 
org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
 import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
 import org.apache.geode.management.internal.configuration.domain.XmlEntity;
 
-@Experimental
+
 public class CreateConnectionFunction
     extends JdbcCliFunction<ConnectorService.Connection, CliFunctionResult> {
 
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 04123e3..ddf1985 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
@@ -20,7 +20,6 @@ import java.util.Set;
 import org.springframework.shell.core.annotation.CliCommand;
 import org.springframework.shell.core.annotation.CliOption;
 
-import org.apache.geode.annotations.Experimental;
 import 
org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
 import org.apache.geode.distributed.ClusterConfigurationService;
 import org.apache.geode.distributed.DistributedMember;
@@ -34,11 +33,10 @@ import 
org.apache.geode.management.internal.cli.result.ResultBuilder;
 import org.apache.geode.management.internal.security.ResourceOperation;
 import org.apache.geode.security.ResourcePermission;
 
-@Experimental
 public class CreateMappingCommand extends InternalGfshCommand {
   static final String CREATE_MAPPING = "create jdbc-mapping";
   static final String CREATE_MAPPING__HELP =
-      EXPERIMENTAL + "Create a mapping for a region for use with a JDBC 
database connection.";
+      "Create a mapping for a region for use with a JDBC database connection.";
   static final String CREATE_MAPPING__REGION_NAME = "region";
   static final String CREATE_MAPPING__REGION_NAME__HELP =
       "Name of the region the mapping is being created for.";
@@ -102,7 +100,7 @@ public class CreateMappingCommand extends 
InternalGfshCommand {
       persisted = true;
     }
 
-    CommandResult commandResult = ResultBuilder.buildResult(results, 
EXPERIMENTAL, null);
+    CommandResult commandResult = ResultBuilder.buildResult(results);
     commandResult.setCommandPersisted(persisted);
     return commandResult;
   }
diff --git 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunction.java
 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunction.java
index 44f72ab..3b955b7 100644
--- 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunction.java
+++ 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunction.java
@@ -14,14 +14,12 @@
  */
 package org.apache.geode.connectors.jdbc.internal.cli;
 
-import org.apache.geode.annotations.Experimental;
 import org.apache.geode.cache.execute.FunctionContext;
 import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
 import org.apache.geode.connectors.jdbc.internal.RegionMappingExistsException;
 import 
org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
 import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
 
-@Experimental
 public class CreateMappingFunction
     extends JdbcCliFunction<ConnectorService.RegionMapping, CliFunctionResult> 
{
 
diff --git 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommand.java
 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommand.java
index 00be3c7..2c5190e 100644
--- 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommand.java
+++ 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommand.java
@@ -23,7 +23,6 @@ import static 
org.apache.geode.connectors.jdbc.internal.cli.CreateConnectionComm
 import org.springframework.shell.core.annotation.CliCommand;
 import org.springframework.shell.core.annotation.CliOption;
 
-import org.apache.geode.annotations.Experimental;
 import 
org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
 import org.apache.geode.distributed.ClusterConfigurationService;
 import org.apache.geode.management.cli.CliMetaData;
@@ -37,11 +36,10 @@ import 
org.apache.geode.management.internal.cli.result.TabularResultData;
 import org.apache.geode.management.internal.security.ResourceOperation;
 import org.apache.geode.security.ResourcePermission;
 
-@Experimental
 public class DescribeConnectionCommand extends InternalGfshCommand {
   static final String DESCRIBE_CONNECTION = "describe jdbc-connection";
   static final String DESCRIBE_CONNECTION__HELP =
-      EXPERIMENTAL + "Describe the specified jdbc connection found in cluster 
configuration.";
+      "Describe the specified jdbc connection found in cluster configuration.";
   static final String DESCRIBE_CONNECTION__NAME = "name";
   static final String DESCRIBE_CONNECTION__NAME__HELP =
       "Name of the jdbc connection to be described.";
@@ -64,19 +62,16 @@ public class DescribeConnectionCommand extends 
InternalGfshCommand {
     ConnectorService service =
         ccService.getCustomCacheElement("cluster", "connector-service", 
ConnectorService.class);
     if (service == null) {
-      throw new EntityNotFoundException(
-          EXPERIMENTAL + "\n" + "connection named '" + name + "' not found");
+      throw new EntityNotFoundException("connection named '" + name + "' not 
found");
     }
     ConnectorService.Connection connection =
         ccService.findIdentifiable(service.getConnection(), name);
     if (connection == null) {
-      throw new EntityNotFoundException(
-          EXPERIMENTAL + "\n" + "connection named '" + name + "' not found");
+      throw new EntityNotFoundException("connection named '" + name + "' not 
found");
     }
 
     CompositeResultData resultData = ResultBuilder.createCompositeResultData();
     fillResultData(connection, resultData);
-    resultData.setHeader(EXPERIMENTAL);
     return ResultBuilder.buildResult(resultData);
   }
 
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 b6a119d..224a832 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
@@ -23,7 +23,6 @@ import static 
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand
 import org.springframework.shell.core.annotation.CliCommand;
 import org.springframework.shell.core.annotation.CliOption;
 
-import org.apache.geode.annotations.Experimental;
 import 
org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
 import org.apache.geode.distributed.ClusterConfigurationService;
 import org.apache.geode.management.cli.CliMetaData;
@@ -37,11 +36,9 @@ import 
org.apache.geode.management.internal.cli.result.TabularResultData;
 import org.apache.geode.management.internal.security.ResourceOperation;
 import org.apache.geode.security.ResourcePermission;
 
-@Experimental
 public class DescribeMappingCommand extends InternalGfshCommand {
   static final String DESCRIBE_MAPPING = "describe jdbc-mapping";
-  static final String DESCRIBE_MAPPING__HELP =
-      EXPERIMENTAL + "Describe the jdbc mapping in cluster configuration";
+  static final String DESCRIBE_MAPPING__HELP = "Describe the jdbc mapping in 
cluster configuration";
   static final String DESCRIBE_MAPPING__REGION_NAME = "region";
   static final String DESCRIBE_MAPPING__REGION_NAME__HELP =
       "Region name of the jdbc mapping to be described.";
@@ -64,19 +61,16 @@ public class DescribeMappingCommand extends 
InternalGfshCommand {
     ConnectorService service =
         ccService.getCustomCacheElement("cluster", "connector-service", 
ConnectorService.class);
     if (service == null) {
-      throw new EntityNotFoundException(
-          EXPERIMENTAL + "\n" + "mapping for region '" + regionName + "' not 
found");
+      throw new EntityNotFoundException("mapping for region '" + regionName + 
"' not found");
     }
     ConnectorService.RegionMapping mapping =
         ccService.findIdentifiable(service.getRegionMapping(), regionName);
     if (mapping == null) {
-      throw new EntityNotFoundException(
-          EXPERIMENTAL + "\n" + "mapping for region '" + regionName + "' not 
found");
+      throw new EntityNotFoundException("mapping for region '" + regionName + 
"' not found");
     }
 
     CompositeResultData resultData = ResultBuilder.createCompositeResultData();
     fillResultData(mapping, resultData);
-    resultData.setHeader(EXPERIMENTAL);
     return ResultBuilder.buildResult(resultData);
   }
 
diff --git 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommand.java
 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommand.java
index 88c13f9..8474b75 100644
--- 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommand.java
+++ 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommand.java
@@ -20,7 +20,6 @@ import java.util.Set;
 import org.springframework.shell.core.annotation.CliCommand;
 import org.springframework.shell.core.annotation.CliOption;
 
-import org.apache.geode.annotations.Experimental;
 import 
org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
 import org.apache.geode.distributed.ClusterConfigurationService;
 import org.apache.geode.distributed.DistributedMember;
@@ -34,17 +33,13 @@ import 
org.apache.geode.management.internal.cli.result.ResultBuilder;
 import org.apache.geode.management.internal.security.ResourceOperation;
 import org.apache.geode.security.ResourcePermission;
 
-@Experimental
 public class DestroyConnectionCommand extends InternalGfshCommand {
   static final String DESTROY_CONNECTION = "destroy jdbc-connection";
-  static final String DESTROY_CONNECTION__HELP =
-      EXPERIMENTAL + "Destroy/Remove the specified jdbc connection.";
+  static final String DESTROY_CONNECTION__HELP = "Destroy/Remove the specified 
jdbc connection.";
   static final String DESTROY_CONNECTION__NAME = "name";
   static final String DESTROY_CONNECTION__NAME__HELP =
       "Name of the jdbc connection to be destroyed.";
 
-  private static final String ERROR_PREFIX = "ERROR: ";
-
   @CliCommand(value = DESTROY_CONNECTION, help = DESTROY_CONNECTION__HELP)
   @CliMetaData(relatedTopic = CliStrings.DEFAULT_TOPIC_GEODE)
   @ResourceOperation(resource = ResourcePermission.Resource.CLUSTER,
@@ -74,7 +69,7 @@ public class DestroyConnectionCommand extends 
InternalGfshCommand {
       }
     }
 
-    CommandResult commandResult = ResultBuilder.buildResult(results, 
EXPERIMENTAL, null);
+    CommandResult commandResult = ResultBuilder.buildResult(results);
     commandResult.setCommandPersisted(persisted);
 
     return commandResult;
diff --git 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionFunction.java
 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionFunction.java
index 3383fa3..003938d 100644
--- 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionFunction.java
+++ 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionFunction.java
@@ -14,14 +14,13 @@
  */
 package org.apache.geode.connectors.jdbc.internal.cli;
 
-import org.apache.geode.annotations.Experimental;
 import org.apache.geode.cache.execute.FunctionContext;
 import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
 import 
org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
 import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
 import org.apache.geode.management.internal.configuration.domain.XmlEntity;
 
-@Experimental
+
 public class DestroyConnectionFunction extends JdbcCliFunction<String, 
CliFunctionResult> {
 
   DestroyConnectionFunction() {
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 0cc4e12..b0e90fd 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
@@ -20,7 +20,6 @@ import java.util.Set;
 import org.springframework.shell.core.annotation.CliCommand;
 import org.springframework.shell.core.annotation.CliOption;
 
-import org.apache.geode.annotations.Experimental;
 import 
org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
 import org.apache.geode.distributed.ClusterConfigurationService;
 import org.apache.geode.distributed.DistributedMember;
@@ -34,10 +33,9 @@ import 
org.apache.geode.management.internal.cli.result.ResultBuilder;
 import org.apache.geode.management.internal.security.ResourceOperation;
 import org.apache.geode.security.ResourcePermission;
 
-@Experimental
 public class DestroyMappingCommand extends InternalGfshCommand {
   static final String DESTROY_MAPPING = "destroy jdbc-mapping";
-  static final String DESTROY_MAPPING__HELP = EXPERIMENTAL + "Destroy the 
specified mapping.";
+  static final String DESTROY_MAPPING__HELP = "Destroy the specified mapping.";
   static final String DESTROY_MAPPING__REGION_NAME = "region";
   static final String DESTROY_MAPPING__REGION_NAME__HELP = "Name of the region 
mapping to destroy.";
 
@@ -71,7 +69,7 @@ public class DestroyMappingCommand extends 
InternalGfshCommand {
       }
     }
 
-    CommandResult commandResult = ResultBuilder.buildResult(results, 
EXPERIMENTAL, null);
+    CommandResult commandResult = ResultBuilder.buildResult(results);
     commandResult.setCommandPersisted(persisted);
 
     return commandResult;
diff --git 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingFunction.java
 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingFunction.java
index c6bd0bb..3dab02c 100644
--- 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingFunction.java
+++ 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingFunction.java
@@ -14,14 +14,13 @@
  */
 package org.apache.geode.connectors.jdbc.internal.cli;
 
-import org.apache.geode.annotations.Experimental;
 import org.apache.geode.cache.execute.FunctionContext;
 import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
 import 
org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
 import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
 import org.apache.geode.management.internal.configuration.domain.XmlEntity;
 
-@Experimental
+
 public class DestroyMappingFunction extends JdbcCliFunction<String, 
CliFunctionResult> {
 
   DestroyMappingFunction() {
diff --git 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/JdbcCliFunction.java
 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/JdbcCliFunction.java
index bbfe877..2114037 100644
--- 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/JdbcCliFunction.java
+++ 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/JdbcCliFunction.java
@@ -16,14 +16,12 @@ package org.apache.geode.connectors.jdbc.internal.cli;
 
 import org.apache.logging.log4j.Logger;
 
-import org.apache.geode.annotations.Experimental;
 import org.apache.geode.cache.execute.FunctionContext;
 import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
 import org.apache.geode.internal.cache.execute.InternalFunction;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.management.internal.configuration.domain.XmlEntity;
 
-@Experimental
 public abstract class JdbcCliFunction<T1, T2> implements InternalFunction<T1> {
 
   private final transient ExceptionHandler exceptionHandler;
diff --git 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommand.java
 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommand.java
index 753d485..39e32d8 100644
--- 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommand.java
+++ 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommand.java
@@ -18,7 +18,6 @@ import java.util.List;
 
 import org.springframework.shell.core.annotation.CliCommand;
 
-import org.apache.geode.annotations.Experimental;
 import 
org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
 import org.apache.geode.distributed.ClusterConfigurationService;
 import org.apache.geode.management.cli.CliMetaData;
@@ -30,11 +29,10 @@ import 
org.apache.geode.management.internal.cli.result.TabularResultData;
 import org.apache.geode.management.internal.security.ResourceOperation;
 import org.apache.geode.security.ResourcePermission;
 
-@Experimental
+
 public class ListConnectionCommand extends InternalGfshCommand {
   static final String LIST_JDBC_CONNECTION = "list jdbc-connections";
-  static final String LIST_JDBC_CONNECTION__HELP =
-      EXPERIMENTAL + "Display jdbc connections for all members.";
+  static final String LIST_JDBC_CONNECTION__HELP = "Display jdbc connections 
for all members.";
 
   static final String LIST_OF_CONNECTIONS = "List of connections";
   static final String NO_CONNECTIONS_FOUND = "No connections found";
@@ -53,7 +51,7 @@ public class ListConnectionCommand extends 
InternalGfshCommand {
     ConnectorService service =
         ccService.getCustomCacheElement("cluster", "connector-service", 
ConnectorService.class);
     if (service == null) {
-      return ResultBuilder.createInfoResult(EXPERIMENTAL + "\n" + 
NO_CONNECTIONS_FOUND);
+      return ResultBuilder.createInfoResult(NO_CONNECTIONS_FOUND);
     }
 
     // output
@@ -64,10 +62,9 @@ public class ListConnectionCommand extends 
InternalGfshCommand {
 
   private Result createResult(TabularResultData tabularResultData, boolean 
connectionsExist) {
     if (connectionsExist) {
-      tabularResultData.setHeader(EXPERIMENTAL);
       return ResultBuilder.buildResult(tabularResultData);
     } else {
-      return ResultBuilder.createInfoResult(EXPERIMENTAL + "\n" + 
NO_CONNECTIONS_FOUND);
+      return ResultBuilder.createInfoResult(NO_CONNECTIONS_FOUND);
     }
   }
 
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 217b676..0c01c9b 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,7 +18,6 @@ import java.util.List;
 
 import org.springframework.shell.core.annotation.CliCommand;
 
-import org.apache.geode.annotations.Experimental;
 import 
org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
 import org.apache.geode.distributed.ClusterConfigurationService;
 import org.apache.geode.management.cli.CliMetaData;
@@ -30,10 +29,10 @@ import 
org.apache.geode.management.internal.cli.result.TabularResultData;
 import org.apache.geode.management.internal.security.ResourceOperation;
 import org.apache.geode.security.ResourcePermission;
 
-@Experimental
+
 public class ListMappingCommand extends InternalGfshCommand {
   static final String LIST_MAPPING = "list jdbc-mappings";
-  static final String LIST_MAPPING__HELP = EXPERIMENTAL + "Display jdbc 
mappings for all members.";
+  static final String LIST_MAPPING__HELP = "Display jdbc mappings for all 
members.";
 
   static final String LIST_OF_MAPPINGS = "List of mappings";
   static final String NO_MAPPINGS_FOUND = "No mappings found";
@@ -52,7 +51,7 @@ public class ListMappingCommand extends InternalGfshCommand {
     ConnectorService service =
         ccService.getCustomCacheElement("cluster", "connector-service", 
ConnectorService.class);
     if (service == null) {
-      return ResultBuilder.createInfoResult(EXPERIMENTAL + "\n" + 
NO_MAPPINGS_FOUND);
+      return ResultBuilder.createInfoResult(NO_MAPPINGS_FOUND);
     }
 
     // output
@@ -63,10 +62,9 @@ public class ListMappingCommand extends InternalGfshCommand {
 
   private Result createResult(TabularResultData tabularResultData, boolean 
mappingsExist) {
     if (mappingsExist) {
-      tabularResultData.setHeader(EXPERIMENTAL);
       return ResultBuilder.buildResult(tabularResultData);
     } else {
-      return ResultBuilder.createInfoResult(EXPERIMENTAL + "\n" + 
NO_MAPPINGS_FOUND);
+      return ResultBuilder.createInfoResult(NO_MAPPINGS_FOUND);
     }
   }
 
diff --git 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/configuration/ConnectorService.java
 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/configuration/ConnectorService.java
index 423b4d3..72b06a8 100644
--- 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/configuration/ConnectorService.java
+++ 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/configuration/ConnectorService.java
@@ -36,7 +36,6 @@ import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 
-import org.apache.geode.annotations.Experimental;
 import org.apache.geode.cache.configuration.CacheElement;
 import org.apache.geode.connectors.jdbc.JdbcConnectorException;
 import org.apache.geode.connectors.jdbc.internal.TableMetaDataView;
@@ -103,7 +102,6 @@ import org.apache.geode.pdx.internal.TypeRegistry;
  *
  *
  */
-@Experimental
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {"connection", "regionMapping"})
 @XmlRootElement(name = "connector-service", namespace = 
"http://geode.apache.org/schema/jdbc";)
diff --git 
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java
 
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java
index 819551b..646a928 100644
--- 
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java
+++ 
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java
@@ -40,6 +40,7 @@ import 
org.apache.geode.connectors.jdbc.internal.TestConfigService;
 import org.apache.geode.connectors.jdbc.internal.TestableConnectionManager;
 import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.pdx.PdxInstance;
+import org.apache.geode.test.dunit.IgnoredException;
 import org.apache.geode.test.junit.categories.AcceptanceTest;
 
 @Category(AcceptanceTest.class)
@@ -122,10 +123,16 @@ public abstract class JdbcAsyncWriterIntegrationTest {
   @Test
   public void putNonPdxInstanceFails() {
     Region nonPdxEmployees = this.employees;
-    nonPdxEmployees.put("1", "non pdx instance");
 
-    awaitUntil(() -> assertThat(jdbcWriter.getTotalEvents()).isEqualTo(1));
+    IgnoredException ignoredException =
+        
IgnoredException.addIgnoredException(ClassCastException.class.getName());
+    try {
+      nonPdxEmployees.put("1", "non pdx instance");
+    } finally {
+      ignoredException.remove();
+    }
 
+    awaitUntil(() -> assertThat(jdbcWriter.getTotalEvents()).isEqualTo(1));
     awaitUntil(() -> assertThat(jdbcWriter.getFailedEvents()).isEqualTo(1));
   }
 
diff --git 
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcConnectorExceptionTest.java
 
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcConnectorExceptionTest.java
index f48151b..e93174a 100644
--- 
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcConnectorExceptionTest.java
+++ 
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcConnectorExceptionTest.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.connectors.jdbc;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.sql.SQLException;
 
diff --git 
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlHandlerTest.java
 
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlHandlerTest.java
index 23dcc75..607a615 100644
--- 
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlHandlerTest.java
+++ 
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlHandlerTest.java
@@ -113,7 +113,6 @@ public class SqlHandlerTest {
     when(regionMapping.getRegionToTableName()).thenReturn(TABLE_NAME);
     
when(connectorService.getMappingForRegion(REGION_NAME)).thenReturn(regionMapping);
 
-
     when(manager.getOrCreateDataSource(any())).thenReturn(this.dataSource);
     when(dataSource.getConnection()).thenReturn(this.connection);
 
diff --git 
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandDUnitTest.java
 
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandDUnitTest.java
index fa43fba..b9668ec 100644
--- 
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandDUnitTest.java
+++ 
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandDUnitTest.java
@@ -131,6 +131,16 @@ public class AlterConnectionCommandDUnitTest {
       assertThat(config.getConnectionProperties()).hasSize(0);
     });
 
-    startupRule.startServerVM(2, locator.getPort());
+    MemberVM server2 = startupRule.startServerVM(2, locator.getPort());
+
+    server2.invoke(() -> {
+      InternalCache cache = ClusterStartupRule.getCache();
+      ConnectorService.Connection config =
+          
cache.getService(JdbcConnectorService.class).getConnectionConfig("name");
+      assertThat(config.getUrl()).isNull();
+      assertThat(config.getUser()).isNull();
+      assertThat(config.getPassword()).isNull();
+      assertThat(config.getConnectionProperties()).hasSize(0);
+    });
   }
 }
diff --git 
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionFunctionTest.java
 
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionFunctionTest.java
index 7a32ea2..a883f76 100644
--- 
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionFunctionTest.java
+++ 
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionFunctionTest.java
@@ -43,6 +43,7 @@ import org.apache.geode.distributed.DistributedMember;
 import org.apache.geode.distributed.DistributedSystem;
 import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
+import org.apache.geode.test.dunit.IgnoredException;
 import org.apache.geode.test.junit.categories.UnitTest;
 
 @Category(UnitTest.class)
@@ -125,10 +126,17 @@ public class AlterConnectionFunctionTest {
 
   @Test
   public void executeReportsErrorIfConnectionConfigNotFound() throws Exception 
{
+    IgnoredException ignoredException =
+        
IgnoredException.addIgnoredException(ConnectionConfigNotFoundException.class.getName());
+
     doThrow(ConnectionConfigNotFoundException.class).when(service)
         .replaceConnectionConfig(eq(connectionConfig));
 
-    function.execute(context);
+    try {
+      function.execute(context);
+    } finally {
+      ignoredException.remove();
+    }
 
     ArgumentCaptor<CliFunctionResult> argument = 
ArgumentCaptor.forClass(CliFunctionResult.class);
     verify(resultSender, times(1)).lastResult(argument.capture());
diff --git 
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunctionTest.java
 
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunctionTest.java
index 4d77db7..977322e 100644
--- 
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunctionTest.java
+++ 
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunctionTest.java
@@ -45,6 +45,7 @@ import org.apache.geode.distributed.DistributedMember;
 import org.apache.geode.distributed.DistributedSystem;
 import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
+import org.apache.geode.test.dunit.IgnoredException;
 import org.apache.geode.test.junit.categories.UnitTest;
 
 @Category(UnitTest.class)
@@ -130,7 +131,14 @@ public class AlterMappingFunctionTest {
     doThrow(ConnectionConfigNotFoundException.class).when(service)
         .replaceRegionMapping(eq(regionMapping));
 
-    function.execute(context);
+    IgnoredException ignoredException =
+        
IgnoredException.addIgnoredException(RegionMappingNotFoundException.class.getName());
+
+    try {
+      function.execute(context);
+    } finally {
+      ignoredException.remove();
+    }
 
     ArgumentCaptor<CliFunctionResult> argument = 
ArgumentCaptor.forClass(CliFunctionResult.class);
     verify(resultSender, times(1)).lastResult(argument.capture());
diff --git 
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandIntegrationTest.java
 
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandIntegrationTest.java
index d9e399e..405eb80 100644
--- 
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandIntegrationTest.java
+++ 
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandIntegrationTest.java
@@ -23,10 +23,12 @@ import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
 import org.apache.geode.cache.CacheFactory;
+import 
org.apache.geode.connectors.jdbc.internal.ConnectionConfigExistsException;
 import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
 import 
org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
 import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.management.cli.Result;
+import org.apache.geode.test.dunit.IgnoredException;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 
 @Category(IntegrationTest.class)
@@ -86,9 +88,17 @@ public class CreateConnectionCommandIntegrationTest {
 
     ConnectorService.Connection connectionConfig = 
service.getConnectionConfig(name);
 
-    Result result = createConnectionCommand.createConnection(name, url, user, 
password, params);
-    assertThat(result.getStatus()).isSameAs(Result.Status.ERROR);
+    IgnoredException ignoredException =
+        
IgnoredException.addIgnoredException(ConnectionConfigExistsException.class.getName());
 
+    Result result;
+    try {
+      result = createConnectionCommand.createConnection(name, url, user, 
password, params);
+    } finally {
+      ignoredException.remove();
+    }
+
+    assertThat(result.getStatus()).isSameAs(Result.Status.ERROR);
     assertThat(service.getConnectionConfig(name)).isSameAs(connectionConfig);
   }
 
diff --git 
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandIntegrationTest.java
 
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandIntegrationTest.java
index 8a89110..bb644f1 100644
--- 
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandIntegrationTest.java
+++ 
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandIntegrationTest.java
@@ -25,10 +25,12 @@ import org.junit.experimental.categories.Category;
 
 import org.apache.geode.cache.CacheFactory;
 import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.RegionMappingExistsException;
 import org.apache.geode.connectors.jdbc.internal.TableMetaDataView;
 import 
org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
 import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.management.cli.Result;
+import org.apache.geode.test.dunit.IgnoredException;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 
 @Category(IntegrationTest.class)
@@ -95,8 +97,16 @@ public class CreateMappingCommandIntegrationTest {
 
     ConnectorService.Connection connectionConfig = 
service.getConnectionConfig(regionName);
 
-    Result result = createRegionMappingCommand.createMapping(regionName, 
connectionName, tableName,
-        pdxClass, keyInValue, fieldMappings);
+    IgnoredException ignoredException =
+        
IgnoredException.addIgnoredException(RegionMappingExistsException.class.getName());
+
+    Result result;
+    try {
+      result = createRegionMappingCommand.createMapping(regionName, 
connectionName, tableName,
+          pdxClass, keyInValue, fieldMappings);
+    } finally {
+      ignoredException.remove();
+    }
 
     assertThat(result.getStatus()).isSameAs(Result.Status.ERROR);
 
diff --git 
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandDUnitTest.java
 
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandDUnitTest.java
index a8b3808..6b5fcdf 100644
--- 
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandDUnitTest.java
+++ 
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandDUnitTest.java
@@ -98,7 +98,6 @@ public class DescribeConnectionCommandDUnitTest implements 
Serializable {
     CommandResultAssert commandResultAssert = 
gfsh.executeAndAssertThat(csb.toString());
 
     commandResultAssert.statusIsError();
-    commandResultAssert.containsOutput(
-        String.format("(Experimental) \n" + "connection named 'nonExisting' 
not found"));
+    commandResultAssert.containsOutput(String.format("connection named 
'nonExisting' not found"));
   }
 }
diff --git 
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java
 
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java
index 39b90a5..fe3da4b 100644
--- 
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java
+++ 
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java
@@ -100,7 +100,6 @@ public class DescribeMappingCommandDUnitTest implements 
Serializable {
     CommandResultAssert commandResultAssert = 
gfsh.executeAndAssertThat(csb.toString());
 
     commandResultAssert.statusIsError();
-    commandResultAssert.containsOutput(
-        String.format("(Experimental) \n" + "mapping for region 'nonExisting' 
not found"));
+    commandResultAssert.containsOutput(String.format("mapping for region 
'nonExisting' not found"));
   }
 }
diff --git 
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandTest.java
 
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandTest.java
index e5c5c94..f61a4c2 100644
--- 
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandTest.java
+++ 
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandTest.java
@@ -58,7 +58,7 @@ public class ListConnectionCommandTest {
   @Test
   public void whenCCServiceIsRunningAndNoConnectorServiceFound() {
     gfsh.executeAndAssertThat(command, COMMAND).statusIsSuccess()
-        .containsOutput("(Experimental) \\nNo connections found");
+        .containsOutput("No connections found");
   }
 
   @Test
@@ -66,7 +66,7 @@ public class ListConnectionCommandTest {
     ConnectorService connectorService = mock(ConnectorService.class);
     when(ccService.getCustomCacheElement(any(), any(), 
any())).thenReturn(connectorService);
     gfsh.executeAndAssertThat(command, COMMAND).statusIsSuccess()
-        .containsOutput("(Experimental) \\nNo connections found");
+        .containsOutput("No connections found");
   }
 
   @Test
diff --git 
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandTest.java
 
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandTest.java
index 5253dd5..29fe9e4 100644
--- 
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandTest.java
+++ 
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandTest.java
@@ -58,7 +58,7 @@ public class ListMappingCommandTest {
   @Test
   public void whenCCServiceIsRunningAndNoConnectorServiceFound() {
     gfsh.executeAndAssertThat(command, COMMAND).statusIsSuccess()
-        .containsOutput("(Experimental) \\nNo mappings found");
+        .containsOutput("No mappings found");
   }
 
   @Test
@@ -66,7 +66,7 @@ public class ListMappingCommandTest {
     ConnectorService connectorService = mock(ConnectorService.class);
     when(ccService.getCustomCacheElement(any(), any(), 
any())).thenReturn(connectorService);
     gfsh.executeAndAssertThat(command, COMMAND).statusIsSuccess()
-        .containsOutput("(Experimental) \\nNo mappings found");
+        .containsOutput("No mappings found");
   }
 
   @Test

-- 
To stop receiving notification emails like this one, please contact
aging...@apache.org.

Reply via email to