From e60a72923330b69567050d401205224cf13d3ea0 Mon Sep 17 00:00:00 2001 From: Sean Bright Date: Fri, 12 Dec 2025 15:14:56 -0500 Subject: [PATCH] general: Use consistent Locale across library. This is probably the wrong thing to do, but we sometimes use US and sometimes use English and I just wanted to pick one. --- src/main/java/org/asteriskjava/config/ConfigFileReader.java | 2 +- .../asteriskjava/manager/internal/ActionBuilderImpl.java | 2 +- .../org/asteriskjava/manager/internal/EventBuilderImpl.java | 6 +++--- .../asteriskjava/manager/response/GetConfigResponse.java | 4 ++-- src/main/java/org/asteriskjava/util/AstUtil.java | 4 ++-- src/main/java/org/asteriskjava/util/ReflectionUtil.java | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/asteriskjava/config/ConfigFileReader.java b/src/main/java/org/asteriskjava/config/ConfigFileReader.java index 3fde86bae..474266428 100644 --- a/src/main/java/org/asteriskjava/config/ConfigFileReader.java +++ b/src/main/java/org/asteriskjava/config/ConfigFileReader.java @@ -369,7 +369,7 @@ ConfigDirective parseDirective(String configfile, int lineno, String line) throw name = ""; } throw new MissingDirectiveParameterException(configfile, lineno, - "Directive '#%s' needs an argument (%s) at line %d of %s", name.toLowerCase(Locale.US), + "Directive '#%s' needs an argument (%s) at line %d of %s", name.toLowerCase(Locale.ENGLISH), "include".equalsIgnoreCase(name) ? "filename" : "/path/to/executable", lineno, configfile); } diff --git a/src/main/java/org/asteriskjava/manager/internal/ActionBuilderImpl.java b/src/main/java/org/asteriskjava/manager/internal/ActionBuilderImpl.java index 77f05d445..01f440d4c 100644 --- a/src/main/java/org/asteriskjava/manager/internal/ActionBuilderImpl.java +++ b/src/main/java/org/asteriskjava/manager/internal/ActionBuilderImpl.java @@ -293,7 +293,7 @@ private static String mapToAsterisk(Method getter) { // ok, no field } - return fieldName.toLowerCase(Locale.US); + return fieldName.toLowerCase(Locale.ENGLISH); } static String determineSetterName(String getterName) { diff --git a/src/main/java/org/asteriskjava/manager/internal/EventBuilderImpl.java b/src/main/java/org/asteriskjava/manager/internal/EventBuilderImpl.java index df5e6cc46..d007e63e8 100644 --- a/src/main/java/org/asteriskjava/manager/internal/EventBuilderImpl.java +++ b/src/main/java/org/asteriskjava/manager/internal/EventBuilderImpl.java @@ -112,7 +112,7 @@ public final void registerEventClass(String eventType, Class attributes) { return null; } - eventType = ((String) attributes.get("event")).toLowerCase(Locale.US); + eventType = ((String) attributes.get("event")).toLowerCase(Locale.ENGLISH); // Change in Asterisk 1.4 where the name of the UserEvent is sent as // property instead @@ -184,7 +184,7 @@ public ManagerEvent buildEvent(Object source, Map attributes) { return null; } - userEventType = ((String) attributes.get("userevent")).toLowerCase(Locale.US); + userEventType = ((String) attributes.get("userevent")).toLowerCase(Locale.ENGLISH); eventType = eventType + userEventType; } } diff --git a/src/main/java/org/asteriskjava/manager/response/GetConfigResponse.java b/src/main/java/org/asteriskjava/manager/response/GetConfigResponse.java index da4ec4a02..0c1f20b26 100644 --- a/src/main/java/org/asteriskjava/manager/response/GetConfigResponse.java +++ b/src/main/java/org/asteriskjava/manager/response/GetConfigResponse.java @@ -54,7 +54,7 @@ public Map getCategories() { Map responseMap = super.getAttributes(); for (Entry response : responseMap.entrySet()) { String key = response.getKey(); - if (key.toLowerCase(Locale.US).contains("category")) { + if (key.toLowerCase(Locale.ENGLISH).contains("category")) { String[] keyParts = key.split("-"); // if it doesn't have at least category-XXXXXX, skip @@ -91,7 +91,7 @@ public Map getLines(int categoryNumber) { Map responseMap = super.getAttributes(); for (Entry response : responseMap.entrySet()) { String key = response.getKey(); - if (key.toLowerCase(Locale.US).contains("line")) { + if (key.toLowerCase(Locale.ENGLISH).contains("line")) { String[] keyParts = key.split("-"); // if it doesn't have at least line-XXXXXX-XXXXXX, skip diff --git a/src/main/java/org/asteriskjava/util/AstUtil.java b/src/main/java/org/asteriskjava/util/AstUtil.java index 0f0383b27..98640c110 100644 --- a/src/main/java/org/asteriskjava/util/AstUtil.java +++ b/src/main/java/org/asteriskjava/util/AstUtil.java @@ -86,7 +86,7 @@ public static boolean isTrue(Object o) { return (Boolean) o; } - return TRUE_LITERALS.contains(o.toString().toLowerCase(Locale.US)); + return TRUE_LITERALS.contains(o.toString().toLowerCase(Locale.ENGLISH)); } /** @@ -180,7 +180,7 @@ public static boolean isNull(Object s) { return false; } - return NULL_LITERALS.contains(((String) s).toLowerCase(Locale.US)); + return NULL_LITERALS.contains(((String) s).toLowerCase(Locale.ENGLISH)); } /** diff --git a/src/main/java/org/asteriskjava/util/ReflectionUtil.java b/src/main/java/org/asteriskjava/util/ReflectionUtil.java index 201664a0c..86a32e252 100644 --- a/src/main/java/org/asteriskjava/util/ReflectionUtil.java +++ b/src/main/java/org/asteriskjava/util/ReflectionUtil.java @@ -137,7 +137,7 @@ private static Map getSettersInternal(Class clazz) { } // OK seems to be an setter - name = methodName.substring("set".length()).toLowerCase(Locale.US); + name = methodName.substring("set".length()).toLowerCase(Locale.ENGLISH); // if an event class implements a setter that exists in // ManagerEvent, then prefer the setter from the extending class