Handle null in DataSourceUtil#isDefault

quarkusio · Sep 27, 2024 · 0baf232 · 0baf232
1 parent 8f72c96
commit 0baf232
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/...roal/deployment/src/main/java/io/quarkus/agroal/deployment/AgroalDataSourceBuildUtil.java b/...roal/deployment/src/main/java/io/quarkus/agroal/deployment/AgroalDataSourceBuildUtil.java
@@ -13,7 +13,7 @@ private AgroalDataSourceBuildUtil() {
     }
 
     public static AnnotationInstance qualifier(String dataSourceName) {
-        if (dataSourceName == null || DataSourceUtil.isDefault(dataSourceName)) {
+        if (DataSourceUtil.isDefault(dataSourceName)) {
             return AnnotationInstance.builder(Default.class).build();
         } else {
             return AnnotationInstance.builder(DataSource.class).value(dataSourceName).build();

diff --git a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/AgroalDataSourceUtil.java b/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/AgroalDataSourceUtil.java
@@ -22,7 +22,7 @@ public static String dataSourceName(Bean<? extends javax.sql.DataSource> bean) {
     }
 
     public static Annotation qualifier(String dataSourceName) {
-        if (dataSourceName == null || DataSourceUtil.isDefault(dataSourceName)) {
+        if (DataSourceUtil.isDefault(dataSourceName)) {
             return Default.Literal.INSTANCE;
         } else {
             return new DataSource.DataSourceLiteral(dataSourceName);

diff --git a/.../datasource/common/src/main/java/io/quarkus/datasource/common/runtime/DataSourceUtil.java b/.../datasource/common/src/main/java/io/quarkus/datasource/common/runtime/DataSourceUtil.java
@@ -12,23 +12,23 @@ public final class DataSourceUtil {
     public static final String DEFAULT_DATASOURCE_NAME = "<default>";
 
     public static boolean isDefault(String dataSourceName) {
-        return DEFAULT_DATASOURCE_NAME.equals(dataSourceName);
+        return dataSourceName == null || DEFAULT_DATASOURCE_NAME.equals(dataSourceName);
     }
 
     public static boolean hasDefault(Collection<String> dataSourceNames) {
         return dataSourceNames.contains(DEFAULT_DATASOURCE_NAME);
     }
 
     public static String dataSourcePropertyKey(String datasourceName, String radical) {
-        if (datasourceName == null || DataSourceUtil.isDefault(datasourceName)) {
+        if (DataSourceUtil.isDefault(datasourceName)) {
             return "quarkus.datasource." + radical;
         } else {
             return "quarkus.datasource.\"" + datasourceName + "\"." + radical;
         }
     }
 
     public static List<String> dataSourcePropertyKeys(String datasourceName, String radical) {
-        if (datasourceName == null || DataSourceUtil.isDefault(datasourceName)) {
+        if (DataSourceUtil.isDefault(datasourceName)) {
             return List.of("quarkus.datasource." + radical);
         } else {
             // Two possible syntaxes: with or without quotes

diff --git a/.../runtime/src/main/java/io/quarkus/reactive/datasource/runtime/ReactiveDataSourceUtil.java b/.../runtime/src/main/java/io/quarkus/reactive/datasource/runtime/ReactiveDataSourceUtil.java
@@ -23,7 +23,7 @@ public static String dataSourceName(Bean<? extends Pool> bean) {
     }
 
     public static Annotation qualifier(String dataSourceName) {
-        if (dataSourceName == null || DataSourceUtil.isDefault(dataSourceName)) {
+        if (DataSourceUtil.isDefault(dataSourceName)) {
             return Default.Literal.INSTANCE;
         } else {
             return new ReactiveDataSource.ReactiveDataSourceLiteral(dataSourceName);