From 860fe08ea149c42bd9fb61a608e60c2d8d0385d7 Mon Sep 17 00:00:00 2001 From: marhali Date: Fri, 8 Dec 2023 21:55:14 +0100 Subject: [PATCH] replace deprecated apache commons utils --- CHANGELOG.md | 1 + .../java/de/marhali/easyi18n/io/parser/ArrayMapper.java | 3 +-- .../de/marhali/easyi18n/io/parser/json/JsonMapper.java | 7 +++---- .../marhali/easyi18n/io/parser/json5/Json5ArrayMapper.java | 5 ++--- .../de/marhali/easyi18n/io/parser/json5/Json5Mapper.java | 7 +++---- .../easyi18n/io/parser/properties/PropertiesMapper.java | 7 +++---- .../de/marhali/easyi18n/io/parser/yaml/YamlMapper.java | 7 +++---- 7 files changed, 16 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 121d0c0..db336c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Support for all 2023.3 builds (233.*) ### Changed +- Replace deprecated apache commons utils - Update dependencies ## [4.4.2] - 2023-09-02 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 ec164cd..a1d6ce6 100644 --- a/src/main/java/de/marhali/easyi18n/io/parser/ArrayMapper.java +++ b/src/main/java/de/marhali/easyi18n/io/parser/ArrayMapper.java @@ -1,8 +1,7 @@ package de.marhali.easyi18n.io.parser; import de.marhali.easyi18n.util.StringUtil; - -import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; import java.text.MessageFormat; import java.util.Iterator; 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 328eae7..6ef013f 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,9 +7,8 @@ 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.lang.StringEscapeUtils; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.math.NumberUtils; +import org.apache.commons.text.StringEscapeUtils; import java.util.Map; @@ -61,7 +60,7 @@ public class JsonMapper { if(content != null) { if(JsonArrayMapper.isArray(content)) { json.add(key, JsonArrayMapper.write(content)); - } else if(NumberUtils.isNumber(content)) { + } else if(NumberUtils.isCreatable(content)) { json.add(key, new JsonPrimitive(NumberUtils.createNumber(content))); } else { json.add(key, new JsonPrimitive(StringEscapeUtils.unescapeJava(content))); 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 c5f545b..208f070 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,8 +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.lang.math.NumberUtils; +import org.apache.commons.lang3.math.NumberUtils; import java.io.IOException; @@ -40,7 +39,7 @@ public class Json5ArrayMapper extends ArrayMapper { } else { if(StringUtil.isHexString(element)) { array.add(Json5Primitive.of(element, true)); - } else if(NumberUtils.isNumber(element)) { + } else if(NumberUtils.isCreatable(element)) { array.add(Json5Primitive.of(NumberUtils.createNumber(element))); } else { array.add(Json5Primitive.of(element)); 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 dc6bdfe..7e9accc 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,9 +6,8 @@ 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.lang.StringEscapeUtils; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.math.NumberUtils; +import org.apache.commons.text.StringEscapeUtils; import java.util.Map; @@ -61,7 +60,7 @@ public class Json5Mapper { json.add(key, Json5ArrayMapper.write(content)); } else if(StringUtil.isHexString(content)) { json.add(key, Json5Primitive.of(content, true)); - } else if(NumberUtils.isNumber(content)) { + } else if(NumberUtils.isCreatable(content)) { json.add(key, Json5Primitive.of(NumberUtils.createNumber(content))); } else { json.add(key, Json5Primitive.of(StringEscapeUtils.unescapeJava(content))); 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 2cac6ae..1b5a326 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,9 +5,8 @@ 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.lang.StringEscapeUtils; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.math.NumberUtils; +import org.apache.commons.text.StringEscapeUtils; import java.util.Map; @@ -51,7 +50,7 @@ public class PropertiesMapper { if(PropertiesArrayMapper.isArray(content)) { properties.put(simpleKey, PropertiesArrayMapper.write(content)); - } else if(NumberUtils.isNumber(content)) { + } else if(NumberUtils.isCreatable(content)) { properties.put(simpleKey, NumberUtils.createNumber(content)); } else { properties.put(simpleKey, StringEscapeUtils.unescapeJava(content)); 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 78709b6..37a09bd 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,9 +3,8 @@ 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.lang.StringEscapeUtils; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.math.NumberUtils; +import org.apache.commons.text.StringEscapeUtils; import java.util.HashMap; import java.util.List; @@ -53,7 +52,7 @@ public class YamlMapper { if(content != null) { if(YamlArrayMapper.isArray(content)) { section.put(key, YamlArrayMapper.write(content)); - } else if(NumberUtils.isNumber(content)) { + } else if(NumberUtils.isCreatable(content)) { section.put(key, NumberUtils.createNumber(content)); } else { section.put(key, StringEscapeUtils.unescapeJava(content));