This is an automated email from the ASF dual-hosted git repository. agingade pushed a commit to branch feature/GEODE-4947 in repository https://gitbox.apache.org/repos/asf/geode.git
commit eeb10b351308ecdcfadba38486a998b2303b22fd Author: Nick Reich <nre...@pivotal.io> AuthorDate: Wed Mar 28 15:40:30 2018 -0700 GEODE-4947: Fix spotless formatting --- .../geode/connectors/jdbc/JdbcDistributedTest.java | 72 +++++++++++----------- .../connectors/jdbc/JdbcLoaderIntegrationTest.java | 4 +- .../connectors/jdbc/MySqlJdbcDistributedTest.java | 14 ++--- .../jdbc/MySqlJdbcLoaderIntegrationTest.java | 13 ++-- .../jdbc/PostgresJdbcDistributedTest.java | 14 ++--- .../jdbc/PostgresJdbcLoaderIntegrationTest.java | 9 ++- .../jdbc/internal/SqlStatementFactoryTest.java | 13 ++-- 7 files changed, 69 insertions(+), 70 deletions(-) diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java index 3688f5d..cfd6562 100644 --- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java +++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java @@ -97,33 +97,32 @@ public abstract class JdbcDistributedTest implements Serializable { private void createTable() throws SQLException { server = startupRule.startServerVM(1, x -> x.withConnectionToLocator(locator.getPort())); - Connection connection = getConnection(); - Statement statement = connection.createStatement(); - statement.execute("Create Table " + TABLE_NAME - + " (id varchar(10) primary key not null, name varchar(10), age int)"); + Connection connection = getConnection(); + Statement statement = connection.createStatement(); + statement.execute("Create Table " + TABLE_NAME + + " (id varchar(10) primary key not null, name varchar(10), age int)"); } private void createTableForAllSupportedFields() throws SQLException { server = startupRule.startServerVM(1, x -> x.withConnectionToLocator(locator.getPort()).withPDXReadSerialized()); - Connection connection = getConnection(); - Statement statement = connection.createStatement(); - createSupportedFieldsTable(statement, TABLE_NAME); + Connection connection = getConnection(); + Statement statement = connection.createStatement(); + createSupportedFieldsTable(statement, TABLE_NAME); } protected abstract void createSupportedFieldsTable(Statement statement, String tableName) throws SQLException; private void insertNullDataForAllSupportedFieldsTable(String key) throws SQLException { - Connection connection = DriverManager.getConnection(connectionUrl); + Connection connection = DriverManager.getConnection(connectionUrl); - String insertQuery = - "Insert into " + TABLE_NAME + " values (" + "?,?,?,?,?,?,?,?,?,?,?,?,?)"; - System.out.println("### Query is :" + insertQuery); - PreparedStatement statement = connection.prepareStatement(insertQuery); + String insertQuery = "Insert into " + TABLE_NAME + " values (" + "?,?,?,?,?,?,?,?,?,?,?,?,?)"; + System.out.println("### Query is :" + insertQuery); + PreparedStatement statement = connection.prepareStatement(insertQuery); createNullStatement(key, statement); - statement.execute(); + statement.execute(); } protected abstract void createNullStatement(String key, PreparedStatement statement) @@ -131,35 +130,36 @@ public abstract class JdbcDistributedTest implements Serializable { private void insertDataForAllSupportedFieldsTable(String key, ClassWithSupportedPdxFields data) throws SQLException { - Connection connection = DriverManager.getConnection(connectionUrl); + Connection connection = DriverManager.getConnection(connectionUrl); - String insertQuery = - "Insert into " + TABLE_NAME + " values (" + "?,?,?,?,?,?,?,?,?,?,?,?,?)"; - System.out.println("### Query is :" + insertQuery); - PreparedStatement statement = connection.prepareStatement(insertQuery); - statement.setObject(1, key); - statement.setObject(2, data.isAboolean()); - statement.setObject(3, data.getAbyte()); - statement.setObject(4, data.getAshort()); - statement.setObject(5, data.getAnint()); - statement.setObject(6, data.getAlong()); - statement.setObject(7, data.getAfloat()); - statement.setObject(8, data.getAdouble()); - statement.setObject(9, data.getAstring()); - statement.setObject(10, new java.sql.Timestamp(data.getAdate().getTime())); - statement.setObject(11, data.getAnobject()); - statement.setObject(12, data.getAbytearray()); - statement.setObject(13, new Character(data.getAchar()).toString()); - - statement.execute(); + String insertQuery = "Insert into " + TABLE_NAME + " values (" + "?,?,?,?,?,?,?,?,?,?,?,?,?)"; + System.out.println("### Query is :" + insertQuery); + PreparedStatement statement = connection.prepareStatement(insertQuery); + statement.setObject(1, key); + statement.setObject(2, data.isAboolean()); + statement.setObject(3, data.getAbyte()); + statement.setObject(4, data.getAshort()); + statement.setObject(5, data.getAnint()); + statement.setObject(6, data.getAlong()); + statement.setObject(7, data.getAfloat()); + statement.setObject(8, data.getAdouble()); + statement.setObject(9, data.getAstring()); + statement.setObject(10, new java.sql.Timestamp(data.getAdate().getTime())); + statement.setObject(11, data.getAnobject()); + statement.setObject(12, data.getAbytearray()); + statement.setObject(13, new Character(data.getAchar()).toString()); + + statement.execute(); } @After public void tearDown() throws Exception { closeDB(); - /*server.invoke(() -> { - closeDB(); - });*/ + /* + * server.invoke(() -> { + * closeDB(); + * }); + */ } private void closeDB() throws SQLException { diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcLoaderIntegrationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcLoaderIntegrationTest.java index 1e14c6d..0a48a9a 100644 --- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcLoaderIntegrationTest.java +++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcLoaderIntegrationTest.java @@ -85,8 +85,8 @@ public abstract class JdbcLoaderIntegrationTest { public abstract String getConnectionUrl(); - protected abstract void createClassWithSupportedPdxFieldsTable(Statement statement, String tableName) - throws SQLException; + protected abstract void createClassWithSupportedPdxFieldsTable(Statement statement, + String tableName) throws SQLException; private void createEmployeeTable() throws Exception { statement.execute("Create Table " + REGION_TABLE_NAME diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcDistributedTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcDistributedTest.java index c86748d..fc1f655 100644 --- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcDistributedTest.java +++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcDistributedTest.java @@ -34,7 +34,8 @@ import org.apache.geode.test.junit.rules.SqlDatabaseConnectionRule; public class MySqlJdbcDistributedTest extends JdbcDistributedTest { @ClassRule - public static transient SqlDatabaseConnectionRule dbRule = createConnectionRule();// = new MySqlConnectionRule.Builder().file("src/test/resources/docker/mysql.yml").serviceName("db").port(3306).database(DB_NAME).build(); + public static transient SqlDatabaseConnectionRule dbRule = createConnectionRule();// = new + // MySqlConnectionRule.Builder().file("src/test/resources/docker/mysql.yml").serviceName("db").port(3306).database(DB_NAME).build(); private static SqlDatabaseConnectionRule createConnectionRule() { try { @@ -58,12 +59,11 @@ public class MySqlJdbcDistributedTest extends JdbcDistributedTest { @Override protected void createSupportedFieldsTable(Statement statement, String tableName) throws SQLException { - statement - .execute("CREATE TABLE " + tableName + " (id varchar(10) primary key not null, " - + "aboolean smallint, " + "abyte smallint, " + "ashort smallint, " + "anint int, " - + "along bigint, " + "aFloat float, " + "ADOUBLE double, " - + "astring varchar(10), " + "adate datetime, " + "anobject varchar(20), " - + "abytearray blob(100), " + "achar char(1))"); + statement.execute("CREATE TABLE " + tableName + " (id varchar(10) primary key not null, " + + "aboolean smallint, " + "abyte smallint, " + "ashort smallint, " + "anint int, " + + "along bigint, " + "aFloat float, " + "ADOUBLE double, " + "astring varchar(10), " + + "adate datetime, " + "anobject varchar(20), " + "abytearray blob(100), " + + "achar char(1))"); } @Override diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcLoaderIntegrationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcLoaderIntegrationTest.java index 1eb8e07..c59cc41 100644 --- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcLoaderIntegrationTest.java +++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcLoaderIntegrationTest.java @@ -46,9 +46,10 @@ public class MySqlJdbcLoaderIntegrationTest extends JdbcLoaderIntegrationTest { @Override protected void createClassWithSupportedPdxFieldsTable(Statement statement, String tableName) throws SQLException { - statement.execute("CREATE TABLE " + tableName - + " (id varchar(10) primary key not null, " + "aboolean smallint, " + "abyte smallint, " - + "ashort smallint, " + "anint int, " + "along bigint, " + "afloat float, " - + "adouble float, " + "astring varchar(10), " + "adate datetime, " - + "anobject varchar(20), " + "abytearray blob(100), " + "achar char(1))"); - }} + statement.execute("CREATE TABLE " + tableName + " (id varchar(10) primary key not null, " + + "aboolean smallint, " + "abyte smallint, " + "ashort smallint, " + "anint int, " + + "along bigint, " + "afloat float, " + "adouble float, " + "astring varchar(10), " + + "adate datetime, " + "anobject varchar(20), " + "abytearray blob(100), " + + "achar char(1))"); + } +} diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcDistributedTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcDistributedTest.java index 8a91407..04c1a4f 100644 --- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcDistributedTest.java +++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcDistributedTest.java @@ -34,7 +34,8 @@ import org.apache.geode.test.junit.rules.SqlDatabaseConnectionRule; public class PostgresJdbcDistributedTest extends JdbcDistributedTest { @ClassRule - public static transient SqlDatabaseConnectionRule dbRule = createConnectionRule();// = new MySqlConnectionRule.Builder().file("src/test/resources/docker/mysql.yml").serviceName("db").port(3306).database(DB_NAME).build(); + public static transient SqlDatabaseConnectionRule dbRule = createConnectionRule();// = new + // MySqlConnectionRule.Builder().file("src/test/resources/docker/mysql.yml").serviceName("db").port(3306).database(DB_NAME).build(); private static SqlDatabaseConnectionRule createConnectionRule() { try { @@ -58,12 +59,11 @@ public class PostgresJdbcDistributedTest extends JdbcDistributedTest { @Override protected void createSupportedFieldsTable(Statement statement, String tableName) throws SQLException { - statement - .execute("CREATE TABLE " + tableName + " (id varchar(10) primary key not null, " - + "aboolean boolean, " + "abyte smallint, " + "ashort smallint, " + "anint int, " - + "along bigint, " + "aFloat float, " + "ADOUBLE double precision, " - + "astring varchar(10), " + "adate timestamp, " + "anobject varchar(20), " - + "abytearray bytea, " + "achar char(1))"); + statement.execute("CREATE TABLE " + tableName + " (id varchar(10) primary key not null, " + + "aboolean boolean, " + "abyte smallint, " + "ashort smallint, " + "anint int, " + + "along bigint, " + "aFloat float, " + "ADOUBLE double precision, " + + "astring varchar(10), " + "adate timestamp, " + "anobject varchar(20), " + + "abytearray bytea, " + "achar char(1))"); } @Override diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcLoaderIntegrationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcLoaderIntegrationTest.java index 62a1b14..e9e4115 100644 --- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcLoaderIntegrationTest.java +++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcLoaderIntegrationTest.java @@ -46,10 +46,9 @@ public class PostgresJdbcLoaderIntegrationTest extends JdbcLoaderIntegrationTest @Override protected void createClassWithSupportedPdxFieldsTable(Statement statement, String tableName) throws SQLException { - statement.execute("CREATE TABLE " + tableName - + " (id varchar(10) primary key not null, " + "aboolean boolean, " + "abyte smallint, " - + "ashort smallint, " + "anint int, " + "along bigint, " + "afloat float, " - + "adouble float, " + "astring varchar(10), " + "adate timestamp, " - + "anobject varchar(20), " + "abytearray bytea, " + "achar char(1))"); + statement.execute("CREATE TABLE " + tableName + " (id varchar(10) primary key not null, " + + "aboolean boolean, " + "abyte smallint, " + "ashort smallint, " + "anint int, " + + "along bigint, " + "afloat float, " + "adouble float, " + "astring varchar(10), " + + "adate timestamp, " + "anobject varchar(20), " + "abytearray bytea, " + "achar char(1))"); } } diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlStatementFactoryTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlStatementFactoryTest.java index 59636f9..b8bdbc2 100644 --- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlStatementFactoryTest.java +++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlStatementFactoryTest.java @@ -67,9 +67,9 @@ public class SqlStatementFactoryTest { @Test public void getUpdateSqlString() throws Exception { - String expectedStatement = String.format( - "UPDATE %s SET %s = ?, %s = ? WHERE %s = ?", TABLE_NAME, - columnValues.get(0).getColumnName(), columnValues.get(2).getColumnName(), KEY_COLUMN_NAME); + String expectedStatement = String.format("UPDATE %s SET %s = ?, %s = ? WHERE %s = ?", + TABLE_NAME, columnValues.get(0).getColumnName(), columnValues.get(2).getColumnName(), + KEY_COLUMN_NAME); String statement = factory.createUpdateSqlString(TABLE_NAME, columnValues); @@ -78,10 +78,9 @@ public class SqlStatementFactoryTest { @Test public void getInsertSqlString() throws Exception { - String expectedStatement = - String.format("INSERT INTO %s (%s, %s, %s) VALUES (?,?,?)", TABLE_NAME, - columnValues.get(0).getColumnName(), columnValues.get(1).getColumnName(), - columnValues.get(2).getColumnName()); + String expectedStatement = String.format("INSERT INTO %s (%s, %s, %s) VALUES (?,?,?)", + TABLE_NAME, columnValues.get(0).getColumnName(), columnValues.get(1).getColumnName(), + columnValues.get(2).getColumnName()); String statement = factory.createInsertSqlString(TABLE_NAME, columnValues); -- To stop receiving notification emails like this one, please contact aging...@apache.org.