From 93df67df15766f699876b51aa9b3cf17307f198e Mon Sep 17 00:00:00 2001 From: Muhammet Orazov <916295+morazow@users.noreply.github.com> Date: Thu, 20 Jul 2023 09:47:07 +0200 Subject: [PATCH] #188: Fixed maven central deployment bug (#189) --- .project-keeper.yml | 6 +- dependencies.md | 94 ++++++++------- doc/changes/changes_2.0.0.md | 40 ++++--- exasol-jdbc/pk_generated_parent.pom | 107 ++++++++++++++++-- exasol-jdbc/pom.xml | 8 -- exasol-s3/pk_generated_parent.pom | 107 ++++++++++++++++-- .../spark/s3/S3BucketKeyPathProvider.java | 2 +- .../com/exasol/spark/s3/S3FileSystem.java | 2 + .../spark/s3/UUIDS3BucketKeyPathProvider.java | 5 + 9 files changed, 288 insertions(+), 83 deletions(-) diff --git a/.project-keeper.yml b/.project-keeper.yml index 9b814d5b..b8aab53a 100644 --- a/.project-keeper.yml +++ b/.project-keeper.yml @@ -4,6 +4,7 @@ sources: - type: maven path: exasol-jdbc/pom.xml modules: + - maven_central - integration_tests parentPom: groupId: "com.exasol" @@ -13,6 +14,7 @@ sources: - type: maven path: exasol-s3/pom.xml modules: + - maven_central - integration_tests parentPom: groupId: "com.exasol" @@ -29,8 +31,8 @@ excludes: - "E-PK-CORE-18: Outdated content: '.github/workflows/release_droid_release_on_maven_central.yml'" - "E-PK-CORE-18: Outdated content: '.settings/org.eclipse.jdt.core.prefs'" - regex: "(?s)E-PK-CORE-18: Outdated content: 'exasol-(jdbc|s3)/pk_generated_parent.pom'" - - regex: "(?s)E-PK-CORE-104: Invalid pom file 'exasol-(jdbc|s3)/pom.xml':.*" - - regex: "(?s)E-PK-CORE-118: Invalid pom file 'exasol-(jdbc|s3)/pom.xml':.*" + - regex: "(?s)E-PK-CORE-104: Invalid pom file 'exasol-(jdbc|s3)/pom.xml': Invalid /project/parent/artifactId.*" + - regex: "(?s)E-PK-CORE-118: Invalid pom file 'exasol-(jdbc|s3)/pom.xml': Invalid /project/parent/version.*" - "E-PK-CORE-17: Missing required file: '.github/workflows/project-keeper-verify.yml'" - "E-PK-CORE-17: Missing required file: '.github/workflows/project-keeper.sh'" linkReplacements: diff --git a/dependencies.md b/dependencies.md index 82552583..b00f3f9e 100644 --- a/dependencies.md +++ b/dependencies.md @@ -70,24 +70,27 @@ | [Apache Maven Compiler Plugin][2] | [Apache-2.0][3] | | [Apache Maven Enforcer Plugin][4] | [Apache-2.0][3] | | [Maven Flatten Plugin][5] | [Apache Software Licenese][3] | -| [Apache Maven Javadoc Plugin][66] | [Apache-2.0][3] | -| [ScalaTest Maven Plugin][67] | [the Apache License, ASL Version 2.0][51] | -| [Apache Maven JAR Plugin][68] | [Apache License, Version 2.0][3] | | [Apache Maven Deploy Plugin][6] | [Apache-2.0][3] | | [org.sonatype.ossindex.maven:ossindex-maven-plugin][7] | [ASL2][8] | | [Maven Surefire Plugin][9] | [Apache-2.0][3] | | [Versions Maven Plugin][10] | [Apache License, Version 2.0][3] | -| [Apache Maven Shade Plugin][69] | [Apache License, Version 2.0][3] | -| [duplicate-finder-maven-plugin Maven Mojo][70] | [Apache License 2.0][12] | -| [Maven Failsafe Plugin][71] | [Apache-2.0][3] | +| [ScalaTest Maven Plugin][66] | [the Apache License, ASL Version 2.0][51] | +| [Apache Maven JAR Plugin][67] | [Apache License, Version 2.0][3] | +| [Apache Maven Shade Plugin][68] | [Apache License, Version 2.0][3] | +| [duplicate-finder-maven-plugin Maven Mojo][11] | [Apache License 2.0][12] | +| [Apache Maven GPG Plugin][69] | [Apache-2.0][3] | +| [Apache Maven Source Plugin][70] | [Apache License, Version 2.0][3] | +| [Apache Maven Javadoc Plugin][71] | [Apache-2.0][3] | +| [Nexus Staging Maven Plugin][72] | [Eclipse Public License][73] | +| [Maven Failsafe Plugin][74] | [Apache-2.0][3] | | [JaCoCo :: Maven Plugin][13] | [Eclipse Public License 2.0][14] | | [error-code-crawler-maven-plugin][15] | [MIT License][16] | | [Reproducible Build Maven Plugin][17] | [Apache 2.0][8] | | [OpenFastTrace Maven Plugin][18] | [GNU General Public License v3.0][19] | -| [spotless-maven-plugin][72] | [The Apache Software License, Version 2.0][3] | -| [scalafix-maven-plugin][73] | [BSD-3-Clause][74] | +| [spotless-maven-plugin][75] | [The Apache Software License, Version 2.0][3] | +| [scalafix-maven-plugin][76] | [BSD-3-Clause][77] | | [Maven Clean Plugin][20] | [The Apache Software License, Version 2.0][8] | -| [Maven Resources Plugin][75] | [The Apache Software License, Version 2.0][8] | +| [Maven Resources Plugin][78] | [The Apache Software License, Version 2.0][8] | | [Maven Install Plugin][21] | [The Apache Software License, Version 2.0][8] | | [Maven Site Plugin 3][22] | [The Apache Software License, Version 2.0][8] | @@ -97,29 +100,29 @@ | Dependency | License | | ------------------------------------------- | --------------------------------- | -| [Scala Library][76] | [Apache-2.0][34] | +| [Scala Library][79] | [Apache-2.0][34] | | [spark-connector-common-java][29] | [MIT License][30] | | [Spark Project Core][31] | [Apache 2.0 License][12] | | [Spark Project SQL][31] | [Apache 2.0 License][12] | | Apache Hadoop Client Aggregator | [Apache License, Version 2.0][3] | | [Netty/All-in-One][33] | [Apache License, Version 2.0][34] | -| [AWS Java SDK :: Services :: Amazon S3][77] | [Apache License, Version 2.0][78] | +| [AWS Java SDK :: Services :: Amazon S3][80] | [Apache License, Version 2.0][81] | | Apache Hadoop Amazon Web Services support | [Apache License, Version 2.0][3] | -| [wildfly-openssl][79] | [Apache License 2.0][80] | +| [wildfly-openssl][82] | [Apache License 2.0][83] | ### Test Dependencies | Dependency | License | | ----------------------------------------------- | --------------------------------- | -| [JUnit Jupiter (Aggregator)][81] | [Eclipse Public License v2.0][82] | -| [JUnit Jupiter API][81] | [Eclipse Public License v2.0][82] | +| [JUnit Jupiter (Aggregator)][84] | [Eclipse Public License v2.0][85] | +| [JUnit Jupiter API][84] | [Eclipse Public License v2.0][85] | | [Test Database Builder for Java][58] | [MIT License][59] | | [Matcher for SQL Result Sets][60] | [MIT License][61] | | [Test containers for Exasol on Docker][62] | [MIT License][63] | -| [Testcontainers :: JUnit Jupiter Extension][83] | [MIT][84] | +| [Testcontainers :: JUnit Jupiter Extension][86] | [MIT][87] | | [mockito-junit-jupiter][53] | [The MIT License][54] | -| [Testcontainers :: Localstack][83] | [MIT][84] | -| [AWS Java SDK for Amazon S3][77] | [Apache License, Version 2.0][78] | +| [Testcontainers :: Localstack][86] | [MIT][87] | +| [AWS Java SDK for Amazon S3][80] | [Apache License, Version 2.0][81] | ### Plugin Dependencies @@ -133,16 +136,20 @@ | [org.sonatype.ossindex.maven:ossindex-maven-plugin][7] | [ASL2][8] | | [Maven Surefire Plugin][9] | [Apache-2.0][3] | | [Versions Maven Plugin][10] | [Apache License, Version 2.0][3] | -| [Apache Maven Shade Plugin][69] | [Apache License, Version 2.0][3] | -| [duplicate-finder-maven-plugin Maven Mojo][70] | [Apache License 2.0][12] | -| [Maven Failsafe Plugin][71] | [Apache-2.0][3] | +| [Apache Maven Shade Plugin][68] | [Apache License, Version 2.0][3] | +| [duplicate-finder-maven-plugin Maven Mojo][11] | [Apache License 2.0][12] | +| [Apache Maven GPG Plugin][69] | [Apache-2.0][3] | +| [Apache Maven Source Plugin][70] | [Apache License, Version 2.0][3] | +| [Apache Maven Javadoc Plugin][71] | [Apache-2.0][3] | +| [Nexus Staging Maven Plugin][72] | [Eclipse Public License][73] | +| [Maven Failsafe Plugin][74] | [Apache-2.0][3] | | [JaCoCo :: Maven Plugin][13] | [Eclipse Public License 2.0][14] | | [error-code-crawler-maven-plugin][15] | [MIT License][16] | | [Reproducible Build Maven Plugin][17] | [Apache 2.0][8] | | [OpenFastTrace Maven Plugin][18] | [GNU General Public License v3.0][19] | | [Maven Clean Plugin][20] | [The Apache Software License, Version 2.0][8] | -| [Maven Resources Plugin][75] | [The Apache Software License, Version 2.0][8] | -| [Maven JAR Plugin][85] | [The Apache Software License, Version 2.0][8] | +| [Maven Resources Plugin][78] | [The Apache Software License, Version 2.0][8] | +| [Maven JAR Plugin][88] | [The Apache Software License, Version 2.0][8] | | [Maven Install Plugin][21] | [The Apache Software License, Version 2.0][8] | | [Maven Site Plugin 3][22] | [The Apache Software License, Version 2.0][8] | @@ -212,23 +219,26 @@ [63]: https://github.com/exasol/exasol-testcontainers/blob/main/LICENSE [64]: http://github.com/davidB/scala-maven-plugin [65]: http://unlicense.org/ -[66]: https://maven.apache.org/plugins/maven-javadoc-plugin/ -[67]: https://www.scalatest.org/user_guide/using_the_scalatest_maven_plugin -[68]: https://maven.apache.org/plugins/maven-jar-plugin/ -[69]: https://maven.apache.org/plugins/maven-shade-plugin/ -[70]: https://github.com/basepom/duplicate-finder-maven-plugin -[71]: https://maven.apache.org/surefire/maven-failsafe-plugin/ -[72]: https://github.com/diffplug/spotless -[73]: https://github.com/evis/scalafix-maven-plugin -[74]: https://opensource.org/licenses/BSD-3-Clause -[75]: http://maven.apache.org/plugins/maven-resources-plugin/ -[76]: https://www.scala-lang.org/ -[77]: https://aws.amazon.com/sdkforjava -[78]: https://aws.amazon.com/apache2.0 -[79]: http://www.jboss.org/wildfly-openssl-parent/wildfly-openssl -[80]: http://repository.jboss.org/licenses/apache-2.0.txt -[81]: https://junit.org/junit5/ -[82]: https://www.eclipse.org/legal/epl-v20.html -[83]: https://testcontainers.org -[84]: http://opensource.org/licenses/MIT -[85]: http://maven.apache.org/plugins/maven-jar-plugin/ +[66]: https://www.scalatest.org/user_guide/using_the_scalatest_maven_plugin +[67]: https://maven.apache.org/plugins/maven-jar-plugin/ +[68]: https://maven.apache.org/plugins/maven-shade-plugin/ +[69]: https://maven.apache.org/plugins/maven-gpg-plugin/ +[70]: https://maven.apache.org/plugins/maven-source-plugin/ +[71]: https://maven.apache.org/plugins/maven-javadoc-plugin/ +[72]: http://www.sonatype.com/public-parent/nexus-maven-plugins/nexus-staging/nexus-staging-maven-plugin/ +[73]: http://www.eclipse.org/legal/epl-v10.html +[74]: https://maven.apache.org/surefire/maven-failsafe-plugin/ +[75]: https://github.com/diffplug/spotless +[76]: https://github.com/evis/scalafix-maven-plugin +[77]: https://opensource.org/licenses/BSD-3-Clause +[78]: http://maven.apache.org/plugins/maven-resources-plugin/ +[79]: https://www.scala-lang.org/ +[80]: https://aws.amazon.com/sdkforjava +[81]: https://aws.amazon.com/apache2.0 +[82]: http://www.jboss.org/wildfly-openssl-parent/wildfly-openssl +[83]: http://repository.jboss.org/licenses/apache-2.0.txt +[84]: https://junit.org/junit5/ +[85]: https://www.eclipse.org/legal/epl-v20.html +[86]: https://testcontainers.org +[87]: http://opensource.org/licenses/MIT +[88]: http://maven.apache.org/plugins/maven-jar-plugin/ diff --git a/doc/changes/changes_2.0.0.md b/doc/changes/changes_2.0.0.md index c29f1c16..ff942524 100644 --- a/doc/changes/changes_2.0.0.md +++ b/doc/changes/changes_2.0.0.md @@ -1,4 +1,4 @@ -# The Spark Exasol Connector 2.0.0, released 2023-07-18 +# The Spark Exasol Connector 2.0.0, released 2023-07-20 Code name: Support S3 intermediate storage @@ -8,7 +8,7 @@ In this release we added support to use AWS S3 bucket as an intermediate storage With this release, we separated the connector into two variants, `S3` and `JDBC`. We recommend to use this new S3 variant instead of JDBC variant. It improves the stability of the connector. -Please refer to the user guide for updated usage instructions. +Please refer to the user guide for updated API changes and usage instructions. ## Features @@ -25,6 +25,7 @@ Please refer to the user guide for updated usage instructions. ## Bugs * #176: Fixed artifact upload of `sha256sum` files +* #188: Fixed Maven Central deployment bug ## Refactoring @@ -83,7 +84,7 @@ Please refer to the user guide for updated usage instructions. #### Plugin Dependency Updates * Added `com.diffplug.spotless:spotless-maven-plugin:2.37.0` -* Added `com.exasol:error-code-crawler-maven-plugin:1.2.3` +* Added `com.exasol:error-code-crawler-maven-plugin:1.3.0` * Added `io.github.evis:scalafix-maven-plugin_2.13:0.1.4_0.9.31` * Added `io.github.zlika:reproducible-build-maven-plugin:0.16` * Added `net.alchim31.maven:scala-maven-plugin:4.8.1` @@ -91,22 +92,25 @@ Please refer to the user guide for updated usage instructions. * Added `org.apache.maven.plugins:maven-compiler-plugin:3.11.0` * Added `org.apache.maven.plugins:maven-deploy-plugin:3.1.1` * Added `org.apache.maven.plugins:maven-enforcer-plugin:3.3.0` -* Added `org.apache.maven.plugins:maven-failsafe-plugin:3.0.0` +* Added `org.apache.maven.plugins:maven-failsafe-plugin:3.1.2` +* Added `org.apache.maven.plugins:maven-gpg-plugin:3.1.0` * Added `org.apache.maven.plugins:maven-install-plugin:2.4` * Added `org.apache.maven.plugins:maven-jar-plugin:3.3.0` * Added `org.apache.maven.plugins:maven-javadoc-plugin:3.5.0` * Added `org.apache.maven.plugins:maven-resources-plugin:2.6` * Added `org.apache.maven.plugins:maven-shade-plugin:3.4.1` * Added `org.apache.maven.plugins:maven-site-plugin:3.3` -* Added `org.apache.maven.plugins:maven-surefire-plugin:3.0.0` -* Added `org.basepom.maven:duplicate-finder-maven-plugin:1.5.1` -* Added `org.codehaus.mojo:flatten-maven-plugin:1.4.1` -* Added `org.codehaus.mojo:versions-maven-plugin:2.15.0` +* Added `org.apache.maven.plugins:maven-source-plugin:3.2.1` +* Added `org.apache.maven.plugins:maven-surefire-plugin:3.1.2` +* Added `org.basepom.maven:duplicate-finder-maven-plugin:2.0.1` +* Added `org.codehaus.mojo:flatten-maven-plugin:1.5.0` +* Added `org.codehaus.mojo:versions-maven-plugin:2.16.0` * Added `org.itsallcode:openfasttrace-maven-plugin:1.6.2` -* Added `org.jacoco:jacoco-maven-plugin:0.8.9` +* Added `org.jacoco:jacoco-maven-plugin:0.8.10` * Added `org.scalatest:scalatest-maven-plugin:2.2.0` * Added `org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.1.2184` * Added `org.sonatype.ossindex.maven:ossindex-maven-plugin:3.2.0` +* Added `org.sonatype.plugins:nexus-staging-maven-plugin:1.6.13` ### Spark Exasol Connector With S3 @@ -132,23 +136,27 @@ Please refer to the user guide for updated usage instructions. #### Plugin Dependency Updates -* Added `com.exasol:error-code-crawler-maven-plugin:1.2.3` +* Added `com.exasol:error-code-crawler-maven-plugin:1.3.0` * Added `io.github.zlika:reproducible-build-maven-plugin:0.16` * Added `org.apache.maven.plugins:maven-clean-plugin:2.5` * Added `org.apache.maven.plugins:maven-compiler-plugin:3.11.0` * Added `org.apache.maven.plugins:maven-deploy-plugin:3.1.1` * Added `org.apache.maven.plugins:maven-enforcer-plugin:3.3.0` -* Added `org.apache.maven.plugins:maven-failsafe-plugin:3.0.0` +* Added `org.apache.maven.plugins:maven-failsafe-plugin:3.1.2` +* Added `org.apache.maven.plugins:maven-gpg-plugin:3.1.0` * Added `org.apache.maven.plugins:maven-install-plugin:2.4` * Added `org.apache.maven.plugins:maven-jar-plugin:2.4` +* Added `org.apache.maven.plugins:maven-javadoc-plugin:3.5.0` * Added `org.apache.maven.plugins:maven-resources-plugin:2.6` * Added `org.apache.maven.plugins:maven-shade-plugin:3.4.1` * Added `org.apache.maven.plugins:maven-site-plugin:3.3` -* Added `org.apache.maven.plugins:maven-surefire-plugin:3.0.0` -* Added `org.basepom.maven:duplicate-finder-maven-plugin:1.5.1` -* Added `org.codehaus.mojo:flatten-maven-plugin:1.4.1` -* Added `org.codehaus.mojo:versions-maven-plugin:2.15.0` +* Added `org.apache.maven.plugins:maven-source-plugin:3.2.1` +* Added `org.apache.maven.plugins:maven-surefire-plugin:3.1.2` +* Added `org.basepom.maven:duplicate-finder-maven-plugin:2.0.1` +* Added `org.codehaus.mojo:flatten-maven-plugin:1.5.0` +* Added `org.codehaus.mojo:versions-maven-plugin:2.16.0` * Added `org.itsallcode:openfasttrace-maven-plugin:1.6.2` -* Added `org.jacoco:jacoco-maven-plugin:0.8.9` +* Added `org.jacoco:jacoco-maven-plugin:0.8.10` * Added `org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.1.2184` * Added `org.sonatype.ossindex.maven:ossindex-maven-plugin:3.2.0` +* Added `org.sonatype.plugins:nexus-staging-maven-plugin:1.6.13` diff --git a/exasol-jdbc/pk_generated_parent.pom b/exasol-jdbc/pk_generated_parent.pom index 960b10cf..ea8a7134 100644 --- a/exasol-jdbc/pk_generated_parent.pom +++ b/exasol-jdbc/pk_generated_parent.pom @@ -16,7 +16,18 @@ UTF-8 11 + true + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + Apache License @@ -77,7 +88,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.4.1 + 1.5.0 true oss @@ -116,7 +127,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0 + 3.1.2 @@ -127,7 +138,7 @@ org.codehaus.mojo versions-maven-plugin - 2.15.0 + 2.16.0 display-updates @@ -145,7 +156,7 @@ org.basepom.maven duplicate-finder-maven-plugin - 1.5.1 + 2.0.1 default @@ -168,10 +179,92 @@ false + + org.apache.maven.plugins + maven-deploy-plugin + 3.1.1 + + true + + + + org.apache.maven.plugins + maven-gpg-plugin + 3.1.0 + + + sign-artifacts + verify + + sign + + + + --pinentry-mode + loopback + + + + + + + org.apache.maven.plugins + maven-source-plugin + 3.2.1 + + + attach-sources + + jar + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.5.0 + + + attach-javadocs + + jar + + + + + UTF-8 + + true + true + true + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.13 + + true + ossrh + https://oss.sonatype.org/ + 15 + 30 + + + + default-deploy + deploy + + deploy + + + + org.apache.maven.plugins maven-failsafe-plugin - 3.0.0 + 3.1.2 @@ -192,7 +285,7 @@ org.jacoco jacoco-maven-plugin - 0.8.9 + 0.8.10 prepare-agent @@ -233,7 +326,7 @@ com.exasol error-code-crawler-maven-plugin - 1.2.3 + 1.3.0 verify diff --git a/exasol-jdbc/pom.xml b/exasol-jdbc/pom.xml index f7031db2..6c795fc9 100644 --- a/exasol-jdbc/pom.xml +++ b/exasol-jdbc/pom.xml @@ -311,14 +311,6 @@ - - org.apache.maven.plugins - maven-deploy-plugin - 3.1.1 - - true - - org.apache.maven.plugins maven-shade-plugin diff --git a/exasol-s3/pk_generated_parent.pom b/exasol-s3/pk_generated_parent.pom index e6f582da..c6df550e 100644 --- a/exasol-s3/pk_generated_parent.pom +++ b/exasol-s3/pk_generated_parent.pom @@ -16,7 +16,18 @@ UTF-8 11 + true + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + Apache License @@ -77,7 +88,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.4.1 + 1.5.0 true oss @@ -116,7 +127,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0 + 3.1.2 @@ -127,7 +138,7 @@ org.codehaus.mojo versions-maven-plugin - 2.15.0 + 2.16.0 display-updates @@ -145,7 +156,7 @@ org.basepom.maven duplicate-finder-maven-plugin - 1.5.1 + 2.0.1 default @@ -168,10 +179,92 @@ false + + org.apache.maven.plugins + maven-deploy-plugin + 3.1.1 + + true + + + + org.apache.maven.plugins + maven-gpg-plugin + 3.1.0 + + + sign-artifacts + verify + + sign + + + + --pinentry-mode + loopback + + + + + + + org.apache.maven.plugins + maven-source-plugin + 3.2.1 + + + attach-sources + + jar + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.5.0 + + + attach-javadocs + + jar + + + + + UTF-8 + + true + true + true + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.13 + + true + ossrh + https://oss.sonatype.org/ + 15 + 30 + + + + default-deploy + deploy + + deploy + + + + org.apache.maven.plugins maven-failsafe-plugin - 3.0.0 + 3.1.2 @@ -192,7 +285,7 @@ org.jacoco jacoco-maven-plugin - 0.8.9 + 0.8.10 prepare-agent @@ -233,7 +326,7 @@ com.exasol error-code-crawler-maven-plugin - 1.2.3 + 1.3.0 verify diff --git a/exasol-s3/src/main/java/com/exasol/spark/s3/S3BucketKeyPathProvider.java b/exasol-s3/src/main/java/com/exasol/spark/s3/S3BucketKeyPathProvider.java index 23ad112b..998cf776 100644 --- a/exasol-s3/src/main/java/com/exasol/spark/s3/S3BucketKeyPathProvider.java +++ b/exasol-s3/src/main/java/com/exasol/spark/s3/S3BucketKeyPathProvider.java @@ -9,7 +9,7 @@ public interface S3BucketKeyPathProvider { * Returns an {@code S3} bucket key path for writing intermediate data. * * @param queryId Spark query identifier that started the write job - * return {@code S3} bucket key path for intermediate data + * @return {@code S3} bucket key path for intermediate data */ public String getS3BucketKeyForWriteLocation(final String queryId); diff --git a/exasol-s3/src/main/java/com/exasol/spark/s3/S3FileSystem.java b/exasol-s3/src/main/java/com/exasol/spark/s3/S3FileSystem.java index 4f5e7f38..4e8d8489 100644 --- a/exasol-s3/src/main/java/com/exasol/spark/s3/S3FileSystem.java +++ b/exasol-s3/src/main/java/com/exasol/spark/s3/S3FileSystem.java @@ -103,6 +103,7 @@ private void deleteObjects(final String bucketName, final Optional bucke * * @param bucketName name of a bucket * @param bucketKey optional bucket key + * @return list of objects in a bucket */ public List listObjects(final String bucketName, final Optional bucketKey) { final List result = new ArrayList<>(); @@ -123,6 +124,7 @@ public List listObjects(final String bucketName, final Optional bucketKey) { final ListObjectsV2Request.Builder builder = ListObjectsV2Request.builder().bucket(bucketName); diff --git a/exasol-s3/src/main/java/com/exasol/spark/s3/UUIDS3BucketKeyPathProvider.java b/exasol-s3/src/main/java/com/exasol/spark/s3/UUIDS3BucketKeyPathProvider.java index a46b2c04..78a2c5e6 100644 --- a/exasol-s3/src/main/java/com/exasol/spark/s3/UUIDS3BucketKeyPathProvider.java +++ b/exasol-s3/src/main/java/com/exasol/spark/s3/UUIDS3BucketKeyPathProvider.java @@ -10,6 +10,11 @@ public class UUIDS3BucketKeyPathProvider implements S3BucketKeyPathProvider { private final String applicationId; + /** + * Creates a new instance of {@link UUIDS3BucketKeyPathProvider}. + * + * @param applicationId Spark application identifier + */ public UUIDS3BucketKeyPathProvider(final String applicationId) { this.applicationId = applicationId; }