This is an automated email from the ASF dual-hosted git repository.
jchen21 pushed a commit to branch feature/GEODE-6273
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-6273 by this
push:
new a9a59e1 Remove groups from RegionMapping and xsd
a9a59e1 is described below
commit a9a59e1a171d14602e5031320b81528c68ce10a3
Author: Ben Ross <br...@pivotal.io>
AuthorDate: Wed Jan 23 15:15:06 2019 -0800
Remove groups from RegionMapping and xsd
Co-authored-by: Ben Ross <br...@pivotal.io>
Co-authored-by: Jianxia Chen <jc...@pivotal.io>
---
.../jdbc/internal/TestConfigService.java | 2 +-
.../cli/DescribeMappingCommandDUnitTest.java | 2 +-
.../internal/cli/ListMappingCommandDUnitTest.java | 2 +-
.../jdbc/internal/cli/CreateMappingCommand.java | 3 +-
.../jdbc/internal/cli/DescribeMappingFunction.java | 5 +-
.../jdbc/internal/configuration/RegionMapping.java | 18 +----
.../connectors/jdbc/internal/xml/ElementType.java | 1 -
.../xml/JdbcConnectorServiceXmlParser.java | 1 -
.../geode.apache.org/schema/jdbc/jdbc-1.0.xsd | 1 -
.../jdbc/internal/RegionMappingTest.java | 89 +++++++++++-----------
.../internal/cli/CreateMappingFunctionTest.java | 2 +-
.../internal/cli/DescribeMappingFunctionTest.java | 3 -
.../jdbc/internal/cli/ListMappingCommandTest.java | 4 +-
.../jdbc/internal/xml/ElementTypeTest.java | 2 -
14 files changed, 53 insertions(+), 82 deletions(-)
diff --git
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/TestConfigService.java
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/TestConfigService.java
index ebf7593..3caa83f 100644
---
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/TestConfigService.java
+++
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/TestConfigService.java
@@ -53,6 +53,6 @@ public class TestConfigService {
private static RegionMapping createRegionMapping(String pdxClassName, String
ids, String catalog,
String schema) {
return new RegionMapping(REGION_NAME, pdxClassName, REGION_TABLE_NAME,
- CONNECTION_CONFIG_NAME, ids, catalog, schema, null);
+ CONNECTION_CONFIG_NAME, ids, catalog, schema);
}
}
diff --git
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java
index 38fdbe9..8a2023e 100644
---
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java
+++
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java
@@ -205,7 +205,7 @@ public class DescribeMappingCommandDUnitTest implements
Serializable {
InternalCache cache = ClusterStartupRule.getCache();
JdbcConnectorService service =
cache.getService(JdbcConnectorService.class);
service.createRegionMapping(new RegionMapping(TEST_REGION, "myPdxClass",
- "testTable", "connection", "myId", "myCatalog", "mySchema", null));
+ "testTable", "connection", "myId", "myCatalog", "mySchema"));
assertThat(service.getMappingForRegion(TEST_REGION)).isNotNull();
}
}
diff --git
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandDUnitTest.java
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandDUnitTest.java
index 3a9c715..bc4ce9e 100644
---
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandDUnitTest.java
+++
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandDUnitTest.java
@@ -116,7 +116,7 @@ public class ListMappingCommandDUnitTest implements
Serializable {
for (int i = 1; i <= N; i++) {
String name = regionName + "-" + i;
service.createRegionMapping(
- new RegionMapping(name, "x.y.MyPdxClass", "table", "connection",
null, null, null, null));
+ new RegionMapping(name, "x.y.MyPdxClass", "table", "connection",
null, null, null));
assertThat(service.getMappingForRegion(name)).isNotNull();
}
}
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 7ed9490..5511317 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
@@ -115,8 +115,7 @@ public class CreateMappingCommand extends SingleGfshCommand
{
Set<DistributedMember> targetMembers = findMembers(groups, null);
RegionMapping mapping =
- new RegionMapping(regionName, pdxName, table, dataSourceName, id,
catalog, schema,
- groups != null ? String.join(",", groups) : null);
+ new RegionMapping(regionName, pdxName, table, dataSourceName, id,
catalog, schema);
try {
ConfigurationPersistenceService configurationPersistenceService =
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunction.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunction.java
index 8930c3a..2cd9f9e 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunction.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunction.java
@@ -16,7 +16,6 @@ package org.apache.geode.connectors.jdbc.internal.cli;
import static
org.apache.geode.connectors.util.internal.MappingConstants.CATALOG_NAME;
import static
org.apache.geode.connectors.util.internal.MappingConstants.DATA_SOURCE_NAME;
-import static
org.apache.geode.connectors.util.internal.MappingConstants.GROUP_NAME;
import static
org.apache.geode.connectors.util.internal.MappingConstants.ID_NAME;
import static
org.apache.geode.connectors.util.internal.MappingConstants.PDX_NAME;
import static
org.apache.geode.connectors.util.internal.MappingConstants.REGION_NAME;
@@ -71,9 +70,7 @@ public class DescribeMappingFunction extends
CliFunction<String> {
if (mapping.getSchema() != null) {
attributes.put(SCHEMA_NAME, mapping.getSchema());
}
- if (mapping.getGroups() != null) {
- attributes.put(GROUP_NAME, mapping.getGroups());
- }
+
return new DescribeMappingResult(attributes);
}
}
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/configuration/RegionMapping.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/configuration/RegionMapping.java
index 205f1ee..cc668df 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/configuration/RegionMapping.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/configuration/RegionMapping.java
@@ -77,8 +77,6 @@ public class RegionMapping implements CacheElement {
protected String catalog;
@XmlAttribute(name = "schema")
protected String schema;
- @XmlAttribute(name = "groups")
- protected String groups;
@XmlTransient
protected String regionName;
@@ -88,7 +86,7 @@ public class RegionMapping implements CacheElement {
public RegionMapping() {}
public RegionMapping(String regionName, String pdxName, String tableName,
- String dataSourceName, String ids, String catalog, String schema, String
groups) {
+ String dataSourceName, String ids, String catalog, String schema) {
this.regionName = regionName;
this.pdxName = pdxName;
this.tableName = tableName;
@@ -96,7 +94,6 @@ public class RegionMapping implements CacheElement {
this.ids = ids;
this.catalog = catalog;
this.schema = schema;
- this.groups = groups;
}
public void setDataSourceName(String dataSourceName) {
@@ -127,10 +124,6 @@ public class RegionMapping implements CacheElement {
this.schema = schema;
}
- public void setGroups(String groups) {
- this.groups = groups;
- }
-
public String getDataSourceName() {
return dataSourceName;
}
@@ -155,10 +148,6 @@ public class RegionMapping implements CacheElement {
return schema;
}
- public String getGroups() {
- return groups;
- }
-
public String getTableName() {
return tableName;
}
@@ -262,8 +251,7 @@ public class RegionMapping implements CacheElement {
&& isEqual(dataSourceName, that.dataSourceName)
&& isEqual(ids, that.ids)
&& isEqual(catalog, that.catalog)
- && isEqual(schema, that.schema)
- && isEqual(groups, that.groups);
+ && isEqual(schema, that.schema);
}
private static boolean isEqual(String s1, String s2) {
@@ -279,7 +267,6 @@ public class RegionMapping implements CacheElement {
result = 31 * result + (ids != null ? ids.hashCode() : 0);
result = 31 * result + (catalog != null ? catalog.hashCode() : 0);
result = 31 * result + (schema != null ? schema.hashCode() : 0);
- result = 31 * result + (groups != null ? groups.hashCode() : 0);
return result;
}
@@ -293,7 +280,6 @@ public class RegionMapping implements CacheElement {
+ ", ids='" + ids + '\''
+ ", catalog='" + catalog + '\''
+ ", schema='" + schema + '\''
- + ", groups='" + groups + '\''
+ '}';
}
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/ElementType.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/ElementType.java
index e79cd14..c4316ca 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/ElementType.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/ElementType.java
@@ -40,7 +40,6 @@ public enum ElementType {
mapping.setIds(attributes.getValue(JdbcConnectorServiceXmlParser.IDS));
mapping.setCatalog(attributes.getValue(JdbcConnectorServiceXmlParser.CATALOG));
mapping.setSchema(attributes.getValue(JdbcConnectorServiceXmlParser.SCHEMA));
-
mapping.setGroups(attributes.getValue(JdbcConnectorServiceXmlParser.GROUPS));
stack.push(mapping);
}
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlParser.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlParser.java
index 65322cc..900c012 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlParser.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlParser.java
@@ -27,7 +27,6 @@ public class JdbcConnectorServiceXmlParser extends
AbstractXmlParser {
static final String IDS = "ids";
static final String CATALOG = "catalog";
static final String SCHEMA = "schema";
- static final String GROUPS = "groups";
@Override
public String getNamespaceUri() {
diff --git
a/geode-connectors/src/main/resources/META-INF/schemas/geode.apache.org/schema/jdbc/jdbc-1.0.xsd
b/geode-connectors/src/main/resources/META-INF/schemas/geode.apache.org/schema/jdbc/jdbc-1.0.xsd
index 569f6be..366fb81 100644
---
a/geode-connectors/src/main/resources/META-INF/schemas/geode.apache.org/schema/jdbc/jdbc-1.0.xsd
+++
b/geode-connectors/src/main/resources/META-INF/schemas/geode.apache.org/schema/jdbc/jdbc-1.0.xsd
@@ -46,7 +46,6 @@ XML schema for JDBC Connector Service in Geode.
<xsd:attribute type="xsd:string" name="ids" use="optional"/>
<xsd:attribute type="xsd:string" name="catalog"
use="optional"/>
<xsd:attribute type="xsd:string" name="schema" use="optional"/>
- <xsd:attribute type="xsd:string" name="groups" use="optional"/>
</xsd:complexType>
</xsd:element>
</xsd:schema>
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/RegionMappingTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/RegionMappingTest.java
index 833901e..aeaa859 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/RegionMappingTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/RegionMappingTest.java
@@ -52,7 +52,7 @@ public class RegionMappingTest {
@Test
public void initiatedWithNullValues() {
- mapping = new RegionMapping(null, "pdxClassName", null, null, null, null,
null, null);
+ mapping = new RegionMapping(null, "pdxClassName", null, null, null, null,
null);
assertThat(mapping.getTableName()).isNull();
assertThat(mapping.getRegionName()).isNull();
@@ -67,28 +67,28 @@ public class RegionMappingTest {
@Test
public void hasCorrectTableName() {
- mapping = new RegionMapping(null, null, name, null, null, null, null,
null);
+ mapping = new RegionMapping(null, null, name, null, null, null, null);
assertThat(mapping.getTableName()).isEqualTo(name);
}
@Test
public void hasCorrectRegionName() {
- mapping = new RegionMapping(name, null, null, null, null, null, null,
null);
+ mapping = new RegionMapping(name, null, null, null, null, null, null);
assertThat(mapping.getRegionName()).isEqualTo(name);
}
@Test
public void hasCorrectConfigName() {
- mapping = new RegionMapping(null, null, null, name, null, null, null,
null);
+ mapping = new RegionMapping(null, null, null, name, null, null, null);
assertThat(mapping.getDataSourceName()).isEqualTo(name);
}
@Test
public void hasCorrectPdxClassName() {
- mapping = new RegionMapping(null, name, null, null, null, null, null,
null);
+ mapping = new RegionMapping(null, name, null, null, null, null, null);
assertThat(mapping.getPdxName()).isEqualTo(name);
}
@@ -96,7 +96,7 @@ public class RegionMappingTest {
@Test
public void hasCorrectIds() {
String ids = "ids";
- mapping = new RegionMapping(null, null, null, null, ids, null, null, null);
+ mapping = new RegionMapping(null, null, null, null, ids, null, null);
assertThat(mapping.getIds()).isEqualTo(ids);
}
@@ -104,7 +104,7 @@ public class RegionMappingTest {
@Test
public void hasCorrectCatalog() {
String catalog = "catalog";
- mapping = new RegionMapping(null, null, null, null, null, catalog, null,
null);
+ mapping = new RegionMapping(null, null, null, null, null, catalog, null);
assertThat(mapping.getCatalog()).isEqualTo(catalog);
}
@@ -112,14 +112,14 @@ public class RegionMappingTest {
@Test
public void hasCorrectSchema() {
String schema = "schema";
- mapping = new RegionMapping(null, null, null, null, null, null, schema,
null);
+ mapping = new RegionMapping(null, null, null, null, null, null, schema);
assertThat(mapping.getSchema()).isEqualTo(schema);
}
@Test
public void returnsColumnNameIfFieldNotMapped() {
- mapping = new RegionMapping(null, "pdxClassName", null, null, null, null,
null, null);
+ mapping = new RegionMapping(null, "pdxClassName", null, null, null, null,
null);
String columnName = mapping.getColumnNameForField(fieldName1,
mock(TableMetaDataView.class));
@@ -129,7 +129,7 @@ public class RegionMappingTest {
@Test
public void
returnsColumnNameFromTableMetaDataIfFieldNotMappedAndMetaDataMatchesWithCaseDiffering()
{
String metaDataColumnName = fieldName1.toUpperCase();
- mapping = new RegionMapping(null, "pdxClassName", null, null, null, null,
null, null);
+ mapping = new RegionMapping(null, "pdxClassName", null, null, null, null,
null);
TableMetaDataView tableMetaDataView = mock(TableMetaDataView.class);
when(tableMetaDataView.getColumnNames()).thenReturn(Collections.singleton(metaDataColumnName));
@@ -140,7 +140,7 @@ public class RegionMappingTest {
@Test
public void
returnsColumnNameFromTableMetaDataIfFieldNotMappedAndMetaDataMatchesExactly() {
String metaDataColumnName = fieldName1;
- mapping = new RegionMapping(null, "pdxClassName", null, null, null, null,
null, null);
+ mapping = new RegionMapping(null, "pdxClassName", null, null, null, null,
null);
TableMetaDataView tableMetaDataView = mock(TableMetaDataView.class);
when(tableMetaDataView.getColumnNames()).thenReturn(Collections.singleton(metaDataColumnName));
@@ -150,7 +150,7 @@ public class RegionMappingTest {
@Test
public void returnsColumnNameIfFieldNotMappedAndNotInMetaData() {
- mapping = new RegionMapping(null, "pdxClassName", null, null, null, null,
null, null);
+ mapping = new RegionMapping(null, "pdxClassName", null, null, null, null,
null);
TableMetaDataView tableMetaDataView = mock(TableMetaDataView.class);
when(tableMetaDataView.getColumnNames()).thenReturn(Collections.singleton("does
not match"));
@@ -159,7 +159,7 @@ public class RegionMappingTest {
@Test
public void getColumnNameForFieldThrowsIfTwoColumnsMatchField() {
- mapping = new RegionMapping(null, "pdxClassName", null, null, null, null,
null, null);
+ mapping = new RegionMapping(null, "pdxClassName", null, null, null, null,
null);
TableMetaDataView tableMetaDataView = mock(TableMetaDataView.class);
HashSet<String> columnNames =
@@ -175,7 +175,7 @@ public class RegionMappingTest {
@Test
public void throwsIfColumnNotMappedAndPdxClassNameDoesNotExist() {
- mapping = new RegionMapping(null, "pdxClassName", null, null, null, null,
null, null);
+ mapping = new RegionMapping(null, "pdxClassName", null, null, null, null,
null);
TypeRegistry typeRegistry = mock(TypeRegistry.class);
when(typeRegistry.getPdxTypesForClassName("pdxClassName")).thenReturn(Collections.emptySet());
expectedException.expect(JdbcConnectorException.class);
@@ -188,7 +188,7 @@ public class RegionMappingTest {
public void
throwsIfColumnNotMappedAndPdxClassNameDoesExistButHasNoMatchingFields() {
String pdxClassName = "pdxClassName";
String columnName = "columnName";
- mapping = new RegionMapping(null, pdxClassName, null, null, null, null,
null, null);
+ mapping = new RegionMapping(null, pdxClassName, null, null, null, null,
null);
TypeRegistry typeRegistry = mock(TypeRegistry.class);
HashSet<PdxType> pdxTypes = new
HashSet<>(Arrays.asList(mock(PdxType.class)));
when(typeRegistry.getPdxTypesForClassName(pdxClassName)).thenReturn(pdxTypes);
@@ -203,7 +203,7 @@ public class RegionMappingTest {
public void
throwsIfColumnNotMappedAndPdxClassNameDoesExistButHasMoreThanOneMatchingFields()
{
String pdxClassName = "pdxClassName";
String columnName = "columnName";
- mapping = new RegionMapping(null, pdxClassName, null, null, null, null,
null, null);
+ mapping = new RegionMapping(null, pdxClassName, null, null, null, null,
null);
TypeRegistry typeRegistry = mock(TypeRegistry.class);
PdxType pdxType = mock(PdxType.class);
when(pdxType.getFieldNames())
@@ -221,7 +221,7 @@ public class RegionMappingTest {
public void
returnsIfColumnNotMappedAndPdxClassNameDoesExistAndHasOneFieldThatInexactlyMatches()
{
String pdxClassName = "pdxClassName";
String columnName = "columnName";
- mapping = new RegionMapping(null, pdxClassName, null, null, null, null,
null, null);
+ mapping = new RegionMapping(null, pdxClassName, null, null, null, null,
null);
TypeRegistry typeRegistry = mock(TypeRegistry.class);
PdxType pdxType = mock(PdxType.class);
when(pdxType.getFieldNames())
@@ -237,7 +237,7 @@ public class RegionMappingTest {
public void
returnsIfColumnNotMappedAndPdxClassNameDoesExistAndHasOneFieldThatExactlyMatches()
{
String pdxClassName = "pdxClassName";
String columnName = "columnName";
- mapping = new RegionMapping(null, pdxClassName, null, null, null, null,
null, null);
+ mapping = new RegionMapping(null, pdxClassName, null, null, null, null,
null);
TypeRegistry typeRegistry = mock(TypeRegistry.class);
PdxType pdxType = mock(PdxType.class);
when(pdxType.getPdxField(columnName)).thenReturn(mock(PdxField.class));
@@ -250,11 +250,9 @@ public class RegionMappingTest {
@Test
public void verifyTwoDefaultInstancesAreEqual() {
RegionMapping rm1 =
- new RegionMapping("regionName", "pdxClassName", null,
"dataSourceName", null, null, null,
- null);
+ new RegionMapping("regionName", "pdxClassName", null,
"dataSourceName", null, null, null);
RegionMapping rm2 =
- new RegionMapping("regionName", "pdxClassName", null,
"dataSourceName", null, null, null,
- null);
+ new RegionMapping("regionName", "pdxClassName", null,
"dataSourceName", null, null, null);
assertThat(rm1).isEqualTo(rm2);
}
@@ -262,10 +260,10 @@ public class RegionMappingTest {
@Test
public void verifyTwoInstancesThatAreEqualHaveSameHashCode() {
RegionMapping rm1 = new RegionMapping("regionName",
- "pdxClassName", "tableName", "dataSourceName", "ids", "catalog",
"schema", null);
+ "pdxClassName", "tableName", "dataSourceName", "ids", "catalog",
"schema");
RegionMapping rm2 = new RegionMapping("regionName",
- "pdxClassName", "tableName", "dataSourceName", "ids", "catalog",
"schema", null);
+ "pdxClassName", "tableName", "dataSourceName", "ids", "catalog",
"schema");
assertThat(rm1.hashCode()).isEqualTo(rm2.hashCode());
}
@@ -273,29 +271,28 @@ public class RegionMappingTest {
@Test
public void verifyToStringGivenAllAttributes() {
RegionMapping rm = new RegionMapping("regionName", "pdxClassName",
"tableName",
- "dataSourceName", "ids", "catalog", "schema", null);
+ "dataSourceName", "ids", "catalog", "schema");
String result = rm.toString();
assertThat(result).isEqualTo(
- "RegionMapping{regionName='regionName', pdxName='pdxClassName',
tableName='tableName', dataSourceName='dataSourceName', ids='ids',
catalog='catalog', schema='schema', groups='null'}");
+ "RegionMapping{regionName='regionName', pdxName='pdxClassName',
tableName='tableName', dataSourceName='dataSourceName', ids='ids',
catalog='catalog', schema='schema'}");
}
@Test
public void verifyToStringGivenRequiredAttributes() {
RegionMapping rm =
- new RegionMapping("regionName", "pdxClassName", null,
"dataSourceName", null, null, null,
- null);
+ new RegionMapping("regionName", "pdxClassName", null,
"dataSourceName", null, null, null);
String result = rm.toString();
assertThat(result).isEqualTo(
- "RegionMapping{regionName='regionName', pdxName='pdxClassName',
tableName='null', dataSourceName='dataSourceName', ids='null', catalog='null',
schema='null', groups='null'}");
+ "RegionMapping{regionName='regionName', pdxName='pdxClassName',
tableName='null', dataSourceName='dataSourceName', ids='null', catalog='null',
schema='null'}");
}
@Test
public void verifyThatMappingIsEqualToItself() {
- mapping = new RegionMapping(null, "pdxClassName", null, null, null, null,
null, null);
+ mapping = new RegionMapping(null, "pdxClassName", null, null, null, null,
null);
boolean result = mapping.equals(mapping);
assertThat(mapping.hashCode()).isEqualTo(mapping.hashCode());
assertThat(result).isTrue();
@@ -303,14 +300,14 @@ public class RegionMappingTest {
@Test
public void verifyThatNullIsNotEqual() {
- mapping = new RegionMapping(null, null, null, null, null, null, null,
null);
+ mapping = new RegionMapping(null, null, null, null, null, null, null);
boolean result = mapping.equals(null);
assertThat(result).isFalse();
}
@Test
public void verifyOtherClassIsNotEqual() {
- mapping = new RegionMapping(null, null, null, null, null, null, null,
null);
+ mapping = new RegionMapping(null, null, null, null, null, null, null);
boolean result = mapping.equals("not equal");
assertThat(result).isFalse();
}
@@ -318,9 +315,9 @@ public class RegionMappingTest {
@Test
public void verifyMappingWithDifferentRegionNamesAreNotEqual() {
RegionMapping rm1 =
- new RegionMapping(null, null, null, null, null, null, null, null);
+ new RegionMapping(null, null, null, null, null, null, null);
RegionMapping rm2 =
- new RegionMapping("name", null, null, null, null, null, null, null);
+ new RegionMapping("name", null, null, null, null, null, null);
boolean result = rm1.equals(rm2);
assertThat(result).isFalse();
}
@@ -328,9 +325,9 @@ public class RegionMappingTest {
@Test
public void verifyMappingWithDifferentPdxClassNameAreNotEqual() {
RegionMapping rm1 =
- new RegionMapping(null, "pdxClassName", null, null, null, null, null,
null);
+ new RegionMapping(null, "pdxClassName", null, null, null, null, null);
RegionMapping rm2 =
- new RegionMapping(null, "pdxClass", null, null, null, null, null,
null);
+ new RegionMapping(null, "pdxClass", null, null, null, null, null);
boolean result = rm1.equals(rm2);
assertThat(result).isFalse();
}
@@ -338,9 +335,9 @@ public class RegionMappingTest {
@Test
public void verifyMappingWithDifferentTablesAreNotEqual() {
RegionMapping rm1 =
- new RegionMapping(null, "pdxClassName", "table1", null, null, null,
null, null);
+ new RegionMapping(null, "pdxClassName", "table1", null, null, null,
null);
RegionMapping rm2 =
- new RegionMapping(null, "pdxClassName", "table2", null, null, null,
null, null);
+ new RegionMapping(null, "pdxClassName", "table2", null, null, null,
null);
boolean result = rm1.equals(rm2);
assertThat(result).isFalse();
}
@@ -348,9 +345,9 @@ public class RegionMappingTest {
@Test
public void verifyMappingWithDifferentDataSourcesAreNotEqual() {
RegionMapping rm1 =
- new RegionMapping(null, "pdxClassName", null, "datasource1", null,
null, null, null);
+ new RegionMapping(null, "pdxClassName", null, "datasource1", null,
null, null);
RegionMapping rm2 =
- new RegionMapping(null, "pdxClassName", null, "datasource2", null,
null, null, null);
+ new RegionMapping(null, "pdxClassName", null, "datasource2", null,
null, null);
boolean result = rm1.equals(rm2);
assertThat(result).isFalse();
}
@@ -358,9 +355,9 @@ public class RegionMappingTest {
@Test
public void verifyMappingWithDifferentIdsAreNotEqual() {
RegionMapping rm1 =
- new RegionMapping(null, "pdxClassName", null, null, "ids1", null,
null, null);
+ new RegionMapping(null, "pdxClassName", null, null, "ids1", null,
null);
RegionMapping rm2 =
- new RegionMapping(null, "pdxClassName", null, null, "ids2", null,
null, null);
+ new RegionMapping(null, "pdxClassName", null, null, "ids2", null,
null);
boolean result = rm1.equals(rm2);
assertThat(result).isFalse();
}
@@ -368,9 +365,9 @@ public class RegionMappingTest {
@Test
public void verifyMappingWithDifferentCatalogsAreNotEqual() {
RegionMapping rm1 =
- new RegionMapping(null, "pdxClassName", null, null, null, "catalog1",
null, null);
+ new RegionMapping(null, "pdxClassName", null, null, null, "catalog1",
null);
RegionMapping rm2 =
- new RegionMapping(null, "pdxClassName", null, null, null, "catalog2",
null, null);
+ new RegionMapping(null, "pdxClassName", null, null, null, "catalog2",
null);
boolean result = rm1.equals(rm2);
assertThat(result).isFalse();
}
@@ -378,9 +375,9 @@ public class RegionMappingTest {
@Test
public void verifyMappingWithDifferentSchemasAreNotEqual() {
RegionMapping rm1 =
- new RegionMapping(null, "pdxClassName", null, null, null, null,
"schema1", null);
+ new RegionMapping(null, "pdxClassName", null, null, null, null,
"schema1");
RegionMapping rm2 =
- new RegionMapping(null, "pdxClassName", null, null, null, null,
"schema2", null);
+ new RegionMapping(null, "pdxClassName", null, null, null, null,
"schema2");
boolean result = rm1.equals(rm2);
assertThat(result).isFalse();
}
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunctionTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunctionTest.java
index ad65b22..84e9ae4 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunctionTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunctionTest.java
@@ -77,7 +77,7 @@ public class CreateMappingFunctionTest {
distributedMember = mock(DistributedMember.class);
service = mock(JdbcConnectorService.class);
- regionMapping = new RegionMapping(REGION_NAME, null, null, null, null,
null, null, null);
+ regionMapping = new RegionMapping(REGION_NAME, null, null, null, null,
null, null);
when(context.getResultSender()).thenReturn(resultSender);
when(context.getCache()).thenReturn(cache);
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunctionTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunctionTest.java
index 1d0e9db..418cba3 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunctionTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunctionTest.java
@@ -16,7 +16,6 @@ package org.apache.geode.connectors.jdbc.internal.cli;
import static
org.apache.geode.connectors.util.internal.MappingConstants.CATALOG_NAME;
import static
org.apache.geode.connectors.util.internal.MappingConstants.DATA_SOURCE_NAME;
-import static
org.apache.geode.connectors.util.internal.MappingConstants.GROUP_NAME;
import static
org.apache.geode.connectors.util.internal.MappingConstants.ID_NAME;
import static
org.apache.geode.connectors.util.internal.MappingConstants.PDX_NAME;
import static
org.apache.geode.connectors.util.internal.MappingConstants.REGION_NAME;
@@ -96,7 +95,6 @@ public class DescribeMappingFunctionTest {
when(regionMapping.getIds()).thenReturn(TEST_ID);
when(regionMapping.getCatalog()).thenReturn(TEST_CATALOG);
when(regionMapping.getSchema()).thenReturn(TEST_SCHEMA);
- when(regionMapping.getGroups()).thenReturn(TEST_GROUP);
}
@Test
@@ -131,7 +129,6 @@ public class DescribeMappingFunctionTest {
expectedAttributes.put(SYNCHRONOUS_NAME, TEST_SYNCHRONOUS);
expectedAttributes.put(CATALOG_NAME, TEST_CATALOG);
expectedAttributes.put(SCHEMA_NAME, TEST_SCHEMA);
- expectedAttributes.put(GROUP_NAME, TEST_GROUP);
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/ListMappingCommandTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandTest.java
index 3a3d0e6..36ed867 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
@@ -63,9 +63,9 @@ public class ListMappingCommandTest {
null);
RegionMapping mapping1 =
- new RegionMapping("region1", "class1", "table1", "name1", null, null,
null, null);
+ new RegionMapping("region1", "class1", "table1", "name1", null, null,
null);
RegionMapping mapping2 =
- new RegionMapping("region2", "class2", "table2", "name2", null, null,
null, null);
+ new RegionMapping("region2", "class2", "table2", "name2", null, null,
null);
ResultCollector rc = mock(ResultCollector.class);
doReturn(rc).when(command).executeFunction(any(), any(), any(Set.class));
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/ElementTypeTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/ElementTypeTest.java
index 3b3e035..a7c8bf0 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/ElementTypeTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/ElementTypeTest.java
@@ -18,7 +18,6 @@ package org.apache.geode.connectors.jdbc.internal.xml;
import static
org.apache.geode.connectors.jdbc.internal.xml.ElementType.JDBC_MAPPING;
import static
org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.CATALOG;
import static
org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.DATA_SOURCE;
-import static
org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.GROUPS;
import static
org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.IDS;
import static
org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.PDX_NAME;
import static
org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.SCHEMA;
@@ -80,7 +79,6 @@ public class ElementTypeTest {
when(attributes.getValue(IDS)).thenReturn("ids");
when(attributes.getValue(CATALOG)).thenReturn("catalog");
when(attributes.getValue(SCHEMA)).thenReturn("schema");
- when(attributes.getValue(GROUPS)).thenReturn("groups");
when(regionCreation.getFullPath()).thenReturn("/region");
stack.push(regionCreation);
