diff --git a/pom.xml b/pom.xml index ff14770..096a8f4 100644 --- a/pom.xml +++ b/pom.xml @@ -5,33 +5,23 @@ 4.0.0 com.nesscomputing - ness-oss-parent - 34 + ness-root + 1.0-SNAPSHOT - - scm:git:git://github.com/NessComputing/components-ness-pg.git - scm:git:git@github.com:NessComputing/components-ness-pg.git - http://github.com/NessComputing/components-ness-pg - HEAD - - com.nesscomputing.components ness-pg-embedded - 2.6.2-SNAPSHOT Embedded PostgreSQL driver - + com.nesscomputing.components ness-config - 2.3.0 org.jdbi jdbi - 2.38.1 @@ -39,7 +29,6 @@ slf4j-api - com.google.guava guava @@ -65,29 +54,25 @@ commons-configuration - com.google.code.findbugs - jsr305 + annotations true - postgresql + org.postgresql postgresql - 9.1-901-1.jdbc4 com.nesscomputing.migratory migratory-core - 3.1.1 com.nesscomputing.components ness-integration-testing - 3.3.0 true @@ -99,8 +84,8 @@ - com.nesscomputing.testing - kawala-lessio + org.kitei.testing + kitei-lessio provided true @@ -114,7 +99,6 @@ org.mockito mockito-core - 1.9.0 test diff --git a/src/main/java/com/nesscomputing/db/postgres/embedded/EmbeddedPostgreSQL.java b/src/main/java/com/nesscomputing/db/postgres/embedded/EmbeddedPostgreSQL.java index 8ad26ab..d36d4bd 100644 --- a/src/main/java/com/nesscomputing/db/postgres/embedded/EmbeddedPostgreSQL.java +++ b/src/main/java/com/nesscomputing/db/postgres/embedded/EmbeddedPostgreSQL.java @@ -239,9 +239,9 @@ private void checkReady() throws SQLException try (final Connection c = getPostgresDatabase().getConnection()) { try (final Statement s = c.createStatement()) { try (final ResultSet rs = s.executeQuery("SELECT 1")) { // NOPMD - Preconditions.checkState(rs.next() == true, "expecting single row"); + Preconditions.checkState(rs.next(), "expecting single row"); Preconditions.checkState(1 == rs.getInt(1), "expecting 1"); - Preconditions.checkState(rs.next() == false, "expecting single row"); + Preconditions.checkState(!rs.next(), "expecting single row"); } } } diff --git a/src/main/java/com/nesscomputing/db/postgres/embedded/EmbeddedPostgreSQLController.java b/src/main/java/com/nesscomputing/db/postgres/embedded/EmbeddedPostgreSQLController.java index eb0e735..19ba600 100644 --- a/src/main/java/com/nesscomputing/db/postgres/embedded/EmbeddedPostgreSQLController.java +++ b/src/main/java/com/nesscomputing/db/postgres/embedded/EmbeddedPostgreSQLController.java @@ -35,12 +35,6 @@ import com.google.common.collect.Maps; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import org.apache.commons.configuration.MapConfiguration; -import org.apache.commons.lang3.RandomStringUtils; -import org.skife.jdbi.v2.DBI; -import org.skife.jdbi.v2.Handle; -import org.skife.jdbi.v2.tweak.HandleCallback; - import com.nesscomputing.config.Config; import com.nesscomputing.migratory.Migratory; import com.nesscomputing.migratory.MigratoryConfig; @@ -48,6 +42,12 @@ import com.nesscomputing.migratory.locator.AbstractSqlResourceLocator; import com.nesscomputing.migratory.migration.MigrationPlan; +import org.apache.commons.configuration.MapConfiguration; +import org.apache.commons.lang3.RandomStringUtils; +import org.skife.jdbi.v2.DBI; +import org.skife.jdbi.v2.Handle; +import org.skife.jdbi.v2.tweak.HandleCallback; + public class EmbeddedPostgreSQLController { private static final String JDBC_FORMAT = "jdbc:postgresql://localhost:%d/%s"; @@ -74,7 +74,7 @@ public EmbeddedPostgreSQLController(URI baseUrl, String[] personalities) * Each schema set has its own database cluster. The template1 database has the schema preloaded so that * each test case need only create a new database and not re-invoke Migratory. */ - private synchronized static Cluster getCluster(URI baseUrl, String[] personalities) throws IOException + private static synchronized Cluster getCluster(URI baseUrl, String[] personalities) throws IOException { final Entry> key = Maps.immutableEntry(baseUrl, (Set)ImmutableSet.copyOf(personalities)); diff --git a/src/main/java/com/nesscomputing/db/postgres/embedded/EmbeddedPostgreSQLRule.java b/src/main/java/com/nesscomputing/db/postgres/embedded/EmbeddedPostgreSQLRule.java index e65bc57..4cbf156 100644 --- a/src/main/java/com/nesscomputing/db/postgres/embedded/EmbeddedPostgreSQLRule.java +++ b/src/main/java/com/nesscomputing/db/postgres/embedded/EmbeddedPostgreSQLRule.java @@ -17,10 +17,10 @@ import java.io.IOException; -import org.junit.rules.ExternalResource; - import com.google.common.base.Preconditions; -import com.nesscomputing.testing.lessio.AllowAll; + +import org.junit.rules.ExternalResource; +import org.kitei.testing.lessio.AllowAll; @AllowAll public class EmbeddedPostgreSQLRule extends ExternalResource diff --git a/src/main/java/com/nesscomputing/db/postgres/junit/EmbeddedPostgresRules.java b/src/main/java/com/nesscomputing/db/postgres/junit/EmbeddedPostgresRules.java index b270791..2b2ea39 100644 --- a/src/main/java/com/nesscomputing/db/postgres/junit/EmbeddedPostgresRules.java +++ b/src/main/java/com/nesscomputing/db/postgres/junit/EmbeddedPostgresRules.java @@ -21,10 +21,6 @@ import javax.annotation.Nonnull; -import org.junit.rules.TestRule; - -import com.nesscomputing.config.Config; - public class EmbeddedPostgresRules { /** diff --git a/src/main/java/com/nesscomputing/db/postgres/junit/EmbeddedPostgresTestDatabaseRule.java b/src/main/java/com/nesscomputing/db/postgres/junit/EmbeddedPostgresTestDatabaseRule.java index 337bd00..d9f37ed 100644 --- a/src/main/java/com/nesscomputing/db/postgres/junit/EmbeddedPostgresTestDatabaseRule.java +++ b/src/main/java/com/nesscomputing/db/postgres/junit/EmbeddedPostgresTestDatabaseRule.java @@ -17,11 +17,11 @@ import java.net.URI; -import org.junit.rules.ExternalResource; - import com.nesscomputing.config.Config; import com.nesscomputing.db.postgres.embedded.EmbeddedPostgreSQLController; -import com.nesscomputing.testing.lessio.AllowAll; + +import org.junit.rules.ExternalResource; +import org.kitei.testing.lessio.AllowAll; @AllowAll public class EmbeddedPostgresTestDatabaseRule extends ExternalResource diff --git a/src/test/java/com/nesscomputing/db/postgres/embedded/EmbeddedPostgreSQLRuleTest.java b/src/test/java/com/nesscomputing/db/postgres/embedded/EmbeddedPostgreSQLRuleTest.java index 6ff5e88..c981dd7 100644 --- a/src/test/java/com/nesscomputing/db/postgres/embedded/EmbeddedPostgreSQLRuleTest.java +++ b/src/test/java/com/nesscomputing/db/postgres/embedded/EmbeddedPostgreSQLRuleTest.java @@ -25,9 +25,7 @@ import org.junit.Rule; import org.junit.Test; - -import com.nesscomputing.db.postgres.embedded.EmbeddedPostgreSQLRule; -import com.nesscomputing.testing.lessio.AllowNetworkAccess; +import org.kitei.testing.lessio.AllowNetworkAccess; @AllowNetworkAccess(endpoints = {"127.0.0.1:*"}) public class EmbeddedPostgreSQLRuleTest diff --git a/src/test/java/com/nesscomputing/db/postgres/embedded/EmbeddedPostgreSQLTest.java b/src/test/java/com/nesscomputing/db/postgres/embedded/EmbeddedPostgreSQLTest.java index b9719aa..444f8b8 100644 --- a/src/test/java/com/nesscomputing/db/postgres/embedded/EmbeddedPostgreSQLTest.java +++ b/src/test/java/com/nesscomputing/db/postgres/embedded/EmbeddedPostgreSQLTest.java @@ -24,15 +24,13 @@ import java.sql.Statement; import org.junit.Test; - -import com.nesscomputing.db.postgres.embedded.EmbeddedPostgreSQL; -import com.nesscomputing.testing.lessio.AllowExternalProcess; -import com.nesscomputing.testing.lessio.AllowLocalFileAccess; -import com.nesscomputing.testing.lessio.AllowNetworkAccess; -import com.nesscomputing.testing.lessio.AllowNetworkListen; +import org.kitei.testing.lessio.AllowExternalProcess; +import org.kitei.testing.lessio.AllowTmpDirAccess; +import org.kitei.testing.lessio.AllowNetworkAccess; +import org.kitei.testing.lessio.AllowNetworkListen; @AllowExternalProcess -@AllowLocalFileAccess(paths = {"*"}) +@AllowTmpDirAccess @AllowNetworkListen(ports = {0}) @AllowNetworkAccess(endpoints = {"127.0.0.1:*"}) public class EmbeddedPostgreSQLTest diff --git a/src/test/java/com/nesscomputing/db/postgres/embedded/IsolationTest.java b/src/test/java/com/nesscomputing/db/postgres/embedded/IsolationTest.java index 8740151..bc9e848 100644 --- a/src/test/java/com/nesscomputing/db/postgres/embedded/IsolationTest.java +++ b/src/test/java/com/nesscomputing/db/postgres/embedded/IsolationTest.java @@ -21,9 +21,7 @@ import org.junit.Rule; import org.junit.Test; - -import com.nesscomputing.db.postgres.embedded.EmbeddedPostgreSQLRule; -import com.nesscomputing.testing.lessio.AllowNetworkAccess; +import org.kitei.testing.lessio.AllowNetworkAccess; @AllowNetworkAccess(endpoints = {"127.0.0.1:*"}) public class IsolationTest