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 75bf59a15f816f8b63909bcfa4478f9796c22d63 Author: Nick Reich <nre...@pivotal.io> AuthorDate: Mon Apr 2 14:29:34 2018 -0700 GEODE-4947: Cleanup --- .../jdbc/JdbcAsyncWriterIntegrationTest.java | 2 -- .../connectors/jdbc/JdbcLoaderIntegrationTest.java | 2 -- .../connectors/jdbc/JdbcWriterIntegrationTest.java | 1 - .../TableMetaDataManagerIntegrationTest.java | 4 ++-- .../jdbc/internal/TestConfigService.java | 2 -- .../apache/geode/connectors/jdbc/docker/mysql.yml | 28 ---------------------- .../geode/connectors/jdbc/docker/postgres.yml | 27 --------------------- 7 files changed, 2 insertions(+), 64 deletions(-) diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java index 11767eb..0430f71 100644 --- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java +++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java @@ -18,7 +18,6 @@ import static org.apache.geode.cache.RegionShortcut.REPLICATE; import static org.assertj.core.api.Assertions.assertThat; import java.sql.Connection; -import java.sql.DriverManager; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; @@ -64,7 +63,6 @@ public abstract class JdbcAsyncWriterIntegrationTest { cache = (InternalCache) new CacheFactory().set("locators", "").set("mcast-port", "0") .setPdxReadSerialized(false).create(); employees = createRegionWithJDBCAsyncWriter(REGION_TABLE_NAME); - // connection = DriverManager.getConnection(CONNECTION_URL); connection = getConnection(); statement = connection.createStatement(); statement.execute("Create Table " + REGION_TABLE_NAME 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 0a48a9a..6707fdc 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 @@ -19,11 +19,9 @@ import static org.assertj.core.api.Assertions.assertThat; import java.io.IOException; import java.sql.Connection; -import java.sql.DriverManager; import java.sql.PreparedStatement; import java.sql.SQLException; import java.sql.Statement; -import java.time.Instant; import java.util.Date; import org.junit.After; diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcWriterIntegrationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcWriterIntegrationTest.java index 5a489a7..d30b93b 100644 --- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcWriterIntegrationTest.java +++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcWriterIntegrationTest.java @@ -19,7 +19,6 @@ import static com.googlecode.catchexception.CatchException.caughtException; import static org.assertj.core.api.Assertions.assertThat; import java.sql.Connection; -import java.sql.DriverManager; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerIntegrationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerIntegrationTest.java index 02a6584..6ec61f4 100644 --- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerIntegrationTest.java +++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerIntegrationTest.java @@ -33,10 +33,10 @@ import org.apache.geode.test.junit.categories.IntegrationTest; @Category(IntegrationTest.class) public abstract class TableMetaDataManagerIntegrationTest { - protected static final String REGION_TABLE_NAME = "employees"; + private static final String REGION_TABLE_NAME = "employees"; protected static final String DB_NAME = "test"; - protected TableMetaDataManager manager; + private TableMetaDataManager manager; protected Connection connection; protected Statement statement; diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TestConfigService.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TestConfigService.java index cd19d33..4e2aacf 100644 --- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TestConfigService.java +++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TestConfigService.java @@ -26,10 +26,8 @@ import org.apache.geode.internal.cache.extension.ExtensionPoint; * Generates fake JdbcConnectorService with Connections and RegionMappings for tests. */ public class TestConfigService { - // private static final String DB_NAME = "DerbyDB"; private static final String REGION_TABLE_NAME = "employees"; private static final String REGION_NAME = "employees"; - // private static final String CONNECTION_URL = "jdbc:derby:memory:" + DB_NAME + ";create=true"; private static final String CONNECTION_CONFIG_NAME = "testConnectionConfig"; public static JdbcConnectorServiceImpl getTestConfigService(String connectionUrl) diff --git a/geode-connectors/src/test/resources/org/apache/geode/connectors/jdbc/docker/mysql.yml b/geode-connectors/src/test/resources/org/apache/geode/connectors/jdbc/docker/mysql.yml deleted file mode 100644 index 97e1c32..0000000 --- a/geode-connectors/src/test/resources/org/apache/geode/connectors/jdbc/docker/mysql.yml +++ /dev/null @@ -1,28 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -version: '3.1' - -services: - - db: - image: mysql:5.7 - restart: always - ports: - - 3306 - environment: - MYSQL_ALLOW_EMPTY_PASSWORD: "true" - #MYSQL_ROOT_PASSWORD: "secret" \ No newline at end of file diff --git a/geode-connectors/src/test/resources/org/apache/geode/connectors/jdbc/docker/postgres.yml b/geode-connectors/src/test/resources/org/apache/geode/connectors/jdbc/docker/postgres.yml deleted file mode 100644 index 2380b9e..0000000 --- a/geode-connectors/src/test/resources/org/apache/geode/connectors/jdbc/docker/postgres.yml +++ /dev/null @@ -1,27 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -version: '3.1' - -services: - - db: - image: postgres - restart: always - ports: - - 5432 - environment: - POSTGRES_DB: test -- To stop receiving notification emails like this one, please contact aging...@apache.org.