#27 remove dependency on apache commons and guava libraries

Author: tomix26

build.gradle

@@ -3,6 +3,7 @@ import java.util.regex.Matcher
 plugins {
     id 'net.researchgate.release' version '2.8.1'
     id 'nebula.optional-base' version '5.0.1'
+    id 'com.github.johnrengelman.shadow' version '6.1.0'
 }
 
 ext {
@@ -188,6 +189,8 @@ project(':embedded-database-spring-test-autoconfigure') {
 }
 
 project(':embedded-database-spring-test') {
+    apply plugin: 'com.github.johnrengelman.shadow'
+
     dependencies {
         compile project(':embedded-database-spring-test-autoconfigure')
 
@@ -212,10 +215,8 @@ project(':embedded-database-spring-test') {
 
         compile 'org.springframework:spring-context:5.0.13.RELEASE'
         compile 'org.springframework:spring-test:5.0.13.RELEASE'
-        compile 'com.google.guava:guava:23.0'
 
-        compile 'org.apache.commons:commons-lang3:3.4' // TODO
-        compile 'commons-io:commons-io:2.4' // TODO
+        compile 'com.google.guava:guava:23.0'
 
         compile('com.cedarsoftware:java-util:1.34.0') {
             exclude group: 'org.apache.logging.log4j'
@@ -349,6 +350,31 @@ project(':embedded-database-spring-test') {
         }
     }
 
+    def installer = install.repositories.mavenInstaller
+    def deployer = uploadArchives.repositories.mavenDeployer
+
+    [installer, deployer]*.pom*.whenConfigured { pom ->
+        pom.dependencies = pom.dependencies.findAll {
+            it.groupId != 'com.google.guava' && it.artifactId != 'guava'
+        }
+    }
+
+    shadowJar {
+        archiveClassifier.set('')
+
+        dependencies {
+            include(dependency('com.google.guava:guava'))
+        }
+
+        relocate 'com.google.common', 'io.zonky.test.db.shaded.com.google.common'
+        minimize()
+    }
+
+    jar {
+        enabled = false
+        dependsOn shadowJar
+    }
+
     test {
         classpath -= configurations.testRuntime
         classpath += configurations."testRuntime_default_suite"

embedded-database-spring-test/src/main/java/io/zonky/test/db/EmbeddedDatabaseContextCustomizerFactory.java

@@ -29,7 +29,6 @@
 import io.zonky.test.db.support.ProviderResolver;
 import io.zonky.test.db.util.AnnotationUtils;
 import io.zonky.test.db.util.PropertyUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.ObjectFactory;
@@ -263,7 +262,7 @@ protected static BeanDefinitionRegistry getBeanDefinitionRegistry(ApplicationCon
     }
 
     protected static BeanDefinitionHolder getDataSourceBeanDefinition(ConfigurableListableBeanFactory beanFactory, DatabaseDefinition databaseDefinition) {
-        if (StringUtils.isNotBlank(databaseDefinition.getBeanName())) {
+        if (StringUtils.hasText(databaseDefinition.getBeanName())) {
             if (beanFactory.containsBean(databaseDefinition.getBeanName())) {
                 BeanDefinition beanDefinition = beanFactory.getBeanDefinition(databaseDefinition.getBeanName());
                 return new BeanDefinitionHolder(beanDefinition, databaseDefinition.getBeanName());

embedded-database-spring-test/src/main/java/io/zonky/test/db/EmbeddedDatabaseTestExecutionListener.java

@@ -4,12 +4,12 @@
 import io.zonky.test.db.preparer.DatabasePreparer;
 import io.zonky.test.db.util.AnnotationUtils;
 import io.zonky.test.db.util.PropertyUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.Conventions;
 import org.springframework.core.env.Environment;
 import org.springframework.test.context.TestContext;
 import org.springframework.test.context.support.AbstractTestExecutionListener;
+import org.springframework.util.StringUtils;
 
 import java.util.Arrays;
 import java.util.List;
@@ -112,11 +112,11 @@ private boolean hasAnyRefreshMode(AutoConfigureEmbeddedDatabase annotation, Refr
     }
 
     private DatabaseContext getDatabaseContext(ApplicationContext applicationContext, String beanName) {
-        if (StringUtils.isBlank(beanName)) {
-            return applicationContext.getBean(DatabaseContext.class);
-        } else {
+        if (StringUtils.hasText(beanName)) {
             String databaseContextBeanName = beanName + "Context";
             return applicationContext.getBean(databaseContextBeanName, DatabaseContext.class);
+        } else {
+            return applicationContext.getBean(DatabaseContext.class);
         }
     }
 

embedded-database-spring-test/src/main/java/io/zonky/test/db/context/DefaultDatabaseContext.java

@@ -28,7 +28,6 @@
 import io.zonky.test.db.preparer.ReplayableDatabasePreparer;
 import io.zonky.test.db.provider.DatabaseProvider;
 import io.zonky.test.db.provider.EmbeddedDatabase;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.aop.framework.AopProxyUtils;
@@ -174,7 +173,7 @@ public synchronized void handleTestStarted(TestExecutionStartedEvent event) {
             refreshDatabase();
         }
 
-        String databaseBeanName = StringUtils.substringBeforeLast(beanName, "Context");
+        String databaseBeanName = beanName.substring(0, beanName.length() - "Context".length());
         EmbeddedDatabaseReporter.reportDataSource(databaseBeanName, awaitDatabase(), event.getTestMethod());
 
         logger.trace("Execution phase has been changed to {} - context={}", executionPhase, beanName);

embedded-database-spring-test/src/main/java/io/zonky/test/db/flyway/FlywayClassUtils.java

@@ -16,11 +16,11 @@
 
 package io.zonky.test.db.flyway;
 
-import org.apache.commons.io.IOUtils;
 import org.flywaydb.core.Flyway;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.util.ClassUtils;
+import org.springframework.util.StreamUtils;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
@@ -34,7 +34,7 @@ private static int loadFlywayVersion() {
         try {
             ClassPathResource versionResource = new ClassPathResource("org/flywaydb/core/internal/version.txt", FlywayClassUtils.class.getClassLoader());
             if (versionResource.exists()) {
-                return Integer.parseInt(IOUtils.readLines(versionResource.getInputStream(), UTF_8).get(0).replaceAll("^(\\d+)\\.(\\d+).*", "$1$2"));
+                return Integer.parseInt(StreamUtils.copyToString(versionResource.getInputStream(), UTF_8).replaceAll("^(\\d+)\\.(\\d+).*", "$1$2"));
             } else if (ClassUtils.hasMethod(Flyway.class, "isPlaceholderReplacement")) {
                 return 32;
             } else if (ClassUtils.hasMethod(Flyway.class, "getBaselineVersion")) {

embedded-database-spring-test/src/main/java/io/zonky/test/db/logging/EmbeddedDatabaseReporter.java

@@ -28,7 +28,7 @@ public class EmbeddedDatabaseReporter {
     private static final Logger logger = LoggerFactory.getLogger(EmbeddedDatabaseReporter.class);
 
     public static void reportDataSource(String beanName, EmbeddedDatabase database, AnnotatedElement element) {
-        logger.info("JDBC URL to connect to '{}': url='{}', scope='{}'", beanName, database.getUrl(), getElementName(element));
+        logger.info("JDBC URL to connect to '{}': url='{}', scope='{}'", beanName, database.getJdbcUrl(), getElementName(element));
     }
 
     private static String getElementName(AnnotatedElement element) {

embedded-database-spring-test/src/main/java/io/zonky/test/db/preparer/RecordingMethodInterceptor.java

@@ -24,15 +24,16 @@
 import com.google.common.util.concurrent.AtomicLongMap;
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
-import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.aop.framework.ProxyFactory;
+import org.springframework.util.FileCopyUtils;
 import org.springframework.util.StringUtils;
 
 import javax.sql.DataSource;
 import java.io.ByteArrayInputStream;
 import java.io.CharArrayReader;
+import java.io.CharArrayWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -468,8 +469,7 @@ private static class InputStreamArgumentProvider implements ArgumentProvider {
         private final byte[] data;
 
         public InputStreamArgumentProvider(InputStream stream) throws IOException {
-            data = IOUtils.toByteArray(stream);
-            stream.close();
+            data = FileCopyUtils.copyToByteArray(stream);
         }
 
         @Override
@@ -496,8 +496,9 @@ private static class ReaderArgumentProvider implements ArgumentProvider {
         private final char[] data;
 
         public ReaderArgumentProvider(Reader reader) throws IOException {
-            data = IOUtils.toCharArray(reader);
-            reader.close();
+            CharArrayWriter writer = new CharArrayWriter();
+            FileCopyUtils.copy(reader, writer);
+            data = writer.toCharArray();
         }
 
         @Override

embedded-database-spring-test/src/main/java/io/zonky/test/db/provider/EmbeddedDatabase.java

@@ -21,7 +21,7 @@
 
 public interface EmbeddedDatabase extends DataSource, Closeable {
 
-    String getUrl();
+    String getJdbcUrl();
 
     void close();
 

embedded-database-spring-test/src/main/java/io/zonky/test/db/provider/common/PrefetchingDatabaseProvider.java

@@ -25,8 +25,7 @@
 import io.zonky.test.db.provider.DatabaseProvider;
 import io.zonky.test.db.provider.EmbeddedDatabase;
 import io.zonky.test.db.provider.ProviderException;
-import org.apache.commons.lang3.RandomStringUtils;
-import org.apache.commons.lang3.tuple.Pair;
+import io.zonky.test.db.util.RandomStringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@@ -35,6 +34,7 @@
 
 import java.util.Comparator;
 import java.util.List;
+import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
@@ -49,6 +49,7 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
 
+import static com.google.common.collect.Maps.immutableEntry;
 import static io.zonky.test.db.provider.common.PrefetchingDatabaseProvider.DatabasePipeline.State.INITIALIZED;
 import static io.zonky.test.db.provider.common.PrefetchingDatabaseProvider.DatabasePipeline.State.INITIALIZING;
 import static io.zonky.test.db.provider.common.PrefetchingDatabaseProvider.DatabasePipeline.State.NEW;
@@ -161,7 +162,7 @@ protected PrefetchingTask prepareDatabase(PipelineKey key, int priority) {
     protected PrefetchingTask prepareNewDatabase(PipelineKey key, int priority) {
         databaseCount.incrementAndGet();
 
-        Pair<PipelineKey, EmbeddedDatabase> databaseToRemove = findDatabaseToRemove().orElse(null);
+        Entry<PipelineKey, EmbeddedDatabase> databaseToRemove = findDatabaseToRemove().orElse(null);
         if (databaseToRemove != null) {
             databaseCount.decrementAndGet();
 
@@ -254,15 +255,15 @@ public void onFailure(Throwable error) {
         return task;
     }
 
-    protected Optional<Pair<PipelineKey, EmbeddedDatabase>> findDatabaseToRemove() {
+    protected Optional<Entry<PipelineKey, EmbeddedDatabase>> findDatabaseToRemove() {
         while (databaseCount.get() > config.getMaxPreparedDatabases()) {
             long timestampThreshold = System.currentTimeMillis() - 10_000;
 
             PipelineKey key = pipelines.entrySet().stream()
-                    .map(e -> Pair.of(e.getKey(), e.getValue().results.peek()))
+                    .map(e -> immutableEntry(e.getKey(), e.getValue().results.peek()))
                     .filter(e -> e.getValue() != null && e.getValue().getTimestamp() < timestampThreshold)
                     .min(Comparator.comparing(e -> e.getValue().getTimestamp()))
-                    .map(Pair::getKey).orElse(null);
+                    .map(Entry::getKey).orElse(null);
 
             if (key == null) {
                 return Optional.empty();
@@ -273,7 +274,7 @@ protected Optional<Pair<PipelineKey, EmbeddedDatabase>> findDatabaseToRemove() {
                 PreparedResult result = pipeline.results.poll();
                 if (result != null) {
                     if (result.hasResult()) {
-                        return Optional.of(Pair.of(key, result.get()));
+                        return Optional.of(immutableEntry(key, result.get()));
                     } else {
                         databaseCount.decrementAndGet();
                     }

embedded-database-spring-test/src/main/java/io/zonky/test/db/provider/mariadb/MariaDBEmbeddedDatabase.java

@@ -17,8 +17,8 @@
 package io.zonky.test.db.provider.mariadb;
 
 import io.zonky.test.db.provider.support.AbstractEmbeddedDatabase;
-import org.apache.commons.lang3.StringUtils;
 import org.mariadb.jdbc.MariaDbDataSource;
+import org.springframework.util.StringUtils;
 
 import javax.sql.DataSource;
 
@@ -39,10 +39,10 @@ protected DataSource getDataSource() {
     }
 
     @Override
-    public String getUrl() {
+    public String getJdbcUrl() {
         String url = String.format("jdbc:mariadb://%s:%s/%s?user=%s",
                 dataSource.getServerName(), dataSource.getPort(), dataSource.getDatabaseName(), dataSource.getUser());
-        if (StringUtils.isNotBlank(getPassword())) {
+        if (StringUtils.hasText(getPassword())) {
             url += String.format("&password=%s", getPassword());
         }
         return url;