From 1fd25eace3cbb580c4133af493f17014f4525622 Mon Sep 17 00:00:00 2001 From: morazow Date: Fri, 4 Aug 2023 12:49:28 +0200 Subject: [PATCH 1/3] Added options map get method Fixes #21 --- doc/changes/changelog.md | 1 + doc/changes/changes_2.0.1.md | 32 +++++++++++++++++++ pk_generated_parent.pom | 2 +- pom.xml | 6 ++-- .../exasol/spark/common/ExasolOptions.java | 9 ++++++ .../spark/common/it/IntegrationTestSetup.java | 2 +- 6 files changed, 47 insertions(+), 5 deletions(-) create mode 100644 doc/changes/changes_2.0.1.md diff --git a/doc/changes/changelog.md b/doc/changes/changelog.md index 8e6d95e..484c227 100644 --- a/doc/changes/changelog.md +++ b/doc/changes/changelog.md @@ -1,5 +1,6 @@ # Changes +* [2.0.1](changes_2.0.1.md) * [2.0.0](changes_2.0.0.md) * [1.1.1](changes_1.1.1.md) * [1.1.0](changes_1.1.0.md) diff --git a/doc/changes/changes_2.0.1.md b/doc/changes/changes_2.0.1.md new file mode 100644 index 0000000..1a0c447 --- /dev/null +++ b/doc/changes/changes_2.0.1.md @@ -0,0 +1,32 @@ +# Spark Connector Common Java 2.0.1, released 2023-08-04 + +Code name: Added helper method to get key-value options pairs + +## Summary + +This release adds a helper method to get key-value options pairs. + +## Refactorings + +* #21: Added get method for key-value options pairs + +## Dependency Updates + +### Test Dependency Updates + +* Updated `com.exasol:exasol-testcontainers:6.6.0` to `6.6.1` +* Updated `nl.jqno.equalsverifier:equalsverifier:3.14.3` to `3.15` +* Updated `org.junit.jupiter:junit-jupiter-api:5.9.3` to `5.10.0` +* Updated `org.junit.jupiter:junit-jupiter:5.9.3` to `5.10.0` + +### Plugin Dependency Updates + +* Updated `com.exasol:error-code-crawler-maven-plugin:1.2.3` to `1.3.0` +* Updated `com.exasol:project-keeper-maven-plugin:2.9.7` to `2.9.10` +* Updated `org.apache.maven.plugins:maven-failsafe-plugin:3.0.0` to `3.1.2` +* Updated `org.apache.maven.plugins:maven-gpg-plugin:3.0.1` to `3.1.0` +* Updated `org.apache.maven.plugins:maven-surefire-plugin:3.0.0` to `3.1.2` +* Updated `org.basepom.maven:duplicate-finder-maven-plugin:1.5.1` to `2.0.1` +* Updated `org.codehaus.mojo:flatten-maven-plugin:1.4.1` to `1.5.0` +* Updated `org.codehaus.mojo:versions-maven-plugin:2.15.0` to `2.16.0` +* Updated `org.jacoco:jacoco-maven-plugin:0.8.9` to `0.8.10` diff --git a/pk_generated_parent.pom b/pk_generated_parent.pom index 0f4bc4b..b580634 100644 --- a/pk_generated_parent.pom +++ b/pk_generated_parent.pom @@ -3,7 +3,7 @@ 4.0.0 com.exasol spark-connector-common-java-generated-parent - 2.0.0 + 2.0.1 pom UTF-8 diff --git a/pom.xml b/pom.xml index ff8d8ee..bf2109f 100644 --- a/pom.xml +++ b/pom.xml @@ -3,14 +3,14 @@ 4.0.0 com.exasol spark-connector-common-java - 2.0.0 + 2.0.1 spark-connector-common-java An Exasol common library for Apache Spark connectors https://github.com/exasol/spark-connector-common-java/ spark-connector-common-java-generated-parent com.exasol - 2.0.0 + 2.0.1 pk_generated_parent.pom @@ -181,7 +181,7 @@ com.exasol project-keeper-maven-plugin - 2.9.9 + 2.9.10 diff --git a/src/main/java/com/exasol/spark/common/ExasolOptions.java b/src/main/java/com/exasol/spark/common/ExasolOptions.java index ac3d712..7f7a6f8 100644 --- a/src/main/java/com/exasol/spark/common/ExasolOptions.java +++ b/src/main/java/com/exasol/spark/common/ExasolOptions.java @@ -208,6 +208,15 @@ public int getNumberOfPartitions() { } } + /** + * Returns key-value pair options map. + * + * @return key-value pair map + */ + public Map getOptionsMap() { + return this.optionsMap; + } + /** * Checks if a parameter key is available. * diff --git a/src/test/java/com/exasol/spark/common/it/IntegrationTestSetup.java b/src/test/java/com/exasol/spark/common/it/IntegrationTestSetup.java index 76281c9..49c7d06 100644 --- a/src/test/java/com/exasol/spark/common/it/IntegrationTestSetup.java +++ b/src/test/java/com/exasol/spark/common/it/IntegrationTestSetup.java @@ -14,7 +14,7 @@ public class IntegrationTestSetup { private static final Logger LOGGER = Logger.getLogger(IntegrationTestSetup.class.getName()); - private static final String DEFAULT_DOCKER_IMAGE_VERSION = "7.1.19"; + private static final String DEFAULT_DOCKER_IMAGE_VERSION = "7.1.22"; @Container private static final ExasolContainer> EXASOL = From 7ee3f1d9cea8771606fb1f61d7666ba211e2fb3d Mon Sep 17 00:00:00 2001 From: morazow Date: Fri, 4 Aug 2023 13:16:54 +0200 Subject: [PATCH 2/3] Fixed PK findings --- .github/workflows/ci-build.yml | 16 +++++++++------- dependencies.md | 2 +- pk_generated_parent.pom | 1 - 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index e520870..49eeea6 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -17,12 +17,14 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 - - name: Set up JDK 11 + - name: Set up JDK 11 & 17 uses: actions/setup-java@v3 with: - distribution: 'temurin' - java-version: 11 - cache: 'maven' + distribution: "temurin" + java-version: | + 17 + 11 + cache: "maven" - name: Cache SonarCloud packages uses: actions/cache@v3 with: @@ -33,7 +35,7 @@ jobs: run: echo 'testcontainers.reuse.enable=true' > "$HOME/.testcontainers.properties" - name: Run tests and build with Maven run: | - mvn --batch-mode clean verify \ + JAVA_HOME=$JAVA_HOME_11_X64 mvn --batch-mode clean verify \ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \ -DtrimStackTrace=false - name: Publish Test Report @@ -44,7 +46,7 @@ jobs: - name: Sonar analysis if: ${{ env.SONAR_TOKEN != null }} run: | - mvn --batch-mode org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \ + JAVA_HOME=$JAVA_HOME_17_X64 mvn --batch-mode org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \ -DtrimStackTrace=false \ -Dsonar.organization=exasol \ @@ -52,4 +54,4 @@ jobs: -Dsonar.login=$SONAR_TOKEN env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} \ No newline at end of file + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/dependencies.md b/dependencies.md index 4afec3d..0985fe4 100644 --- a/dependencies.md +++ b/dependencies.md @@ -25,7 +25,7 @@ | [Test Database Builder for Java][20] | [MIT License][21] | | [Matcher for SQL Result Sets][22] | [MIT License][23] | | [Test utilities for `java.util.logging`][24] | [MIT][25] | -| [EqualsVerifier | release normal jar][26] | [Apache License, Version 2.0][27] | +| [EqualsVerifier \| release normal jar][26] | [Apache License, Version 2.0][27] | | [Jackson-core][28] | [The Apache Software License, Version 2.0][27] | ## Plugin Dependencies diff --git a/pk_generated_parent.pom b/pk_generated_parent.pom index b580634..7e670a6 100644 --- a/pk_generated_parent.pom +++ b/pk_generated_parent.pom @@ -168,7 +168,6 @@ true true false - true true false From 748c4d689ddf94bc7dc86d61a8f5ce4bdc9ccafb Mon Sep 17 00:00:00 2001 From: morazow Date: Fri, 4 Aug 2023 13:29:11 +0200 Subject: [PATCH 3/3] Fixed PK issues --- doc/changes/changes_2.0.1.md | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/doc/changes/changes_2.0.1.md b/doc/changes/changes_2.0.1.md index 1a0c447..671aa47 100644 --- a/doc/changes/changes_2.0.1.md +++ b/doc/changes/changes_2.0.1.md @@ -12,21 +12,6 @@ This release adds a helper method to get key-value options pairs. ## Dependency Updates -### Test Dependency Updates - -* Updated `com.exasol:exasol-testcontainers:6.6.0` to `6.6.1` -* Updated `nl.jqno.equalsverifier:equalsverifier:3.14.3` to `3.15` -* Updated `org.junit.jupiter:junit-jupiter-api:5.9.3` to `5.10.0` -* Updated `org.junit.jupiter:junit-jupiter:5.9.3` to `5.10.0` - ### Plugin Dependency Updates -* Updated `com.exasol:error-code-crawler-maven-plugin:1.2.3` to `1.3.0` -* Updated `com.exasol:project-keeper-maven-plugin:2.9.7` to `2.9.10` -* Updated `org.apache.maven.plugins:maven-failsafe-plugin:3.0.0` to `3.1.2` -* Updated `org.apache.maven.plugins:maven-gpg-plugin:3.0.1` to `3.1.0` -* Updated `org.apache.maven.plugins:maven-surefire-plugin:3.0.0` to `3.1.2` -* Updated `org.basepom.maven:duplicate-finder-maven-plugin:1.5.1` to `2.0.1` -* Updated `org.codehaus.mojo:flatten-maven-plugin:1.4.1` to `1.5.0` -* Updated `org.codehaus.mojo:versions-maven-plugin:2.15.0` to `2.16.0` -* Updated `org.jacoco:jacoco-maven-plugin:0.8.9` to `0.8.10` +* Updated `com.exasol:project-keeper-maven-plugin:2.9.9` to `2.9.10`