Simplify code

FirebirdSQL · Sep 26, 2023 · c454fa7 · c454fa7
1 parent d8a9f43
commit c454fa7
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/src/main/org/firebirdsql/jaybird/props/def/ConnectionProperty.java b/src/main/org/firebirdsql/jaybird/props/def/ConnectionProperty.java
@@ -32,7 +32,6 @@
 
 import static java.util.Collections.*;
 import static java.util.Objects.requireNonNull;
-import static java.util.stream.Collectors.toList;
 import static org.firebirdsql.jaybird.util.StringUtils.trimToNull;
 
 /**
@@ -241,12 +240,7 @@ public String toString() {
      */
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof ConnectionProperty)) return false;
-
-        ConnectionProperty that = (ConnectionProperty) o;
-
-        return name.equals(that.name);
+        return this == o || o instanceof ConnectionProperty that && name.equals(that.name);
     }
 
     /**
@@ -296,8 +290,8 @@ private static List<String> normalizeValues(List<String> values) {
         List<String> normalizedValues = values.stream()
                 .map(StringUtils::trimToNull)
                 .filter(Objects::nonNull)
-                .collect(toList());
-        return normalizedValues.isEmpty() ? emptyList() : unmodifiableList(normalizedValues);
+                .toList();
+        return normalizedValues.isEmpty() ? emptyList() : normalizedValues;
     }
 
     public static final class Builder {