Add consistent trimming behavior to converters

quarkusio · Nov 22, 2019 · ab0a255 · ab0a255
1 parent 4638078
commit ab0a255
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/CidrAddressConverter.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/CidrAddressConverter.java
@@ -15,7 +15,8 @@
 public class CidrAddressConverter implements Converter<CidrAddress> {
 
     @Override
-    public CidrAddress convert(final String value) {
+    public CidrAddress convert(String value) {
+        value = value.trim();
         if (value.isEmpty()) {
             return null;
         }

diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/DurationConverter.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/DurationConverter.java
@@ -32,6 +32,7 @@ public DurationConverter() {
      */
     @Override
     public Duration convert(String value) {
+        value = value.trim();
         if (value.isEmpty()) {
             return null;
         }

diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/HyphenateEnumConverter.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/HyphenateEnumConverter.java
@@ -35,11 +35,10 @@ public static <E extends Enum<E>> HyphenateEnumConverter<E> of(Class<E> enumType
 
     @Override
     public E convert(String value) {
-        if (value == null || value.trim().isEmpty()) {
+        value = value.trim();
+        if (value.isEmpty()) {
             return null;
         }
-
-        value = value.trim();
         final String hyphenatedValue = hyphenate(value);
         final Enum<?> enumValue = values.get(hyphenatedValue);
 

diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/InetAddressConverter.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/InetAddressConverter.java
@@ -17,7 +17,8 @@
 public class InetAddressConverter implements Converter<InetAddress> {
 
     @Override
-    public InetAddress convert(final String value) {
+    public InetAddress convert(String value) {
+        value = value.trim();
         if (value.isEmpty()) {
             return null;
         }

diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/InetSocketAddressConverter.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/InetSocketAddressConverter.java
@@ -19,7 +19,8 @@
 public class InetSocketAddressConverter implements Converter<InetSocketAddress> {
 
     @Override
-    public InetSocketAddress convert(final String value) {
+    public InetSocketAddress convert(String value) {
+        value = value.trim();
         if (value.isEmpty()) {
             return null;
         }

diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/MemorySizeConverter.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/MemorySizeConverter.java
@@ -42,6 +42,7 @@ public class MemorySizeConverter implements Converter<MemorySize> {
      * @return {@link MemorySize} - a memory size represented by the given value
      */
     public MemorySize convert(String value) {
+        value = value.trim();
         if (value.isEmpty()) {
             return null;
         }