This is an automated email from the ASF dual-hosted git repository.
dschneider pushed a commit to branch feature/GEODE-6194
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-6194 by this
push:
new cf9045f code now compiles and spotless is happy
cf9045f is described below
commit cf9045fdf721a808991b05ab25ad32886820b9ea
Author: Darrel Schneider <[email protected]>
AuthorDate: Thu Dec 13 11:35:26 2018 -0800
code now compiles and spotless is happy
---
.../TableMetaDataManagerIntegrationTest.java | 14 +++++++------
.../geode/connectors/jdbc/internal/SqlHandler.java | 2 +-
.../jdbc/internal/TableMetaDataManager.java | 23 +++++++++++-----------
.../jdbc/internal/TableMetaDataManagerTest.java | 15 ++++++++------
4 files changed, 30 insertions(+), 24 deletions(-)
diff --git
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerIntegrationTest.java
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerIntegrationTest.java
index b86eb9f..485745e 100644
---
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerIntegrationTest.java
+++
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerIntegrationTest.java
@@ -23,6 +23,8 @@ import java.sql.DatabaseMetaData;
import java.sql.SQLException;
import java.sql.Statement;
import java.sql.Types;
+import java.util.Arrays;
+import java.util.List;
import org.junit.After;
import org.junit.Before;
@@ -85,9 +87,9 @@ public abstract class TableMetaDataManagerIntegrationTest {
createTable();
TableMetaDataView metaData = manager.getTableMetaDataView(connection,
REGION_TABLE_NAME, null);
- String keyColumnName = metaData.getKeyColumnNames();
+ List<String> keyColumnNames = metaData.getKeyColumnNames();
- assertThat(keyColumnName).isEqualTo("id");
+ assertThat(keyColumnNames).isEqualTo(Arrays.asList("id"));
}
@Test
@@ -96,9 +98,9 @@ public abstract class TableMetaDataManagerIntegrationTest {
TableMetaDataView metaData =
manager.getTableMetaDataView(connection, REGION_TABLE_NAME,
"nonprimaryid");
- String keyColumnName = metaData.getKeyColumnNames();
+ List<String> keyColumnNames = metaData.getKeyColumnNames();
- assertThat(keyColumnName).isEqualTo("nonprimaryid");
+ assertThat(keyColumnNames).isEqualTo(Arrays.asList("nonprimaryid"));
}
@Test
@@ -107,9 +109,9 @@ public abstract class TableMetaDataManagerIntegrationTest {
TableMetaDataView metaData =
manager.getTableMetaDataView(connection, REGION_TABLE_NAME,
"NonPrimaryId");
- String keyColumnName = metaData.getKeyColumnNames();
+ List<String> keyColumnNames = metaData.getKeyColumnNames();
- assertThat(keyColumnName).isEqualTo("NonPrimaryId");
+ assertThat(keyColumnNames).isEqualTo(Arrays.asList("NonPrimaryId"));
}
@Test
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 06baf64..2b7a316 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
@@ -230,7 +230,7 @@ public class SqlHandler {
<K> EntryColumnData getEntryColumnData(TableMetaDataView tableMetaData,
RegionMapping regionMapping, K key, PdxInstance value, Operation
operation) {
- String keyColumnName = "ERROR";//tableMetaData.getKeyColumnNames();
+ String keyColumnName = "ERROR";// tableMetaData.getKeyColumnNames();
ColumnData keyColumnData =
new ColumnData(keyColumnName, key,
tableMetaData.getColumnDataType(keyColumnName));
List<ColumnData> valueColumnData = null;
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManager.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManager.java
index bd6f779..f5f9b16 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManager.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManager.java
@@ -14,13 +14,13 @@
*/
package org.apache.geode.connectors.jdbc.internal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -88,25 +88,26 @@ public class TableMetaDataManager {
return result;
}
- private List<String> getPrimaryKeyColumnNamesFromMetaData(String tableName,
DatabaseMetaData metaData,
- String ids)
+ private List<String> getPrimaryKeyColumnNamesFromMetaData(String tableName,
+ DatabaseMetaData metaData,
+ String ids)
throws SQLException {
List<String> keys = new ArrayList<>();
if (ids != null && !ids.isEmpty()) {
keys.addAll(Arrays.asList(ids.split(",")));
- for( String key : keys) {
+ for (String key : keys) {
checkColumnExistsInTable(tableName, metaData, key);
}
} else {
try (ResultSet primaryKeys = metaData.getPrimaryKeys(null, null,
tableName)) {
- while(primaryKeys.next()) {
+ while (primaryKeys.next()) {
String key = primaryKeys.getString("COLUMN_NAME");
keys.add(key);
}
if (keys.isEmpty()) {
throw new JdbcConnectorException(
- "The table " + tableName + " does not have a primary key
column.");
+ "The table " + tableName + " does not have a primary key
column.");
}
}
}
@@ -140,9 +141,9 @@ public class TableMetaDataManager {
if (caseInsensitiveMatches > 1) {
throw new JdbcConnectorException(
"The table " + tableName + " has more than one column that matches "
+ columnName);
- } else if(caseInsensitiveMatches == 0) {
- throw new JdbcConnectorException(
- "The table " + tableName + " does not have a column named " +
columnName);
+ } else if (caseInsensitiveMatches == 0) {
+ throw new JdbcConnectorException(
+ "The table " + tableName + " does not have a column named " +
columnName);
}
}
}
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerTest.java
index b159b0f..9ce9874 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerTest.java
@@ -141,15 +141,17 @@ public class TableMetaDataManagerTest {
@Test
public void
givenFourColumnsAndCompositeIdsThenOnlyKeyColumnNamesAreReturned()
- throws Exception {
+ throws Exception {
setupTableMetaData();
when(columnResultSet.next()).thenReturn(true).thenReturn(true).thenReturn(true)
- .thenReturn(true).thenReturn(false);
-
when(columnResultSet.getString("COLUMN_NAME")).thenReturn("LeadingNonKeyColumn").thenReturn(KEY_COLUMN).thenReturn(KEY_COLUMN2)
- .thenReturn("NonKeyColumn");
+ .thenReturn(true).thenReturn(false);
+
when(columnResultSet.getString("COLUMN_NAME")).thenReturn("LeadingNonKeyColumn")
+ .thenReturn(KEY_COLUMN).thenReturn(KEY_COLUMN2)
+ .thenReturn("NonKeyColumn");
TableMetaDataView data =
- tableMetaDataManager.getTableMetaDataView(connection, TABLE_NAME,
KEY_COLUMN + "," + KEY_COLUMN2);
+ tableMetaDataManager.getTableMetaDataView(connection, TABLE_NAME,
+ KEY_COLUMN + "," + KEY_COLUMN2);
assertThat(data.getKeyColumnNames()).isEqualTo(Arrays.asList(KEY_COLUMN,
KEY_COLUMN2));
}
@@ -377,7 +379,8 @@ public class TableMetaDataManagerTest {
}
private void setupCompositePrimaryKeysMetaData() throws SQLException {
-
when(primaryKeysResultSet.getString("COLUMN_NAME")).thenReturn(KEY_COLUMN).thenReturn(KEY_COLUMN2);
+ when(primaryKeysResultSet.getString("COLUMN_NAME")).thenReturn(KEY_COLUMN)
+ .thenReturn(KEY_COLUMN2);
when(primaryKeysResultSet.next()).thenReturn(true).thenReturn(true).thenReturn(false);
setupTableMetaData();
}
