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 e941250  Revert "GEODE-5057: Removed experimental tag from Jdbc 
connector code base (#1789)" (#1936)
e941250 is described below

commit e9412509e8a94ed17f5e510f8c7986f540638d9e
Author: agingade <aging...@pivotal.io>
AuthorDate: Wed May 9 10:33:37 2018 -0700

    Revert "GEODE-5057: Removed experimental tag from Jdbc connector code base 
(#1789)" (#1936)
    
    This reverts commit 4e249f7c2f834a056a85b14de8728bce60d73e27.
---
 .../org/apache/geode/connectors/jdbc/JdbcAsyncWriter.java    |  6 +++---
 .../apache/geode/connectors/jdbc/JdbcConnectorException.java |  8 ++++----
 .../java/org/apache/geode/connectors/jdbc/JdbcLoader.java    |  3 ++-
 .../java/org/apache/geode/connectors/jdbc/JdbcWriter.java    |  3 ++-
 .../geode/connectors/jdbc/internal/AbstractJdbcCallback.java |  3 ++-
 .../jdbc/internal/ConnectionConfigExistsException.java       |  3 +++
 .../jdbc/internal/ConnectionConfigNotFoundException.java     |  3 +++
 .../geode/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 ++-
 .../connectors/jdbc/internal/cli/AlterConnectionCommand.java |  6 ++++--
 .../jdbc/internal/cli/AlterConnectionFunction.java           |  4 ++--
 .../connectors/jdbc/internal/cli/AlterMappingCommand.java    |  7 +++++--
 .../connectors/jdbc/internal/cli/AlterMappingFunction.java   |  3 ++-
 .../jdbc/internal/cli/CreateConnectionCommand.java           |  9 +++++++--
 .../connectors/jdbc/internal/cli/CreateMappingCommand.java   |  6 ++++--
 .../connectors/jdbc/internal/cli/CreateMappingFunction.java  |  2 ++
 .../jdbc/internal/cli/DescribeConnectionCommand.java         |  9 +++++++--
 .../connectors/jdbc/internal/cli/DescribeMappingCommand.java |  8 ++++++--
 .../jdbc/internal/cli/DestroyConnectionCommand.java          |  7 +++++--
 .../jdbc/internal/cli/DestroyConnectionFunction.java         |  3 ++-
 .../connectors/jdbc/internal/cli/DestroyMappingCommand.java  |  6 ++++--
 .../connectors/jdbc/internal/cli/DestroyMappingFunction.java |  3 +++
 .../connectors/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 +---------
 .../internal/cli/CreateConnectionCommandIntegrationTest.java |  1 +
 .../internal/cli/DescribeConnectionCommandDUnitTest.java     |  3 ++-
 .../jdbc/internal/cli/DescribeMappingCommandDUnitTest.java   |  3 ++-
 .../jdbc/internal/cli/ListConnectionCommandTest.java         |  4 ++--
 .../connectors/jdbc/internal/cli/ListMappingCommandTest.java |  4 ++--
 40 files changed, 117 insertions(+), 87 deletions(-)

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 169e65d..e36469d 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,6 +21,7 @@ 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;
@@ -30,12 +31,11 @@ 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 e5c998d..7403415 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 53ebea4..d76baf9 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,6 +16,7 @@ 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;
@@ -28,7 +29,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 3a3eb11..998cb8a 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,6 +18,7 @@ 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;
@@ -33,7 +34,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 926bf4c..dc6b265 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,11 +14,12 @@
  */
 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 9094b10..de7b895 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,6 +14,9 @@
  */
 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 0c74d3b..10830ea 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,6 +14,9 @@
  */
 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 ca1d7c8..2b8aacd 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,10 +16,11 @@ 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 c850f95..72da9dc 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,13 +19,14 @@ 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 0696061..2b55721 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,6 +14,9 @@
  */
 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 cd88c71..7b0375e 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,6 +14,9 @@
  */
 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 b96b1a7..dbdf074 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,6 +24,7 @@ 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;
@@ -31,7 +32,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 a619637..915db55 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,7 +217,8 @@ 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 4b1c210..b83721d 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
@@ -22,6 +22,7 @@ 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.cache.configuration.CacheConfig;
 import org.apache.geode.cache.configuration.CacheElement;
 import 
org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
@@ -36,10 +37,11 @@ import 
org.apache.geode.management.internal.cli.result.model.ResultModel;
 import org.apache.geode.management.internal.security.ResourceOperation;
 import org.apache.geode.security.ResourcePermission;
 
+@Experimental
 public class AlterConnectionCommand extends SingleGfshCommand {
   static final String ALTER_JDBC_CONNECTION = "alter jdbc-connection";
   static final String ALTER_JDBC_CONNECTION__HELP =
-      "Alter properties for an existing jdbc connection.";
+      EXPERIMENTAL + "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.";
@@ -101,7 +103,7 @@ public class AlterConnectionCommand extends 
SingleGfshCommand {
     ConnectorService.Connection mergedConnection =
         (ConnectorService.Connection) successResult.getResultObject();
 
-    ResultModel result = ResultModel.createMemberStatusResult(results);
+    ResultModel result = ResultModel.createMemberStatusResult(results, 
EXPERIMENTAL, null);
     result.setConfigObject(mergedConnection);
     return result;
   }
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 039ed69..9a740dd 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,7 +14,7 @@
  */
 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;
@@ -22,7 +22,7 @@ import 
org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
 import org.apache.geode.management.cli.CliFunction;
 import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
 
-
+@Experimental
 public class AlterConnectionFunction extends 
CliFunction<ConnectorService.Connection> {
 
   @Override
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 7c16ab3..967aa8e 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
@@ -22,6 +22,7 @@ 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.cache.configuration.CacheConfig;
 import org.apache.geode.cache.configuration.CacheElement;
 import 
org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
@@ -36,9 +37,11 @@ import 
org.apache.geode.management.internal.cli.result.model.ResultModel;
 import org.apache.geode.management.internal.security.ResourceOperation;
 import org.apache.geode.security.ResourcePermission;
 
+@Experimental
 public class AlterMappingCommand extends SingleGfshCommand {
   static final String ALTER_MAPPING = "alter jdbc-mapping";
-  static final String ALTER_MAPPING__HELP = "Alter properties for an existing 
jdbc mapping.";
+  static final String ALTER_MAPPING__HELP =
+      EXPERIMENTAL + "Alter properties for an existing jdbc mapping.";
 
   static final String ALTER_MAPPING__REGION_NAME = "region";
   static final String ALTER_MAPPING__REGION_NAME__HELP =
@@ -102,7 +105,7 @@ public class AlterMappingCommand extends SingleGfshCommand {
     // action
     List<CliFunctionResult> results =
         executeAndGetFunctionResult(new AlterMappingFunction(), newMapping, 
targetMembers);
-    ResultModel result = ResultModel.createMemberStatusResult(results);
+    ResultModel result = ResultModel.createMemberStatusResult(results, 
EXPERIMENTAL, null);
 
     // find the merged regionMapping from the function result
     CliFunctionResult successResult =
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 01c1800..50c14a7 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,6 +16,7 @@ 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;
@@ -23,7 +24,7 @@ import 
org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
 import org.apache.geode.management.cli.CliFunction;
 import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
 
-
+@Experimental
 public class AlterMappingFunction extends 
CliFunction<ConnectorService.RegionMapping> {
 
   @Override
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 02f77f1..a227d78 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,13 +18,16 @@ 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.CliAvailabilityIndicator;
 import org.springframework.shell.core.annotation.CliCommand;
 import org.springframework.shell.core.annotation.CliOption;
 
+import org.apache.geode.annotations.Experimental;
 import org.apache.geode.cache.configuration.CacheConfig;
 import 
org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
 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.cli.SingleGfshCommand;
@@ -37,11 +40,13 @@ import 
org.apache.geode.management.internal.cli.result.model.ResultModel;
 import org.apache.geode.management.internal.security.ResourceOperation;
 import org.apache.geode.security.ResourcePermission;
 
+@Experimental
 public class CreateConnectionCommand extends SingleGfshCommand {
+  private static final Logger logger = LogService.getLogger();
 
   static final String CREATE_CONNECTION = "create jdbc-connection";
   static final String CREATE_CONNECTION__HELP =
-      "Create a connection for communicating with a database through jdbc.";
+      EXPERIMENTAL + "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";
@@ -81,7 +86,7 @@ public class CreateConnectionCommand extends 
SingleGfshCommand {
     List<CliFunctionResult> results =
         executeAndGetFunctionResult(new CreateConnectionFunction(), 
connection, targetMembers);
 
-    ResultModel result = ResultModel.createMemberStatusResult(results);
+    ResultModel result = ResultModel.createMemberStatusResult(results, 
EXPERIMENTAL, null);
     result.setConfigObject(connection);
     return result;
   }
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 1965bf6..c2c9b13 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,6 +20,7 @@ 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.cache.configuration.CacheConfig;
 import 
org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
 import org.apache.geode.distributed.DistributedMember;
@@ -31,10 +32,11 @@ import 
org.apache.geode.management.internal.cli.result.model.ResultModel;
 import org.apache.geode.management.internal.security.ResourceOperation;
 import org.apache.geode.security.ResourcePermission;
 
+@Experimental
 public class CreateMappingCommand extends SingleGfshCommand {
   static final String CREATE_MAPPING = "create jdbc-mapping";
   static final String CREATE_MAPPING__HELP =
-      "Create a mapping for a region for use with a JDBC database connection.";
+      EXPERIMENTAL + "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.";
@@ -81,7 +83,7 @@ public class CreateMappingCommand extends SingleGfshCommand {
     List<CliFunctionResult> results =
         executeAndGetFunctionResult(new CreateMappingFunction(), mapping, 
targetMembers);
 
-    ResultModel result = ResultModel.createMemberStatusResult(results);
+    ResultModel result = ResultModel.createMemberStatusResult(results, 
EXPERIMENTAL, null);
     result.setConfigObject(mapping);
     return result;
   }
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 d1650e6..8b31d00 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,6 +14,7 @@
  */
 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;
@@ -21,6 +22,7 @@ import 
org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
 import org.apache.geode.management.cli.CliFunction;
 import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
 
+@Experimental
 public class CreateMappingFunction extends 
CliFunction<ConnectorService.RegionMapping> {
 
   CreateMappingFunction() {
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 d9361ed..fb47ea9 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
@@ -26,6 +26,7 @@ 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.cache.configuration.CacheConfig;
 import org.apache.geode.cache.configuration.CacheElement;
 import 
org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
@@ -44,10 +45,12 @@ 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 GfshCommand {
   private static Logger logger = LogService.getLogger();
   static final String DESCRIBE_CONNECTION = "describe jdbc-connection";
-  static final String DESCRIBE_CONNECTION__HELP = "Describe the specified jdbc 
connection.";
+  static final String DESCRIBE_CONNECTION__HELP =
+      EXPERIMENTAL + "Describe the specified jdbc connection .";
   static final String DESCRIBE_CONNECTION__NAME = "name";
   static final String DESCRIBE_CONNECTION__NAME__HELP =
       "Name of the jdbc connection to be described.";
@@ -88,11 +91,13 @@ public class DescribeConnectionCommand extends GfshCommand {
     }
 
     if (connection == null) {
-      throw new EntityNotFoundException("connection named '" + name + "' not 
found");
+      throw new EntityNotFoundException(
+          EXPERIMENTAL + "\n" + "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 487b3f9..89a82e0 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
@@ -25,6 +25,7 @@ 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.cache.configuration.CacheConfig;
 import org.apache.geode.cache.configuration.CacheElement;
 import 
org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
@@ -42,9 +43,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 DescribeMappingCommand extends GfshCommand {
   static final String DESCRIBE_MAPPING = "describe jdbc-mapping";
-  static final String DESCRIBE_MAPPING__HELP = "Describe the specified jdbc 
mapping";
+  static final String DESCRIBE_MAPPING__HELP = EXPERIMENTAL + "Describe the 
specified jdbc mapping";
   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.";
@@ -85,11 +87,13 @@ public class DescribeMappingCommand extends GfshCommand {
     }
 
     if (mapping == null) {
-      throw new EntityNotFoundException("mapping for region '" + regionName + 
"' not found");
+      throw new EntityNotFoundException(
+          EXPERIMENTAL + "\n" + "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 161ff80..ddbe123 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,6 +20,7 @@ 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.cache.configuration.CacheConfig;
 import org.apache.geode.cache.configuration.CacheElement;
 import 
org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
@@ -32,9 +33,11 @@ import 
org.apache.geode.management.internal.cli.result.model.ResultModel;
 import org.apache.geode.management.internal.security.ResourceOperation;
 import org.apache.geode.security.ResourcePermission;
 
+@Experimental
 public class DestroyConnectionCommand extends SingleGfshCommand {
   static final String DESTROY_CONNECTION = "destroy jdbc-connection";
-  static final String DESTROY_CONNECTION__HELP = "Destroy/Remove the specified 
jdbc connection.";
+  static final String DESTROY_CONNECTION__HELP =
+      EXPERIMENTAL + "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.";
@@ -51,7 +54,7 @@ public class DestroyConnectionCommand extends 
SingleGfshCommand {
     // action
     List<CliFunctionResult> results =
         executeAndGetFunctionResult(new DestroyConnectionFunction(), name, 
targetMembers);
-    ResultModel result = ResultModel.createMemberStatusResult(results);
+    ResultModel result = ResultModel.createMemberStatusResult(results, 
EXPERIMENTAL, null);
     result.setConfigObject(name);
     return result;
   }
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 412628f..c5247d0 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,13 +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.JdbcConnectorService;
 import 
org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
 import org.apache.geode.management.cli.CliFunction;
 import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
 
-
+@Experimental
 public class DestroyConnectionFunction extends CliFunction<String> {
 
   @Override
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 924f10f..e4aca2c 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,6 +20,7 @@ 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.cache.configuration.CacheConfig;
 import org.apache.geode.cache.configuration.CacheElement;
 import 
org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
@@ -32,9 +33,10 @@ import 
org.apache.geode.management.internal.cli.result.model.ResultModel;
 import org.apache.geode.management.internal.security.ResourceOperation;
 import org.apache.geode.security.ResourcePermission;
 
+@Experimental
 public class DestroyMappingCommand extends SingleGfshCommand {
   static final String DESTROY_MAPPING = "destroy jdbc-mapping";
-  static final String DESTROY_MAPPING__HELP = "Destroy the specified mapping.";
+  static final String DESTROY_MAPPING__HELP = EXPERIMENTAL + "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.";
 
@@ -53,7 +55,7 @@ public class DestroyMappingCommand extends SingleGfshCommand {
     List<CliFunctionResult> results =
         executeAndGetFunctionResult(new DestroyMappingFunction(), regionName, 
targetMembers);
 
-    ResultModel result = ResultModel.createMemberStatusResult(results);
+    ResultModel result = ResultModel.createMemberStatusResult(results, 
EXPERIMENTAL, null);
     result.setConfigObject(regionName);
     return result;
   }
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 1d3fead..776a873 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,12 +14,15 @@
  */
 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.cli.CliFunction;
 import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
 
+
+@Experimental
 public class DestroyMappingFunction extends CliFunction<String> {
 
   @Override
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 1fd2712..c44056b 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
@@ -21,6 +21,7 @@ import java.util.Set;
 
 import org.springframework.shell.core.annotation.CliCommand;
 
+import org.apache.geode.annotations.Experimental;
 import org.apache.geode.cache.configuration.CacheConfig;
 import 
org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
 import org.apache.geode.distributed.ConfigurationPersistenceService;
@@ -35,10 +36,11 @@ 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 GfshCommand {
   static final String LIST_JDBC_CONNECTION = "list jdbc-connections";
-  static final String LIST_JDBC_CONNECTION__HELP = "Display jdbc connections 
for all members.";
+  static final String LIST_JDBC_CONNECTION__HELP =
+      EXPERIMENTAL + "Display jdbc connections for all members.";
 
   static final String LIST_OF_CONNECTIONS = "List of connections";
   static final String NO_CONNECTIONS_FOUND = "No connections found";
@@ -76,7 +78,7 @@ public class ListConnectionCommand extends GfshCommand {
     }
 
     if (connections == null) {
-      return ResultBuilder.createInfoResult("No connections found");
+      return ResultBuilder.createInfoResult(EXPERIMENTAL + "\n" + 
NO_CONNECTIONS_FOUND);
     }
 
     // output
@@ -87,9 +89,10 @@ public class ListConnectionCommand extends GfshCommand {
 
   private Result createResult(TabularResultData tabularResultData, boolean 
connectionsExist) {
     if (connectionsExist) {
+      tabularResultData.setHeader(EXPERIMENTAL);
       return ResultBuilder.buildResult(tabularResultData);
     } else {
-      return ResultBuilder.createInfoResult(NO_CONNECTIONS_FOUND);
+      return ResultBuilder.createInfoResult(EXPERIMENTAL + "\n" + 
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 5a79c08..b37f65e 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
@@ -21,6 +21,7 @@ import java.util.Set;
 
 import org.springframework.shell.core.annotation.CliCommand;
 
+import org.apache.geode.annotations.Experimental;
 import org.apache.geode.cache.configuration.CacheConfig;
 import 
org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
 import org.apache.geode.distributed.ConfigurationPersistenceService;
@@ -35,10 +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 ListMappingCommand extends GfshCommand {
   static final String LIST_MAPPING = "list jdbc-mappings";
-  static final String LIST_MAPPING__HELP = "Display jdbc mappings for all 
members.";
+  static final String LIST_MAPPING__HELP = EXPERIMENTAL + "Display jdbc 
mappings for all members.";
 
   static final String LIST_OF_MAPPINGS = "List of mappings";
   static final String NO_MAPPINGS_FOUND = "No mappings found";
@@ -77,7 +78,7 @@ public class ListMappingCommand extends GfshCommand {
     }
 
     if (mappings == null) {
-      return ResultBuilder.createInfoResult("No mappings found");
+      return ResultBuilder.createInfoResult(EXPERIMENTAL + "\n" + 
NO_MAPPINGS_FOUND);
     }
 
     // output
@@ -88,9 +89,10 @@ public class ListMappingCommand extends GfshCommand {
 
   private Result createResult(TabularResultData tabularResultData, boolean 
mappingsExist) {
     if (mappingsExist) {
+      tabularResultData.setHeader(EXPERIMENTAL);
       return ResultBuilder.buildResult(tabularResultData);
     } else {
-      return ResultBuilder.createInfoResult(NO_MAPPINGS_FOUND);
+      return ResultBuilder.createInfoResult(EXPERIMENTAL + "\n" + 
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 521dac8..5380eb4 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,6 +36,7 @@ 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.cache.configuration.XSDRootElement;
 import org.apache.geode.connectors.jdbc.JdbcConnectorException;
@@ -103,6 +104,7 @@ 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 646a928..819551b 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,7 +40,6 @@ 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)
@@ -123,16 +122,10 @@ public abstract class JdbcAsyncWriterIntegrationTest {
   @Test
   public void putNonPdxInstanceFails() {
     Region nonPdxEmployees = this.employees;
-
-    IgnoredException ignoredException =
-        
IgnoredException.addIgnoredException(ClassCastException.class.getName());
-    try {
-      nonPdxEmployees.put("1", "non pdx instance");
-    } finally {
-      ignoredException.remove();
-    }
+    nonPdxEmployees.put("1", "non pdx instance");
 
     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 e93174a..f48151b 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.assertThat;
+import static org.assertj.core.api.Assertions.*;
 
 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 607a615..23dcc75 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,6 +113,7 @@ 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 975a26f..cb5f4ba 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,16 +131,6 @@ public class AlterConnectionCommandDUnitTest {
       assertThat(config.getConnectionProperties()).hasSize(0);
     });
 
-    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);
-    });
+    startupRule.startServerVM(2, locator.getPort());
   }
 }
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 a883f76..7a32ea2 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,7 +43,6 @@ 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)
@@ -126,17 +125,10 @@ public class AlterConnectionFunctionTest {
 
   @Test
   public void executeReportsErrorIfConnectionConfigNotFound() throws Exception 
{
-    IgnoredException ignoredException =
-        
IgnoredException.addIgnoredException(ConnectionConfigNotFoundException.class.getName());
-
     doThrow(ConnectionConfigNotFoundException.class).when(service)
         .replaceConnectionConfig(eq(connectionConfig));
 
-    try {
-      function.execute(context);
-    } finally {
-      ignoredException.remove();
-    }
+    function.execute(context);
 
     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 9e57ffc..66707af 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
@@ -44,7 +44,6 @@ 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)
@@ -129,14 +128,7 @@ public class AlterMappingFunctionTest {
     doThrow(ConnectionConfigNotFoundException.class).when(service)
         .replaceRegionMapping(eq(regionMapping));
 
-    IgnoredException ignoredException =
-        
IgnoredException.addIgnoredException(RegionMappingNotFoundException.class.getName());
-
-    try {
-      function.execute(context);
-    } finally {
-      ignoredException.remove();
-    }
+    function.execute(context);
 
     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 54ae98d..0600a46 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
@@ -101,6 +101,7 @@ public class CreateConnectionCommandIntegrationTest {
     }
 
     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/DescribeConnectionCommandDUnitTest.java
 
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandDUnitTest.java
index c520b9e..f18639f 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
@@ -99,7 +99,8 @@ public class DescribeConnectionCommandDUnitTest implements 
Serializable {
 
     CommandResultAssert commandResultAssert = 
gfsh.executeAndAssertThat(csb.toString());
     commandResultAssert.statusIsError();
-    commandResultAssert.containsOutput(String.format("connection named 
'nonExisting' not found"));
+    commandResultAssert.containsOutput(
+        String.format("(Experimental) \n" + "connection named 'nonExisting' 
not found"));
   }
 
   @Test
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 e56d5cb..93a53bf 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
@@ -107,7 +107,8 @@ public class DescribeMappingCommandDUnitTest implements 
Serializable {
     CommandResultAssert commandResultAssert = 
gfsh.executeAndAssertThat(csb.toString());
 
     commandResultAssert.statusIsError();
-    commandResultAssert.containsOutput(String.format("mapping for region 
'nonExisting' not found"));
+    commandResultAssert.containsOutput(
+        String.format("(Experimental) \n" + "mapping for region 'nonExisting' 
not found"));
   }
 
   @Test
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 dd1e72c..d34e901 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
@@ -72,7 +72,7 @@ public class ListConnectionCommandTest {
   public void whenCCServiceIsRunningAndNoConnectorServiceFound() {
     doReturn(ccService).when(command).getConfigurationPersistenceService();
     gfsh.executeAndAssertThat(command, COMMAND).statusIsSuccess()
-        .containsOutput("No connections found");
+        .containsOutput("(Experimental) \\nNo connections found");
   }
 
   @Test
@@ -82,7 +82,7 @@ public class ListConnectionCommandTest {
     ConnectorService connectorService = mock(ConnectorService.class);
     when(cacheConfig.findCustomCacheElement(any(), 
any())).thenReturn(connectorService);
     gfsh.executeAndAssertThat(command, COMMAND).statusIsSuccess()
-        .containsOutput("No connections found");
+        .containsOutput("(Experimental) \\nNo 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 dfb78e3..0092eba 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
@@ -72,7 +72,7 @@ public class ListMappingCommandTest {
   public void whenCCServiceIsRunningAndNoConnectorServiceFound() {
     doReturn(ccService).when(command).getConfigurationPersistenceService();
     gfsh.executeAndAssertThat(command, COMMAND).statusIsSuccess()
-        .containsOutput("No mappings found");
+        .containsOutput("(Experimental) \\nNo mappings found");
   }
 
   @Test
@@ -82,7 +82,7 @@ public class ListMappingCommandTest {
     ConnectorService connectorService = mock(ConnectorService.class);
     when(cacheConfig.findCustomCacheElement(any(), 
any())).thenReturn(connectorService);
     gfsh.executeAndAssertThat(command, COMMAND).statusIsSuccess()
-        .containsOutput("No mappings found");
+        .containsOutput("(Experimental) \\nNo mappings found");
   }
 
   @Test

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

Reply via email to