From b84cf8cfb5cb3ff6d312f4df4400cd5f0e637551 Mon Sep 17 00:00:00 2001 From: Taylor Smock Date: Thu, 16 Dec 2021 14:46:27 -0700 Subject: [PATCH 1/3] PersistenceTools: log4j -> slf4j logging Signed-off-by: Taylor Smock --- .../tools/spark/persistence/PersistenceTools.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/openstreetmap/atlas/generator/tools/spark/persistence/PersistenceTools.java b/src/main/java/org/openstreetmap/atlas/generator/tools/spark/persistence/PersistenceTools.java index 59487bc..ae73ab4 100644 --- a/src/main/java/org/openstreetmap/atlas/generator/tools/spark/persistence/PersistenceTools.java +++ b/src/main/java/org/openstreetmap/atlas/generator/tools/spark/persistence/PersistenceTools.java @@ -8,7 +8,6 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.IOUtils; -import org.apache.log4j.Logger; import org.openstreetmap.atlas.exception.CoreException; import org.openstreetmap.atlas.generator.sharding.AtlasSharding; import org.openstreetmap.atlas.generator.tools.spark.SparkJob; @@ -19,6 +18,8 @@ import org.openstreetmap.atlas.streaming.resource.ResourceCloseable; import org.openstreetmap.atlas.utilities.runtime.Command.Optionality; import org.openstreetmap.atlas.utilities.runtime.Command.Switch; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author matthieun @@ -37,7 +38,7 @@ public class PersistenceTools private static final Integer BUFFER_SIZE = 4 * 1024; private final Map configurationMap; - private static final Logger logger = Logger.getLogger(PersistenceTools.class); + private static final Logger logger = LoggerFactory.getLogger(PersistenceTools.class); public PersistenceTools(final Map configurationMap) { @@ -53,7 +54,7 @@ public CountryBoundaryMap boundaries(final String input) } catch (final Exception e) { - logger.error(e); + logger.error("Could not close file", e); throw new CoreException("Could not close {}", SparkFileHelper.combine(input, BOUNDARIES_FILE), e); } From 598c66a9da3c007014baab3cdcffd6b849c30776 Mon Sep 17 00:00:00 2001 From: Taylor Smock Date: Mon, 27 Dec 2021 07:46:34 -0700 Subject: [PATCH 2/3] Dependency updates Signed-off-by: Taylor Smock --- build.gradle | 4 ++-- dependencies.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 58b28a6..76ea517 100644 --- a/build.gradle +++ b/build.gradle @@ -6,8 +6,8 @@ plugins { id 'signing' id 'checkstyle' id 'jacoco' - id "com.diffplug.gradle.spotless" version "3.27.0" - id 'org.sonarqube' version '2.8' + id "com.diffplug.spotless" version "6.1.0" + id 'org.sonarqube' version '3.3' // id "io.codearte.nexus-staging" version "0.12.0" } diff --git a/dependencies.gradle b/dependencies.gradle index 9fae07b..e801cf1 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,11 +1,11 @@ project.ext.versions = [ checkstyle: '8.18', - jacoco: '0.8.3', + jacoco: '0.8.7', atlas: '7.0.2', spark: '3.0.1', snappy: '1.1.1.6', atlas_checkstyle: '5.6.9', - jline: '3.7.0' + jline: '3.21.0' ] project.ext.packages = [ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index da9702f..19c92df 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip +distributionSha256Sum=8b356fd8702d5ffa2e066ed0be45a023a779bba4dd1a68fd11bc2a6bdc981e8f +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 5eb2b8ab24bf7df8e618410fdaaa0d8a100360b1 Mon Sep 17 00:00:00 2001 From: Taylor Smock Date: Mon, 27 Dec 2021 09:04:37 -0700 Subject: [PATCH 3/3] Remove logger.error, since we are throwing a CoreException (SONAR) Signed-off-by: Taylor Smock --- .../generator/tools/spark/persistence/PersistenceTools.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/org/openstreetmap/atlas/generator/tools/spark/persistence/PersistenceTools.java b/src/main/java/org/openstreetmap/atlas/generator/tools/spark/persistence/PersistenceTools.java index ae73ab4..469ffb8 100644 --- a/src/main/java/org/openstreetmap/atlas/generator/tools/spark/persistence/PersistenceTools.java +++ b/src/main/java/org/openstreetmap/atlas/generator/tools/spark/persistence/PersistenceTools.java @@ -18,8 +18,6 @@ import org.openstreetmap.atlas.streaming.resource.ResourceCloseable; import org.openstreetmap.atlas.utilities.runtime.Command.Optionality; import org.openstreetmap.atlas.utilities.runtime.Command.Switch; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * @author matthieun @@ -38,7 +36,6 @@ public class PersistenceTools private static final Integer BUFFER_SIZE = 4 * 1024; private final Map configurationMap; - private static final Logger logger = LoggerFactory.getLogger(PersistenceTools.class); public PersistenceTools(final Map configurationMap) { @@ -54,7 +51,6 @@ public CountryBoundaryMap boundaries(final String input) } catch (final Exception e) { - logger.error("Could not close file", e); throw new CoreException("Could not close {}", SparkFileHelper.combine(input, BOUNDARIES_FILE), e); }