You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ds...@apache.org on 2019/01/28 22:43:00 UTC

[geode] branch feature/GEODE-6291 updated: removed getFieldNameForColumn

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

dschneider pushed a commit to branch feature/GEODE-6291
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/feature/GEODE-6291 by this push:
     new fb4744c  removed getFieldNameForColumn
fb4744c is described below

commit fb4744caf4323e0d422af8c5e7ecb3852bf79561
Author: Darrel Schneider <ds...@pivotal.io>
AuthorDate: Mon Jan 28 14:42:38 2019 -0800

    removed getFieldNameForColumn
---
 .../jdbc/internal/configuration/RegionMapping.java   |  9 ---------
 .../connectors/jdbc/internal/RegionMappingTest.java  | 20 --------------------
 .../jdbc/internal/xml/ElementTypeTest.java           |  1 -
 3 files changed, 30 deletions(-)

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 c7a61b6..eddf2a6 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
@@ -197,15 +197,6 @@ public class RegionMapping implements CacheElement {
         "A field mapping for the pdx field \"" + fieldName + "\" does not exist.");
   }
 
-  public String getFieldNameForColumn(String columnName) {
-    FieldMapping fieldMapping = getFieldMappingByJdbcName(columnName);
-    if (fieldMapping != null) {
-      return fieldMapping.getPdxName();
-    }
-    throw new JdbcConnectorException(
-        "A field mapping for the column \"" + columnName + "\" does not exist.");
-  }
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
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 46a78f3..5f486a5 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
@@ -117,26 +117,6 @@ public class RegionMappingTest {
   }
 
   @Test
-  public void getFieldNameForColumnThrowsIfColumnNotMapped() {
-    mapping = new RegionMapping(null, "pdxClassName", null, null, null, null, null);
-    expectedException.expect(JdbcConnectorException.class);
-    expectedException
-        .expectMessage("A field mapping for the column \"columnName\" does not exist.");
-
-    mapping.getFieldNameForColumn("columnName");
-  }
-
-  @Test
-  public void getFieldNameForColumnReturnsFieldNameIfMapped() {
-    String pdxClassName = "pdxClassName";
-    String columnName = "columnName";
-    mapping = new RegionMapping(null, pdxClassName, null, null, null, null, null);
-    mapping.addFieldMapping(new FieldMapping(pdxClassName, null, columnName, null, false));
-
-    assertThat(mapping.getFieldNameForColumn(columnName)).isEqualTo(pdxClassName);
-  }
-
-  @Test
   public void getColumnNameForFieldReturnsColumnNameIfMapped() {
     String pdxClassName = "pdxClassName";
     String columnName = "columnName";
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 41670b4..ab4e960 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
@@ -136,7 +136,6 @@ public class ElementTypeTest {
 
     RegionMapping mapping1 = (RegionMapping) stack.pop();
     assertThat(mapping1.getColumnNameForField("myPdxName")).isEqualTo("myJdbcName");
-    assertThat(mapping1.getFieldNameForColumn("myJdbcName")).isEqualTo("myPdxName");
     assertThat(mapping1.getFieldMappingByJdbcName("myJdbcName")).isEqualTo(expected);
     assertThat(mapping1.getFieldMappingByPdxName("myPdxName")).isEqualTo(expected);
   }