For #647: move transfer yaml to object to yaml package

sharding-jdbc-core/src/main/java/io/shardingjdbc/core/api/MasterSlaveDataSourceFactory.java

@@ -22,15 +22,10 @@ import io.shardingjdbc.core.jdbc.core.datasource.MasterSlaveDataSource;
 import io.shardingjdbc.core.yaml.masterslave.YamlMasterSlaveConfiguration;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
-import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.constructor.Constructor;
 
 import javax.sql.DataSource;
-import java.io.ByteArrayInputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.sql.SQLException;
 import java.util.Map;
 
@@ -69,7 +64,7 @@ public final class MasterSlaveDataSourceFactory {
      * @throws IOException IO exception
      */
     public static DataSource createDataSource(final File yamlFile) throws SQLException, IOException {
-        YamlMasterSlaveConfiguration config = unmarshal(yamlFile);
+        YamlMasterSlaveConfiguration config = YamlMasterSlaveConfiguration.unmarshal(yamlFile);
         return new MasterSlaveDataSource(config.getDataSources(), config.getMasterSlaveRule().getMasterSlaveRuleConfiguration().build(), config.getMasterSlaveRule().getConfigMap());
     }
     
@@ -85,7 +80,7 @@ public final class MasterSlaveDataSourceFactory {
      * @throws IOException IO exception
      */
     public static DataSource createDataSource(final Map<String, DataSource> dataSourceMap, final File yamlFile) throws SQLException, IOException {
-        YamlMasterSlaveConfiguration config = unmarshal(yamlFile);
+        YamlMasterSlaveConfiguration config = YamlMasterSlaveConfiguration.unmarshal(yamlFile);
         return new MasterSlaveDataSource(dataSourceMap, config.getMasterSlaveRule().getMasterSlaveRuleConfiguration().build(), config.getMasterSlaveRule().getConfigMap());
     }
     
@@ -97,9 +92,10 @@ public final class MasterSlaveDataSourceFactory {
      * @param yamlByteArray yaml byte array for master-slave rule configuration with data sources
      * @return master-slave data source
      * @throws SQLException SQL exception
+     * @throws IOException IO exception
      */
-    public static DataSource createDataSource(final byte[] yamlByteArray) throws SQLException {
-        YamlMasterSlaveConfiguration config = unmarshal(yamlByteArray);
+    public static DataSource createDataSource(final byte[] yamlByteArray) throws SQLException, IOException {
+        YamlMasterSlaveConfiguration config = YamlMasterSlaveConfiguration.unmarshal(yamlByteArray);
         return new MasterSlaveDataSource(config.getDataSources(), config.getMasterSlaveRule().getMasterSlaveRuleConfiguration().build(), config.getMasterSlaveRule().getConfigMap());
     }
     
@@ -112,22 +108,10 @@ public final class MasterSlaveDataSourceFactory {
      * @param yamlByteArray yaml byte array for master-slave rule configuration without data sources
      * @return master-slave data source
      * @throws SQLException SQL exception
+     * @throws IOException IO exception
      */
-    public static DataSource createDataSource(final Map<String, DataSource> dataSourceMap, final byte[] yamlByteArray) throws SQLException {
-        YamlMasterSlaveConfiguration config = unmarshal(yamlByteArray);
+    public static DataSource createDataSource(final Map<String, DataSource> dataSourceMap, final byte[] yamlByteArray) throws SQLException, IOException {
+        YamlMasterSlaveConfiguration config = YamlMasterSlaveConfiguration.unmarshal(yamlByteArray);
         return new MasterSlaveDataSource(dataSourceMap, config.getMasterSlaveRule().getMasterSlaveRuleConfiguration().build(), config.getMasterSlaveRule().getConfigMap());
     }
-    
-    private static YamlMasterSlaveConfiguration unmarshal(final File yamlFile) throws IOException {
-        try (
-                FileInputStream fileInputStream = new FileInputStream(yamlFile);
-                InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream, "UTF-8")
-        ) {
-            return new Yaml(new Constructor(YamlMasterSlaveConfiguration.class)).loadAs(inputStreamReader, YamlMasterSlaveConfiguration.class);
-        }
-    }
-    
-    private static YamlMasterSlaveConfiguration unmarshal(final byte[] yamlByteArray) {
-        return new Yaml(new Constructor(YamlMasterSlaveConfiguration.class)).loadAs(new ByteArrayInputStream(yamlByteArray), YamlMasterSlaveConfiguration.class);
-    }
 }

sharding-jdbc-core/src/main/java/io/shardingjdbc/core/api/ShardingDataSourceFactory.java

@@ -23,15 +23,10 @@ import io.shardingjdbc.core.jdbc.core.datasource.ShardingDataSource;
 import io.shardingjdbc.core.yaml.sharding.YamlShardingConfiguration;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
-import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.constructor.Constructor;
 
 import javax.sql.DataSource;
-import java.io.ByteArrayInputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.sql.SQLException;
 import java.util.Collections;
 import java.util.LinkedHashMap;
@@ -71,7 +66,7 @@ public final class ShardingDataSourceFactory {
      * @throws IOException IO exception
      */
     public static DataSource createDataSource(final File yamlFile) throws SQLException, IOException {
-        YamlShardingConfiguration config = unmarshal(yamlFile);
+        YamlShardingConfiguration config = YamlShardingConfiguration.unmarshal(yamlFile);
         Map<String, DataSource> dataSourceMap = config.getDataSources();
         processDataSourceMapWithMasterSlave(dataSourceMap, config.getShardingRule().getShardingRuleConfiguration());
         return new ShardingDataSource(dataSourceMap, config.getShardingRule(dataSourceMap.keySet()), config.getShardingRule().getConfigMap(), config.getShardingRule().getProps());
@@ -87,7 +82,7 @@ public final class ShardingDataSourceFactory {
      * @throws IOException IO exception
      */
     public static DataSource createDataSource(final Map<String, DataSource> dataSourceMap, final File yamlFile) throws SQLException, IOException {
-        YamlShardingConfiguration config = unmarshal(yamlFile);
+        YamlShardingConfiguration config = YamlShardingConfiguration.unmarshal(yamlFile);
         processDataSourceMapWithMasterSlave(dataSourceMap, config.getShardingRule().getShardingRuleConfiguration());
         return new ShardingDataSource(dataSourceMap, config.getShardingRule(dataSourceMap.keySet()), config.getShardingRule().getConfigMap(), config.getShardingRule().getProps());
     }
@@ -98,9 +93,10 @@ public final class ShardingDataSourceFactory {
      * @param yamlByteArray yaml byte array for rule configuration of databases and tables sharding with data sources
      * @return sharding data source
      * @throws SQLException SQL exception
+     * @throws IOException IO exception
      */
-    public static DataSource createDataSource(final byte[] yamlByteArray) throws SQLException {
-        YamlShardingConfiguration config = unmarshal(yamlByteArray);
+    public static DataSource createDataSource(final byte[] yamlByteArray) throws SQLException, IOException {
+        YamlShardingConfiguration config = YamlShardingConfiguration.unmarshal(yamlByteArray);
         Map<String, DataSource> dataSourceMap = config.getDataSources();
         processDataSourceMapWithMasterSlave(dataSourceMap, config.getShardingRule().getShardingRuleConfiguration());
         return new ShardingDataSource(dataSourceMap, config.getShardingRule(dataSourceMap.keySet()), config.getShardingRule().getConfigMap(), config.getShardingRule().getProps());
@@ -113,26 +109,14 @@ public final class ShardingDataSourceFactory {
      * @param yamlByteArray yaml byte array for rule configuration of databases and tables sharding without data sources
      * @return sharding data source
      * @throws SQLException SQL exception
+     * @throws IOException IO exception
      */
-    public static DataSource createDataSource(final Map<String, DataSource> dataSourceMap, final byte[] yamlByteArray) throws SQLException {
-        YamlShardingConfiguration config = unmarshal(yamlByteArray);
+    public static DataSource createDataSource(final Map<String, DataSource> dataSourceMap, final byte[] yamlByteArray) throws SQLException, IOException {
+        YamlShardingConfiguration config = YamlShardingConfiguration.unmarshal(yamlByteArray);
         processDataSourceMapWithMasterSlave(dataSourceMap, config.getShardingRule().getShardingRuleConfiguration());
         return new ShardingDataSource(dataSourceMap, config.getShardingRule(dataSourceMap.keySet()), config.getShardingRule().getConfigMap(), config.getShardingRule().getProps());
     }
     
-    private static YamlShardingConfiguration unmarshal(final File yamlFile) throws IOException {
-        try (
-                FileInputStream fileInputStream = new FileInputStream(yamlFile);
-                InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream, "UTF-8")
-        ) {
-            return new Yaml(new Constructor(YamlShardingConfiguration.class)).loadAs(inputStreamReader, YamlShardingConfiguration.class);
-        }
-    }
-    
-    private static YamlShardingConfiguration unmarshal(final byte[] yamlByteArray) {
-        return new Yaml(new Constructor(YamlShardingConfiguration.class)).loadAs(new ByteArrayInputStream(yamlByteArray), YamlShardingConfiguration.class);
-    }
-    
     private static void processDataSourceMapWithMasterSlave(final Map<String, DataSource> dataSourceMap, final ShardingRuleConfiguration shardingRuleConfiguration) throws SQLException {
         for (MasterSlaveRuleConfiguration each : shardingRuleConfiguration.getMasterSlaveRuleConfigs()) {
             processDataSourceMapWithMasterSlave(dataSourceMap, each);

sharding-jdbc-core/src/main/java/io/shardingjdbc/core/yaml/masterslave/YamlMasterSlaveConfiguration.java

@@ -19,8 +19,16 @@ package io.shardingjdbc.core.yaml.masterslave;
 
 import lombok.Getter;
 import lombok.Setter;
+import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.constructor.Constructor;
 
 import javax.sql.DataSource;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -36,4 +44,33 @@ public class YamlMasterSlaveConfiguration {
     private Map<String, DataSource> dataSources = new HashMap<>();
     
     private YamlMasterSlaveRuleConfiguration masterSlaveRule;
+    
+    /**
+     * Unmarshal yaml master slave configuration from yaml file.
+     *
+     * @param yamlFile yaml file
+     * @return yaml sharding configuration
+     * @throws IOException IO Exception
+     */
+    public static YamlMasterSlaveConfiguration unmarshal(final File yamlFile) throws IOException {
+        try (
+                FileInputStream fileInputStream = new FileInputStream(yamlFile);
+                InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream, "UTF-8")
+        ) {
+            return new Yaml(new Constructor(YamlMasterSlaveConfiguration.class)).loadAs(inputStreamReader, YamlMasterSlaveConfiguration.class);
+        }
+    }
+    
+    /**
+     * Unmarshal yaml sharding configuration from yaml bytes.
+     *
+     * @param yamlBytes yaml bytes
+     * @return yaml sharding configuration
+     * @throws IOException IO Exception
+     */
+    public static YamlMasterSlaveConfiguration unmarshal(final byte[] yamlBytes) throws IOException {
+        try (InputStream inputStream = new ByteArrayInputStream(yamlBytes)) {
+            return new Yaml(new Constructor(YamlMasterSlaveConfiguration.class)).loadAs(inputStream, YamlMasterSlaveConfiguration.class);
+        }
+    }
 }

sharding-jdbc-core/src/main/java/io/shardingjdbc/core/yaml/sharding/YamlShardingConfiguration.java

@@ -20,8 +20,16 @@ package io.shardingjdbc.core.yaml.sharding;
 import io.shardingjdbc.core.rule.ShardingRule;
 import lombok.Getter;
 import lombok.Setter;
+import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.constructor.Constructor;
 
 import javax.sql.DataSource;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
@@ -39,6 +47,35 @@ public class YamlShardingConfiguration {
     
     private YamlShardingRuleConfiguration shardingRule;
     
+    /**
+     * Unmarshal yaml sharding configuration from yaml file.
+     * 
+     * @param yamlFile yaml file
+     * @return yaml sharding configuration
+     * @throws IOException IO Exception
+     */
+    public static YamlShardingConfiguration unmarshal(final File yamlFile) throws IOException {
+        try (
+                FileInputStream fileInputStream = new FileInputStream(yamlFile);
+                InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream, "UTF-8")
+        ) {
+            return new Yaml(new Constructor(YamlShardingConfiguration.class)).loadAs(inputStreamReader, YamlShardingConfiguration.class);
+        }
+    }
+    
+    /**
+     * Unmarshal yaml sharding configuration from yaml bytes.
+     * 
+     * @param yamlBytes yaml bytes
+     * @return yaml sharding configuration
+     * @throws IOException IO Exception
+     */
+    public static YamlShardingConfiguration unmarshal(final byte[] yamlBytes) throws IOException {
+        try (InputStream inputStream = new ByteArrayInputStream(yamlBytes)) {
+            return new Yaml(new Constructor(YamlShardingConfiguration.class)).loadAs(inputStream, YamlShardingConfiguration.class);
+        }
+    }
+    
     /**
      * Get sharding rule from yaml.
      *