Decouple StorageUnit and Map<StorageNodeName, DataSource>

apache · Sep 28, 2023 · 9bef0bf · 9bef0bf
1 parent 49bcf13
commit 9bef0bf
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/...ain/java/org/apache/shardingsphere/infra/metadata/database/resource/unit/StorageUnit.java b/...ain/java/org/apache/shardingsphere/infra/metadata/database/resource/unit/StorageUnit.java
@@ -39,20 +39,20 @@
 @Getter
 public final class StorageUnit {
 
+    private final DataSource dataSource;
+
     private final DataSourcePoolProperties dataSourcePoolProperties;
 
     private final StorageNode storageNode;
 
-    private final DataSource dataSource;
-
     private final DatabaseType storageType;
 
     private final ConnectionProperties connectionProperties;
 
-    public StorageUnit(final String databaseName, final DataSource dataSource, final DataSourcePoolProperties props, final StorageNode storageNode) {
-        this.dataSourcePoolProperties = props;
-        this.storageNode = storageNode;
+    public StorageUnit(final String databaseName, final DataSource dataSource, final DataSourcePoolProperties dataSourcePoolProperties, final StorageNode storageNode) {
         this.dataSource = new CatalogSwitchableDataSource(dataSource, storageNode.getCatalog(), storageNode.getUrl());
+        this.dataSourcePoolProperties = dataSourcePoolProperties;
+        this.storageNode = storageNode;
         boolean isDataSourceEnabled = !DataSourceStateManager.getInstance().getEnabledDataSources(databaseName, Collections.singletonMap(storageNode.getName().getName(), dataSource)).isEmpty();
         storageType = createStorageType(isDataSourceEnabled);
         connectionProperties = createConnectionProperties(isDataSourceEnabled);