#48: Added support for multiple jars in BucketFS content. (#69)

Author: morazow

doc/changes/changes_3.0.1.md

@@ -2,16 +2,24 @@
 
 ## Summary
 
+## Features
+
+* #48: Added support for multiple jars in BucketFS content.
+
 ## Documentation
 
 * #58: Added UDF script creation examples to user guide
 * #64: Fixed typo in connection definition example in user guide
 
 ## Dependency Updates
 
-* Updated `com.exasol:exasol-testcontainers:3.4.0` to `3.4.1`
+* Updated `com.exasol:exasol-testcontainers:3.4.0` to `3.5.0`
+* Updated `com.exasol:hamcrest-resultset-matcher:1.3.0` to `1.4.0`
+* Updated `com.exasol:error-code-crawler-maven-plugin:0.1.0` to `0.1.1`
 * Updated `mysql:mysql-connector-java:8.0.22` to `8.0.23`
 * Updated `org.mockito:mockito-junit-jupiter:3.7.0` to `3.7.7`
-* Updated `com.exasol:error-code-crawler-maven-plugin:0.1.0` to `0.1.1`
 * Updated `org.codehaus.mojo:versions-maven-plugin:2.7` to `2.8.1`
 * Updated `org.jacoco:jacoco-maven-plugin:0.8.5` to `0.8.6`
+* Updated `org.junit.jupiter:junit-jupiter-engine:5.7.0` to `5.7.1`
+* Updated `org.junit.jupiter:junit-jupiter-params:5.7.0` to `5.7.1`
+* Updated `nl.jqno.equalsverifier:equalsverifier:3.5.1` to `3.5.4`

pom.xml

@@ -12,7 +12,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>11</java.version>
-        <junit.version>5.7.0</junit.version>
+        <junit.version>5.7.1</junit.version>
         <test.containers.version>1.15.1</test.containers.version>
         <surefire.and.failsafe.plugin.version>3.0.0-M4</surefire.and.failsafe.plugin.version>
         <sonar.coverage.jacoco.xmlReportPaths>target/site/jacoco/jacoco.xml,target/site/jacoco-it/jacoco.xml
@@ -92,7 +92,7 @@
         <dependency>
             <groupId>com.exasol</groupId>
             <artifactId>exasol-testcontainers</artifactId>
-            <version>3.4.1</version>
+            <version>3.5.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -116,7 +116,7 @@
         <dependency>
             <groupId>com.exasol</groupId>
             <artifactId>hamcrest-resultset-matcher</artifactId>
-            <version>1.3.0</version>
+            <version>1.4.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -146,7 +146,7 @@
         <dependency>
             <groupId>nl.jqno.equalsverifier</groupId>
             <artifactId>equalsverifier</artifactId>
-            <version>3.5.1</version>
+            <version>3.5.4</version>
             <scope>test</scope>
         </dependency>
         <dependency>

src/main/java/com/exasol/dbbuilder/dialects/exasol/BucketFsContentAdapterScriptBuilder.java

@@ -5,7 +5,7 @@
 
 /**
  * Builder for {@link AbstractScript}, that can in addition add JAVA content from BucketFS.
- * 
+ *
  * @param <T> this type
  */
 public abstract class BucketFsContentAdapterScriptBuilder<T extends BucketFsContentAdapterScriptBuilder<T>>
@@ -17,14 +17,19 @@ protected BucketFsContentAdapterScriptBuilder(final ExasolImmediateDatabaseObjec
     }
 
     /**
-     * Set the script's content to a JAR file from BucketFS.
+     * Set the script's content to a JAR files from BucketFS.
      *
-     * @param scriptClass         script class to execute
-     * @param pathToJarInBucketfs path to the jar in BucketFS
+     * @param scriptClass        script class to execute
+     * @param jarPathsInBucketfs paths to the jar files in BucketFS
      * @return self
      */
-    public T bucketFsContent(final String scriptClass, final String pathToJarInBucketfs) {
-        this.content("%scriptclass " + scriptClass + ";\n%jar " + pathToJarInBucketfs + ";\n");
+    public T bucketFsContent(final String scriptClass, final String... jarPathsInBucketfs) {
+        final StringBuilder bucketContent = new StringBuilder();
+        bucketContent.append("%scriptclass ").append(scriptClass).append(";\n");
+        for (final String jarPath : jarPathsInBucketfs) {
+            bucketContent.append("%jar ").append(jarPath).append(";\n");
+        }
+        this.content(bucketContent.toString());
         return getSelf();
     }
 }

src/test/java/com/exasol/dbbuilder/dialects/exasol/AdapterScriptTest.java

@@ -89,4 +89,13 @@ void testBucketFsContent() {
                         .build().getContent(),
                 equalTo("%scriptclass com.exasol.adapter.RequestDispatcher;\n%jar /buckets/bfsdefault/default/test.jar;\n"));
     }
-}
+
+    @Test
+    void testBucketFsContentWithMultipleJars() {
+        assertThat(
+                defaultAdapterScriptBuilder()
+                        .bucketFsContent("com.exasol.adapter.RequestDispatcher", "/buckets/bfs/jars/test1.jar", "/buckets/bfs/jars/test2.jar")
+                        .build().getContent(),
+                equalTo("%scriptclass com.exasol.adapter.RequestDispatcher;\n%jar /buckets/bfs/jars/test1.jar;\n%jar /buckets/bfs/jars/test2.jar;\n"));
+    }
+}