This is an automated email from the ASF dual-hosted git repository.
lgallinat pushed a commit to branch feature/GEODE-3781
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-3781 by this
push:
new 6323028 Fix test failures. Add experimental tag to the gfsh results.
6323028 is described below
commit 63230288f841eafcfc5060173e6b5fa58486d478
Author: Lynn Gallinat <[email protected]>
AuthorDate: Wed Dec 13 17:32:59 2017 -0800
Fix test failures. Add experimental tag to the gfsh results.
---
.../connectors/jdbc/internal/RegionMapping.java | 4 ++--
.../jdbc/internal/cli/AlterConnectionCommand.java | 2 +-
.../internal/cli/AlterRegionMappingCommand.java | 2 +-
.../internal/cli/AlterRegionMappingFunction.java | 2 ++
.../jdbc/internal/cli/CreateConnectionCommand.java | 2 +-
.../internal/cli/CreateRegionMappingCommand.java | 2 +-
.../internal/cli/DescribeConnectionCommand.java | 5 +++--
.../internal/cli/DescribeRegionMappingCommand.java | 7 +++----
.../jdbc/internal/cli/DestroyConnectionCommand.java | 2 +-
.../internal/cli/DestroyRegionMappingCommand.java | 2 +-
.../jdbc/internal/cli/ListConnectionCommand.java | 5 ++---
.../jdbc/internal/cli/ListRegionMappingCommand.java | 5 ++---
.../xml/JdbcConnectorServiceXmlGenerator.java | 4 +++-
.../cli/AlterRegionMappingFunctionTest.java | 15 ++++++++++-----
.../CreateRegionMappingCommandIntegrationTest.java | 21 ++++++++++++++++++++-
.../internal/cli/commands/GfshCommand.java | 2 ++
16 files changed, 55 insertions(+), 27 deletions(-)
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/RegionMapping.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/RegionMapping.java
index 6b67a26..710bbbf 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/RegionMapping.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/RegionMapping.java
@@ -37,8 +37,8 @@ public class RegionMapping implements Serializable {
this.tableName = tableName;
this.connectionConfigName = connectionConfigName;
this.primaryKeyInValue = primaryKeyInValue;
- this.fieldToColumnMap =
- fieldToColumnMap == null ? null :
Collections.unmodifiableMap(fieldToColumnMap);
+ this.fieldToColumnMap = fieldToColumnMap == null ? null
+ : Collections.unmodifiableMap(fieldToColumnMap);
}
public String getConnectionConfigName() {
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 57def34..f03233d 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
@@ -38,7 +38,6 @@ import org.apache.geode.security.ResourcePermission;
@Experimental
public class AlterConnectionCommand implements GfshCommand {
- static final String EXPERIMENTAL = "(Experimental) ";
static final String ALTER_JDBC_CONNECTION = "alter jdbc-connection";
static final String ALTER_JDBC_CONNECTION__HELP =
EXPERIMENTAL + "Alter properties for an existing jdbc connection.";
@@ -85,6 +84,7 @@ public class AlterConnectionCommand implements GfshCommand {
// output
TabularResultData tabularResultData =
ResultBuilder.createTabularResultData();
XmlEntity xmlEntity = fillTabularResultData(resultCollector,
tabularResultData);
+ tabularResultData.setHeader(EXPERIMENTAL);
Result result = ResultBuilder.buildResult(tabularResultData);
updateClusterConfiguration(result, xmlEntity);
return result;
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterRegionMappingCommand.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterRegionMappingCommand.java
index 2a9cc34..bc3992f 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterRegionMappingCommand.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterRegionMappingCommand.java
@@ -38,7 +38,6 @@ import org.apache.geode.security.ResourcePermission;
@Experimental
public class AlterRegionMappingCommand implements GfshCommand {
- static final String EXPERIMENTAL = "(Experimental) ";
static final String ALTER_MAPPING = "alter jdbc-mapping";
static final String ALTER_MAPPING__HELP =
EXPERIMENTAL + "Alter properties for an existing jdbc mapping.";
@@ -93,6 +92,7 @@ public class AlterRegionMappingCommand implements GfshCommand
{
// output
TabularResultData tabularResultData =
ResultBuilder.createTabularResultData();
XmlEntity xmlEntity = fillTabularResultData(resultCollector,
tabularResultData);
+ tabularResultData.setHeader(EXPERIMENTAL);
Result result = ResultBuilder.buildResult(tabularResultData);
updateClusterConfiguration(result, xmlEntity);
return result;
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterRegionMappingFunction.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterRegionMappingFunction.java
index f8ddb96..8082bc6 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterRegionMappingFunction.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterRegionMappingFunction.java
@@ -14,6 +14,8 @@
*/
package org.apache.geode.connectors.jdbc.internal.cli;
+import java.util.Collection;
+import java.util.Collections;
import java.util.Map;
import org.apache.geode.annotations.Experimental;
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 16eb261..e3a63c5 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
@@ -42,7 +42,6 @@ import org.apache.geode.security.ResourcePermission;
public class CreateConnectionCommand implements GfshCommand {
private static final Logger logger = LogService.getLogger();
- static final String EXPERIMENTAL = "(Experimental) ";
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.";
@@ -88,6 +87,7 @@ public class CreateConnectionCommand implements GfshCommand {
// output
TabularResultData tabularResultData =
ResultBuilder.createTabularResultData();
XmlEntity xmlEntity = fillTabularResultData(resultCollector,
tabularResultData);
+ tabularResultData.setHeader(EXPERIMENTAL);
Result result = ResultBuilder.buildResult(tabularResultData);
updateClusterConfiguration(result, xmlEntity);
return result;
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateRegionMappingCommand.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateRegionMappingCommand.java
index f3b725f..f99b2d4 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateRegionMappingCommand.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateRegionMappingCommand.java
@@ -38,7 +38,6 @@ import org.apache.geode.security.ResourcePermission;
@Experimental
public class CreateRegionMappingCommand implements GfshCommand {
- static final String EXPERIMENTAL = "(Experimental) ";
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.";
@@ -93,6 +92,7 @@ public class CreateRegionMappingCommand implements
GfshCommand {
// output
TabularResultData tabularResultData =
ResultBuilder.createTabularResultData();
XmlEntity xmlEntity = fillTabularResultData(resultCollector,
tabularResultData);
+ tabularResultData.setHeader(EXPERIMENTAL);
Result result = ResultBuilder.buildResult(tabularResultData);
updateClusterConfiguration(result, xmlEntity);
return result;
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 8083be9..198158f 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
@@ -40,7 +40,6 @@ import org.apache.geode.security.ResourcePermission;
@Experimental
public class DescribeConnectionCommand implements GfshCommand {
- static final String EXPERIMENTAL = "(Experimental) ";
static final String DESCRIBE_CONNECTION = "describe jdbc-connection";
static final String DESCRIBE_CONNECTION__HELP =
EXPERIMENTAL + "Describe the specified jdbc connection.";
@@ -72,11 +71,13 @@ public class DescribeConnectionCommand implements
GfshCommand {
// output
ConnectionConfiguration config = resultCollector.getResult().get(0);
if (config == null) {
- return ResultBuilder.createInfoResult(String.format("Connection named
'%s' not found", name));
+ return ResultBuilder.createInfoResult(
+ String.format(EXPERIMENTAL + "\n" + "Connection named '%s' not
found", name));
}
CompositeResultData resultData = ResultBuilder.createCompositeResultData();
fillResultData(config, resultData);
+ resultData.setHeader(EXPERIMENTAL);
return ResultBuilder.buildResult(resultData);
}
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeRegionMappingCommand.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeRegionMappingCommand.java
index f70ed0d..6114a59 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeRegionMappingCommand.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeRegionMappingCommand.java
@@ -42,7 +42,6 @@ import org.apache.geode.security.ResourcePermission;
@Experimental
public class DescribeRegionMappingCommand implements GfshCommand {
- static final String EXPERIMENTAL = "(Experimental) ";
static final String DESCRIBE_MAPPING = "describe jdbc-mapping";
static final String DESCRIBE_MAPPING__HELP =
EXPERIMENTAL + "Describe the specified jdbc mapping.";
@@ -74,12 +73,13 @@ public class DescribeRegionMappingCommand implements
GfshCommand {
// output
RegionMapping config = resultCollector.getResult().get(0);
if (config == null) {
- return ResultBuilder
- .createInfoResult(String.format("Mapping for region '%s' not found",
regionName));
+ return ResultBuilder.createInfoResult(
+ String.format(EXPERIMENTAL + "\n" + "Mapping for region '%s' not
found", regionName));
}
CompositeResultData resultData = ResultBuilder.createCompositeResultData();
fillResultData(config, resultData);
+ resultData.setHeader(EXPERIMENTAL);
return ResultBuilder.buildResult(resultData);
}
@@ -93,7 +93,6 @@ public class DescribeRegionMappingCommand implements
GfshCommand {
private void fillResultData(RegionMapping mapping, CompositeResultData
resultData) {
CompositeResultData.SectionResultData sectionResult =
resultData.addSection(RESULT_SECTION_NAME);
-
sectionResult.addSeparator('-');
sectionResult.addData(CREATE_MAPPING__REGION_NAME,
mapping.getRegionName());
sectionResult.addData(CREATE_MAPPING__CONNECTION_NAME,
mapping.getConnectionConfigName());
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 87b2e36..9424a58 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
@@ -36,7 +36,6 @@ import org.apache.geode.security.ResourcePermission;
@Experimental
public class DestroyConnectionCommand implements GfshCommand {
- static final String EXPERIMENTAL = "(Experimental) ";
static final String DESTROY_CONNECTION = "destroy jdbc-connection";
static final String DESTROY_CONNECTION__HELP =
EXPERIMENTAL + "Destroy/Remove the specified jdbc connection.";
@@ -63,6 +62,7 @@ public class DestroyConnectionCommand implements GfshCommand {
// output
TabularResultData tabularResultData =
ResultBuilder.createTabularResultData();
XmlEntity xmlEntity = fillTabularResultData(resultCollector,
tabularResultData);
+ tabularResultData.setHeader(EXPERIMENTAL);
Result result = ResultBuilder.buildResult(tabularResultData);
updateClusterConfiguration(result, xmlEntity);
return result;
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyRegionMappingCommand.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyRegionMappingCommand.java
index 785a538..c181959 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyRegionMappingCommand.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyRegionMappingCommand.java
@@ -36,7 +36,6 @@ import org.apache.geode.security.ResourcePermission;
@Experimental
public class DestroyRegionMappingCommand implements GfshCommand {
- static final String EXPERIMENTAL = "(Experimental) ";
static final String DESTROY_MAPPING = "destroy jdbc-mapping";
static final String DESTROY_MAPPING__HELP = EXPERIMENTAL + "Destroy the
specified mapping.";
static final String DESTROY_MAPPING__REGION_NAME = "region";
@@ -61,6 +60,7 @@ public class DestroyRegionMappingCommand implements
GfshCommand {
// output
TabularResultData tabularResultData =
ResultBuilder.createTabularResultData();
XmlEntity xmlEntity = fillTabularResultData(resultCollector,
tabularResultData);
+ tabularResultData.setHeader(EXPERIMENTAL);
Result result = ResultBuilder.buildResult(tabularResultData);
updateClusterConfiguration(result, xmlEntity);
return result;
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 52fb133..cd890cf 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
@@ -36,7 +36,6 @@ import org.apache.geode.security.ResourcePermission;
@Experimental
public class ListConnectionCommand implements GfshCommand {
- static final String EXPERIMENTAL = "(Experimental) ";
static final String LIST_JDBC_CONNECTION = "list jdbc-connections";
static final String LIST_JDBC_CONNECTION__HELP =
EXPERIMENTAL + "Display jdbc connections for all members.";
@@ -74,10 +73,10 @@ public class ListConnectionCommand implements 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/ListRegionMappingCommand.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListRegionMappingCommand.java
index c2c34ad..793138d 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListRegionMappingCommand.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListRegionMappingCommand.java
@@ -36,7 +36,6 @@ import org.apache.geode.security.ResourcePermission;
@Experimental
public class ListRegionMappingCommand implements GfshCommand {
- static final String EXPERIMENTAL = "(Experimental) ";
static final String LIST_MAPPING = "list jdbc-mappings";
static final String LIST_MAPPING__HELP = EXPERIMENTAL + "Display jdbc
mappings for all members.";
@@ -73,10 +72,10 @@ public class ListRegionMappingCommand implements
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/xml/JdbcConnectorServiceXmlGenerator.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlGenerator.java
index afc929b..2a8d478 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlGenerator.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlGenerator.java
@@ -119,7 +119,9 @@ public class JdbcConnectorServiceXmlGenerator implements
XmlGenerator<Cache> {
XmlGeneratorUtils.startElement(handler, PREFIX,
ElementType.REGION_MAPPING.getTypeName(),
attributes);
- addFieldMappings(handler, mapping.getFieldToColumnMap());
+ if (mapping.getFieldToColumnMap() != null) {
+ addFieldMappings(handler, mapping.getFieldToColumnMap());
+ }
XmlGeneratorUtils.endElement(handler, PREFIX,
ElementType.REGION_MAPPING.getTypeName());
}
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterRegionMappingFunctionTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterRegionMappingFunctionTest.java
index e6a0d0d..3360b76 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterRegionMappingFunctionTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterRegionMappingFunctionTest.java
@@ -20,7 +20,9 @@ import static org.assertj.core.api.Assertions.entry;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -44,6 +46,7 @@ import
org.apache.geode.connectors.jdbc.internal.RegionMappingBuilder;
import
org.apache.geode.connectors.jdbc.internal.RegionMappingNotFoundException;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.internal.cache.CacheConfig;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.test.junit.categories.UnitTest;
@@ -54,7 +57,7 @@ public class AlterRegionMappingFunctionTest {
private static final String REGION_NAME = "testRegion";
private RegionMapping regionMapping;
- private RegionMapping existingMappping;
+ private RegionMapping existingMapping;
private RegionMapping mappingToAlter;
private FunctionContext<RegionMapping> context;
private ResultSender<Object> resultSender;
@@ -72,7 +75,7 @@ public class AlterRegionMappingFunctionTest {
service = mock(InternalJdbcConnectorService.class);
regionMapping = new
RegionMappingBuilder().withRegionName(REGION_NAME).build();
- existingMappping = new
RegionMappingBuilder().withRegionName(REGION_NAME).build();
+ existingMapping = new
RegionMappingBuilder().withRegionName(REGION_NAME).build();
Map<String, String> mappings = new HashMap<>();
mappings.put("field1", "column1");
mappings.put("field2", "column2");
@@ -85,7 +88,6 @@ public class AlterRegionMappingFunctionTest {
when(system.getDistributedMember()).thenReturn(distributedMember);
when(context.getArguments()).thenReturn(regionMapping);
when(cache.getService(eq(InternalJdbcConnectorService.class))).thenReturn(service);
-
function = new AlterRegionMappingFunction();
}
@@ -114,13 +116,16 @@ public class AlterRegionMappingFunctionTest {
doThrow(RegionMappingNotFoundException.class).when(alterFunction).alterRegionMapping(any(),
any());
- assertThatThrownBy(() -> alterFunction.alterRegionMapping(regionMapping,
existingMappping))
+ assertThatThrownBy(() -> alterFunction.alterRegionMapping(regionMapping,
existingMapping))
.isInstanceOf(RegionMappingNotFoundException.class);
}
@Test
public void executeInvokesReplaceOnService() throws Exception {
-
when(service.getMappingForRegion(REGION_NAME)).thenReturn(existingMappping);
+ when(service.getMappingForRegion(REGION_NAME)).thenReturn(existingMapping);
+
+ AlterRegionMappingFunction function = spy(new
AlterRegionMappingFunction());
+ doReturn(null).when(function).createXmlEntity(context);
function.execute(context);
verify(service, times(1)).replaceRegionMapping(any());
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateRegionMappingCommandIntegrationTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateRegionMappingCommandIntegrationTest.java
index 7890db7..2f2d17e 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateRegionMappingCommandIntegrationTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateRegionMappingCommandIntegrationTest.java
@@ -84,7 +84,7 @@ public class CreateRegionMappingCommandIntegrationTest {
}
@Test
- public void createsConnectionOnceOnly() {
+ public void createsRegionMappingOnceOnly() {
createRegionMappingCommand.createMapping(regionName, connectionName,
tableName, pdxClass,
keyInValue, fieldMappings);
InternalJdbcConnectorService service =
cache.getService(InternalJdbcConnectorService.class);
@@ -98,4 +98,23 @@ public class CreateRegionMappingCommandIntegrationTest {
assertThat(service.getConnectionConfig(regionName)).isSameAs(connectionConfig);
}
+
+ @Test
+ public void createsRegionMappingWithMinimumParams() {
+ Result result = createRegionMappingCommand.createMapping(regionName,
connectionName, null, null,
+ false, null);
+
+ assertThat(result.getStatus()).isSameAs(Result.Status.OK);
+
+ InternalJdbcConnectorService service =
cache.getService(InternalJdbcConnectorService.class);
+ RegionMapping regionMapping = service.getMappingForRegion(regionName);
+
+ assertThat(regionMapping).isNotNull();
+ assertThat(regionMapping.getRegionName()).isEqualTo(regionName);
+
assertThat(regionMapping.getConnectionConfigName()).isEqualTo(connectionName);
+ assertThat(regionMapping.getTableName()).isNull();
+ assertThat(regionMapping.getPdxClassName()).isNull();
+ assertThat(regionMapping.isPrimaryKeyInValue()).isFalse();
+ assertThat(regionMapping.getFieldToColumnMap()).isNull();
+ }
}
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GfshCommand.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GfshCommand.java
index 6a30378..bcbe787 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GfshCommand.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GfshCommand.java
@@ -46,6 +46,8 @@ import org.apache.geode.management.internal.cli.shell.Gfsh;
@SuppressWarnings("unused")
public interface GfshCommand extends CommandMarker {
+ static final String EXPERIMENTAL = "(Experimental) ";
+
default boolean isConnectedAndReady() {
return getGfsh() != null && getGfsh().isConnectedAndReady();
}
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
