From 6f375126739c42c479af43294eb854a8699b8f8b Mon Sep 17 00:00:00 2001 From: marhali Date: Tue, 9 Apr 2024 23:36:46 +0200 Subject: [PATCH] define direct dependency on apache commons Resolves #383, Resolves #375, Resolves #367 --- CHANGELOG.md | 4 ++++ build.gradle.kts | 2 ++ gradle/libs.versions.toml | 4 ++++ src/main/java/de/marhali/easyi18n/io/parser/ArrayMapper.java | 1 + .../java/de/marhali/easyi18n/io/parser/json/JsonMapper.java | 1 + .../de/marhali/easyi18n/io/parser/json5/Json5ArrayMapper.java | 1 + .../java/de/marhali/easyi18n/io/parser/json5/Json5Mapper.java | 1 + .../easyi18n/io/parser/properties/PropertiesMapper.java | 1 + .../java/de/marhali/easyi18n/io/parser/yaml/YamlMapper.java | 3 ++- 9 files changed, 17 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ab784e..c79063c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ - Update dependencies +### Fixed + +- Define direct dependency on Apache Commons + ## [4.4.4] - 2023-12-11 ### Fixed diff --git a/build.gradle.kts b/build.gradle.kts index 953ec28..c7b10d9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -25,6 +25,8 @@ repositories { dependencies { // implementation(libs.annotations) implementation(libs.json5.java) + implementation(libs.commons.lang3) + implementation(libs.commons.text) } // Set the JVM language level used to build the project. diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8ef329d..e2d8faf 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,6 +2,8 @@ # libraries annotations = "24.1.0" json5-java = "2.0.0" +commons-lang3 = "3.14.0" +commons-text = "1.11.0" # plugins kotlin = "1.9.23" @@ -13,6 +15,8 @@ kover = "0.7.6" [libraries] annotations = { group = "org.jetbrains", name = "annotations", version.ref = "annotations" } json5-java = { group = "de.marhali", name = "json5-java", version.ref = "json5-java" } +commons-lang3 = { group = "org.apache.commons", name = "commons-lang3", version.ref = "commons-lang3" } +commons-text = { group = "org.apache.commons", name = "commons-text", version.ref = "commons-text" } [plugins] changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" } diff --git a/src/main/java/de/marhali/easyi18n/io/parser/ArrayMapper.java b/src/main/java/de/marhali/easyi18n/io/parser/ArrayMapper.java index a1d6ce6..ebbc3f9 100644 --- a/src/main/java/de/marhali/easyi18n/io/parser/ArrayMapper.java +++ b/src/main/java/de/marhali/easyi18n/io/parser/ArrayMapper.java @@ -1,6 +1,7 @@ package de.marhali.easyi18n.io.parser; import de.marhali.easyi18n.util.StringUtil; + import org.apache.commons.text.StringEscapeUtils; import java.text.MessageFormat; diff --git a/src/main/java/de/marhali/easyi18n/io/parser/json/JsonMapper.java b/src/main/java/de/marhali/easyi18n/io/parser/json/JsonMapper.java index 6ef013f..73a7237 100644 --- a/src/main/java/de/marhali/easyi18n/io/parser/json/JsonMapper.java +++ b/src/main/java/de/marhali/easyi18n/io/parser/json/JsonMapper.java @@ -7,6 +7,7 @@ import com.google.gson.JsonPrimitive; import de.marhali.easyi18n.model.TranslationNode; import de.marhali.easyi18n.model.TranslationValue; import de.marhali.easyi18n.util.StringUtil; + import org.apache.commons.lang3.math.NumberUtils; import org.apache.commons.text.StringEscapeUtils; diff --git a/src/main/java/de/marhali/easyi18n/io/parser/json5/Json5ArrayMapper.java b/src/main/java/de/marhali/easyi18n/io/parser/json5/Json5ArrayMapper.java index 208f070..0b7e37d 100644 --- a/src/main/java/de/marhali/easyi18n/io/parser/json5/Json5ArrayMapper.java +++ b/src/main/java/de/marhali/easyi18n/io/parser/json5/Json5ArrayMapper.java @@ -5,6 +5,7 @@ import de.marhali.easyi18n.util.StringUtil; import de.marhali.json5.Json5; import de.marhali.json5.Json5Array; import de.marhali.json5.Json5Primitive; + import org.apache.commons.lang3.math.NumberUtils; import java.io.IOException; diff --git a/src/main/java/de/marhali/easyi18n/io/parser/json5/Json5Mapper.java b/src/main/java/de/marhali/easyi18n/io/parser/json5/Json5Mapper.java index 7e9accc..9a82fa7 100644 --- a/src/main/java/de/marhali/easyi18n/io/parser/json5/Json5Mapper.java +++ b/src/main/java/de/marhali/easyi18n/io/parser/json5/Json5Mapper.java @@ -6,6 +6,7 @@ import de.marhali.easyi18n.util.StringUtil; import de.marhali.json5.Json5Element; import de.marhali.json5.Json5Object; import de.marhali.json5.Json5Primitive; + import org.apache.commons.lang3.math.NumberUtils; import org.apache.commons.text.StringEscapeUtils; diff --git a/src/main/java/de/marhali/easyi18n/io/parser/properties/PropertiesMapper.java b/src/main/java/de/marhali/easyi18n/io/parser/properties/PropertiesMapper.java index 1b5a326..c4db54d 100644 --- a/src/main/java/de/marhali/easyi18n/io/parser/properties/PropertiesMapper.java +++ b/src/main/java/de/marhali/easyi18n/io/parser/properties/PropertiesMapper.java @@ -5,6 +5,7 @@ import de.marhali.easyi18n.model.KeyPath; import de.marhali.easyi18n.model.TranslationValue; import de.marhali.easyi18n.util.KeyPathConverter; import de.marhali.easyi18n.util.StringUtil; + import org.apache.commons.lang3.math.NumberUtils; import org.apache.commons.text.StringEscapeUtils; diff --git a/src/main/java/de/marhali/easyi18n/io/parser/yaml/YamlMapper.java b/src/main/java/de/marhali/easyi18n/io/parser/yaml/YamlMapper.java index 37a09bd..5fe1701 100644 --- a/src/main/java/de/marhali/easyi18n/io/parser/yaml/YamlMapper.java +++ b/src/main/java/de/marhali/easyi18n/io/parser/yaml/YamlMapper.java @@ -3,6 +3,7 @@ package de.marhali.easyi18n.io.parser.yaml; import de.marhali.easyi18n.model.TranslationNode; import de.marhali.easyi18n.model.TranslationValue; import de.marhali.easyi18n.util.StringUtil; + import org.apache.commons.lang3.math.NumberUtils; import org.apache.commons.text.StringEscapeUtils; @@ -42,7 +43,7 @@ public class YamlMapper { // Nested node - run recursively Map childSection = new HashMap<>(); write(locale, childSection, childNode); - if(childSection.size() > 0) { + if(!childSection.isEmpty()) { section.put(key, childSection); } } else {