From f547197b7e40f679aac9e42acec620d35b76f1d4 Mon Sep 17 00:00:00 2001 From: Yukihiro Okada Date: Sun, 8 Dec 2019 16:09:38 +0900 Subject: [PATCH 1/8] Bump Gradle to 5.6.4 --- gradle/wrapper/gradle-wrapper.jar | Bin 55190 -> 55616 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 18 +++++++++++++++++- gradlew.bat | 18 +++++++++++++++++- 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 87b738cbd051603d91cc39de6cb000dd98fe6b02..5c2d1cf016b3885f6930543d57b744ea8c220a1a 100644 GIT binary patch delta 3320 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 Date: Sun, 8 Dec 2019 16:10:43 +0900 Subject: [PATCH 2/8] Replace travis to github actions --- .github/workflows/gradle.yml | 25 +++++++++++++++++++++++++ .travis.yml | 15 --------------- 2 files changed, 25 insertions(+), 15 deletions(-) create mode 100644 .github/workflows/gradle.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml new file mode 100644 index 0000000..03d0a6d --- /dev/null +++ b/.github/workflows/gradle.yml @@ -0,0 +1,25 @@ +name: Java CI + +on: [push] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Build with Gradle + run: + ./gradlew build + - name: Checkstyle & static check + run: | + ./gradlew --info checkstyle + ./gradlew --info check + - name: Spotbugs + run: | + ./gradlew spotbugsMain spotbugsTest diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 5231285..0000000 --- a/.travis.yml +++ /dev/null @@ -1,15 +0,0 @@ -language: java -jdk: - # - oraclejdk8 - - openjdk8 - -cache: - directories: # run "travis cache --delete" to delete caches - - $HOME/.gradle - -sudo: false -script: - - ./gradlew --info checkstyle - - ./gradlew --info check - -after_success: ./gradlew sonarqube -Dsonar.organization=yuokada-github -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=${SONAR_TOKEN} From 024cd9fb5fc261553bfc797bb9193062d0e533b7 Mon Sep 17 00:00:00 2001 From: Yukihiro Okada Date: Sun, 8 Dec 2019 16:11:17 +0900 Subject: [PATCH 3/8] Introduce spotbugs --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index c5045f7..7d8775d 100644 --- a/build.gradle +++ b/build.gradle @@ -4,6 +4,7 @@ plugins { id "java" id "scala" id "checkstyle" + id "com.github.spotbugs" version "3.0.0" id "org.sonarqube" version "2.5" } import com.github.jrubygradle.JRubyExec From c7573a5a905ba65272dd937d969f1650890dce87 Mon Sep 17 00:00:00 2001 From: Yukihiro Okada Date: Sun, 8 Dec 2019 16:13:44 +0900 Subject: [PATCH 4/8] Bump embulk to 0.8.39 --- build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 7d8775d..82d80dc 100644 --- a/build.gradle +++ b/build.gradle @@ -26,8 +26,8 @@ sourceCompatibility = 1.8 targetCompatibility = 1.8 dependencies { - compile "org.embulk:embulk-core:0.8.34" - provided "org.embulk:embulk-core:0.8.34" + compile "org.embulk:embulk-core:0.8.39" + provided "org.embulk:embulk-core:0.8.39" compile "org.scala-lang:scala-library:2.12.+" compile "org.apache.orc:orc:1.5.4" @@ -43,8 +43,8 @@ dependencies { // testCompile "junit:junit:4.+" testCompile 'org.hamcrest:hamcrest-core:1.3' testCompile 'org.testng:testng:6.14.2' - testCompile "org.embulk:embulk-core:0.8.34:tests" - testCompile "org.embulk:embulk-standards:0.8.34" + testCompile "org.embulk:embulk-core:0.8.39:tests" + testCompile "org.embulk:embulk-standards:0.8.39" } sourceSets { From cc8d69a73723d9eb8f0a666b629077b7131fb3d1 Mon Sep 17 00:00:00 2001 From: Yukihiro Okada Date: Sun, 8 Dec 2019 16:26:27 +0900 Subject: [PATCH 5/8] Fix for spotbugs --- src/main/java/org/embulk/output/orc/OrcOutputPlugin.java | 2 +- .../scala/org/embulk/output/orc/OrcOutputPluginHelper.scala | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/embulk/output/orc/OrcOutputPlugin.java b/src/main/java/org/embulk/output/orc/OrcOutputPlugin.java index 9dad1a8..234587f 100644 --- a/src/main/java/org/embulk/output/orc/OrcOutputPlugin.java +++ b/src/main/java/org/embulk/output/orc/OrcOutputPlugin.java @@ -167,7 +167,7 @@ private Writer createWriter(PluginTask task, Schema schema, int processorIndex) ); } catch (IOException e) { - Throwables.propagate(e); + Throwables.throwIfUnchecked(e); } return writer; } diff --git a/src/main/scala/org/embulk/output/orc/OrcOutputPluginHelper.scala b/src/main/scala/org/embulk/output/orc/OrcOutputPluginHelper.scala index 19effd6..b396122 100644 --- a/src/main/scala/org/embulk/output/orc/OrcOutputPluginHelper.scala +++ b/src/main/scala/org/embulk/output/orc/OrcOutputPluginHelper.scala @@ -18,8 +18,7 @@ object OrcOutputPluginHelper { case "file" => try Files.deleteIfExists(Paths.get(fpath)) catch { - case e: IOException => - Throwables.propagate(e) + case e: IOException => Throwables.throwIfUnchecked(e) } case "s3" | "s3n" | "s3a" => val s3Url = parseS3Url(fpath) From 3a73fa2b5df374e4058e0ef8ad5f279597d19bad Mon Sep 17 00:00:00 2001 From: Yukihiro Okada Date: Sun, 8 Dec 2019 17:06:17 +0900 Subject: [PATCH 6/8] Disable spotbugs --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 82d80dc..4e63ce5 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { id "java" id "scala" id "checkstyle" - id "com.github.spotbugs" version "3.0.0" +// id "com.github.spotbugs" version "3.0.1" id "org.sonarqube" version "2.5" } import com.github.jrubygradle.JRubyExec From c1c768529f444d8721845dcdd21a1d3a02a7a662 Mon Sep 17 00:00:00 2001 From: Yukihiro Okada Date: Sun, 8 Dec 2019 17:11:09 +0900 Subject: [PATCH 7/8] Add type annotation --- .../org/embulk/output/orc/OrcOutputPluginHelper.scala | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/scala/org/embulk/output/orc/OrcOutputPluginHelper.scala b/src/main/scala/org/embulk/output/orc/OrcOutputPluginHelper.scala index b396122..cb70a59 100644 --- a/src/main/scala/org/embulk/output/orc/OrcOutputPluginHelper.scala +++ b/src/main/scala/org/embulk/output/orc/OrcOutputPluginHelper.scala @@ -35,8 +35,8 @@ object OrcOutputPluginHelper { case _ => false } - def getSchema(fpath: String) = { - val schema = fpath.split("://").toList.apply(0) + def getSchema(fpath: String): String = { + val schema = fpath.split("://").toList.head schema match { case "s3" | "s3a" | "s3n" => schema case _ => { @@ -46,7 +46,7 @@ object OrcOutputPluginHelper { } } - def parseS3Url(s3url: String) = { + def parseS3Url(s3url: String): AmazonS3URILikeObject = { val parts = s3url.split("(://|/)").toList val bucket = parts.apply(1) val key = parts.slice(2, parts.size).mkString("/") @@ -54,4 +54,5 @@ object OrcOutputPluginHelper { } case class AmazonS3URILikeObject(@BeanProperty bucket: String, @BeanProperty key: String) + } From ae42a74403dd6253a37a1b75ecfbf4ae3b3cb715 Mon Sep 17 00:00:00 2001 From: Yukihiro Okada Date: Sun, 8 Dec 2019 17:11:24 +0900 Subject: [PATCH 8/8] Disable spotbugs action --- .github/workflows/gradle.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 03d0a6d..32386e7 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -20,6 +20,6 @@ jobs: run: | ./gradlew --info checkstyle ./gradlew --info check - - name: Spotbugs - run: | - ./gradlew spotbugsMain spotbugsTest +# - name: Spotbugs +# run: | +# ./gradlew spotbugsMain spotbugsTest