for #601: format xml

apache · May 4, 2018 · 616eb83 · 616eb83
1 parent b2ed5d1
commit 616eb83
Show file tree

Hide file tree

Showing 25 changed files with 193 additions and 193 deletions.
diff --git a/sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/StartTest.java b/sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/StartTest.java
@@ -17,6 +17,7 @@
 
 package io.shardingjdbc.dbtest;
 
+import com.google.common.base.Strings;
 import io.shardingjdbc.dbtest.asserts.AssertEngine;
 import io.shardingjdbc.dbtest.config.bean.AssertDDLDefinition;
 import io.shardingjdbc.dbtest.config.bean.AssertDMLDefinition;
@@ -26,7 +27,6 @@
 import io.shardingjdbc.dbtest.exception.DbTestException;
 import io.shardingjdbc.dbtest.init.InItCreateSchema;
 import lombok.RequiredArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -76,8 +76,8 @@ public static Collection<String[]> getParameters() throws IOException, JAXBExcep
         assertNotNull(integrateResources);
         for (String each : getAssertFiles(integrateResources)) {
             AssertsDefinition assertsDefinition = unmarshal(each);
-            if (StringUtils.isNotBlank(assertsDefinition.getBaseConfig())) {
-                String[] dbs = StringUtils.split(assertsDefinition.getBaseConfig(), ",");
+            if (!Strings.isNullOrEmpty(assertsDefinition.getBaseConfig())) {
+                String[] dbs = assertsDefinition.getBaseConfig().split(",");
                 for (String db : dbs) {
                     InItCreateSchema.addDatabase(db);
                 }

diff --git a/sharding-jdbc-core/src/test/resources/integrate/dbtest/db/database.xml b/sharding-jdbc-core/src/test/resources/integrate/dbtest/db/database.xml
@@ -10,4 +10,4 @@
     <database>db_7</database>
     <database>db_8</database>
     <database>db_9</database>
-</databases>
+</databases>
diff --git a/sharding-jdbc-core/src/test/resources/integrate/dbtest/db/table/create-table.xml b/sharding-jdbc-core/src/test/resources/integrate/dbtest/db/table/create-table.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sqls>
-    <sql id="dbCreateTOrder"/>
-    <sql id="dbCreateTOrderItem"/>
-</sqls>
+    <sql id="dbCreateTOrder "/>
+    <sql id="dbCreateTOrderItem "/>
+</sqls>
diff --git a/sharding-jdbc-core/src/test/resources/integrate/dbtest/db/table/drop-table.xml b/sharding-jdbc-core/src/test/resources/integrate/dbtest/db/table/drop-table.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sqls>
-    <sql id="dbDropTOrder"/>
-    <sql id="dbDropTOrderItem"/>
-</sqls>
+    <sql id="dbDropTOrder "/>
+    <sql id="dbDropTOrderItem "/>
+</sqls>
diff --git a/sharding-jdbc-core/src/test/resources/integrate/dbtest/dbtbl/database.xml b/sharding-jdbc-core/src/test/resources/integrate/dbtest/dbtbl/database.xml
@@ -10,4 +10,4 @@
     <database>dbtbl_7</database>
     <database>dbtbl_8</database>
     <database>dbtbl_9</database>
-</databases>
+</databases>
diff --git a/sharding-jdbc-core/src/test/resources/integrate/dbtest/dbtbl/table/create-table.xml b/sharding-jdbc-core/src/test/resources/integrate/dbtest/dbtbl/table/create-table.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sqls>
-    <sql id="dbtblCreateTOrder0"/>
-    <sql id="dbtblCreateTOrder1"/>
-    <sql id="dbtblCreateTOrder2"/>
-    <sql id="dbtblCreateTOrder3"/>
-    <sql id="dbtblCreateTOrder4"/>
-    <sql id="dbtblCreateTOrder5"/>
-    <sql id="dbtblCreateTOrder6"/>
-    <sql id="dbtblCreateTOrder7"/>
-    <sql id="dbtblCreateTOrder8"/>
-    <sql id="dbtblCreateTOrder9"/>
-    <sql id="dbtblCreateTOrderItem0"/>
-    <sql id="dbtblCreateTOrderItem1"/>
-    <sql id="dbtblCreateTOrderItem2"/>
-    <sql id="dbtblCreateTOrderItem3"/>
-    <sql id="dbtblCreateTOrderItem4"/>
-    <sql id="dbtblCreateTOrderItem5"/>
-    <sql id="dbtblCreateTOrderItem6"/>
-    <sql id="dbtblCreateTOrderItem7"/>
-    <sql id="dbtblCreateTOrderItem8"/>
-    <sql id="dbtblCreateTOrderItem9"/>
-    <sql id="dbtblCreateTConfig"/>
-    <sql id="dbtblCreateTGlobal"/>
-</sqls>
+    <sql id="dbtblCreateTOrder0 "/>
+    <sql id="dbtblCreateTOrder1 "/>
+    <sql id="dbtblCreateTOrder2 "/>
+    <sql id="dbtblCreateTOrder3 "/>
+    <sql id="dbtblCreateTOrder4 "/>
+    <sql id="dbtblCreateTOrder5 "/>
+    <sql id="dbtblCreateTOrder6 "/>
+    <sql id="dbtblCreateTOrder7 "/>
+    <sql id="dbtblCreateTOrder8 "/>
+    <sql id="dbtblCreateTOrder9 "/>
+    <sql id="dbtblCreateTOrderItem0 "/>
+    <sql id="dbtblCreateTOrderItem1 "/>
+    <sql id="dbtblCreateTOrderItem2 "/>
+    <sql id="dbtblCreateTOrderItem3 "/>
+    <sql id="dbtblCreateTOrderItem4 "/>
+    <sql id="dbtblCreateTOrderItem5 "/>
+    <sql id="dbtblCreateTOrderItem6 "/>
+    <sql id="dbtblCreateTOrderItem7 "/>
+    <sql id="dbtblCreateTOrderItem8 "/>
+    <sql id="dbtblCreateTOrderItem9 "/>
+    <sql id="dbtblCreateTConfig "/>
+    <sql id="dbtblCreateTGlobal "/>
+</sqls>
diff --git a/sharding-jdbc-core/src/test/resources/integrate/dbtest/dbtbl/table/drop-table.xml b/sharding-jdbc-core/src/test/resources/integrate/dbtest/dbtbl/table/drop-table.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sqls>
-    <sql id="dbtblDropTOrder0"/>
-    <sql id="dbtblDropTOrder1"/>
-    <sql id="dbtblDropTOrder2"/>
-    <sql id="dbtblDropTOrder3"/>
-    <sql id="dbtblDropTOrder4"/>
-    <sql id="dbtblDropTOrder5"/>
-    <sql id="dbtblDropTOrder6"/>
-    <sql id="dbtblDropTOrder7"/>
-    <sql id="dbtblDropTOrder8"/>
-    <sql id="dbtblDropTOrder9"/>
-    <sql id="dbtblDropTOrderItem0"/>
-    <sql id="dbtblDropTOrderItem1"/>
-    <sql id="dbtblDropTOrderItem2"/>
-    <sql id="dbtblDropTOrderItem3"/>
-    <sql id="dbtblDropTOrderItem4"/>
-    <sql id="dbtblDropTOrderItem5"/>
-    <sql id="dbtblDropTOrderItem6"/>
-    <sql id="dbtblDropTOrderItem7"/>
-    <sql id="dbtblDropTOrderItem8"/>
-    <sql id="dbtblDropTOrderItem9"/>
-    <sql id="dbtblDropTOrderConfig"/>
-    <sql id="dbtblDropTOrderGlobal"/>
-</sqls>
+    <sql id="dbtblDropTOrder0 "/>
+    <sql id="dbtblDropTOrder1 "/>
+    <sql id="dbtblDropTOrder2 "/>
+    <sql id="dbtblDropTOrder3 "/>
+    <sql id="dbtblDropTOrder4 "/>
+    <sql id="dbtblDropTOrder5 "/>
+    <sql id="dbtblDropTOrder6 "/>
+    <sql id="dbtblDropTOrder7 "/>
+    <sql id="dbtblDropTOrder8 "/>
+    <sql id="dbtblDropTOrder9 "/>
+    <sql id="dbtblDropTOrderItem0 "/>
+    <sql id="dbtblDropTOrderItem1 "/>
+    <sql id="dbtblDropTOrderItem2 "/>
+    <sql id="dbtblDropTOrderItem3 "/>
+    <sql id="dbtblDropTOrderItem4 "/>
+    <sql id="dbtblDropTOrderItem5 "/>
+    <sql id="dbtblDropTOrderItem6 "/>
+    <sql id="dbtblDropTOrderItem7 "/>
+    <sql id="dbtblDropTOrderItem8 "/>
+    <sql id="dbtblDropTOrderItem9 "/>
+    <sql id="dbtblDropTOrderConfig "/>
+    <sql id="dbtblDropTOrderGlobal "/>
+</sqls>
diff --git a/sharding-jdbc-core/src/test/resources/integrate/dbtest/jdbc/database.xml b/sharding-jdbc-core/src/test/resources/integrate/dbtest/jdbc/database.xml
@@ -2,4 +2,4 @@
 <databases>
     <database>jdbc_0</database>
     <database>jdbc_1</database>
-</databases>
+</databases>
diff --git a/sharding-jdbc-core/src/test/resources/integrate/dbtest/jdbc/table/create-table.xml b/sharding-jdbc-core/src/test/resources/integrate/dbtest/jdbc/table/create-table.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sqls>
-    <sql id="jdbcCreateTOrder0"/>
-    <sql id="jdbcCreateTOrder1"/>
-    <sql id="jdbcCreateTOrderItem0"/>
-    <sql id="jdbcCreateTOrderItem1"/>
-    <sql id="jdbcCreateTConfig"/>
-    <sql id="jdbcCreateTGlobal"/>
-</sqls>
+    <sql id="jdbcCreateTOrder0 "/>
+    <sql id="jdbcCreateTOrder1 "/>
+    <sql id="jdbcCreateTOrderItem0 "/>
+    <sql id="jdbcCreateTOrderItem1 "/>
+    <sql id="jdbcCreateTConfig "/>
+    <sql id="jdbcCreateTGlobal "/>
+</sqls>
diff --git a/sharding-jdbc-core/src/test/resources/integrate/dbtest/jdbc/table/drop-table.xml b/sharding-jdbc-core/src/test/resources/integrate/dbtest/jdbc/table/drop-table.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sqls>
-    <sql id="jdbcDropTOrder0"/>
-    <sql id="jdbcDropTOrder1"/>
-    <sql id="jdbcDropTOrderItem0"/>
-    <sql id="jdbcDropTOrderItem1"/>
-    <sql id="jdbcDropTConfig"/>
-    <sql id="jdbcDropTGlobal"/>
-</sqls>
+    <sql id="jdbcDropTOrder0 "/>
+    <sql id="jdbcDropTOrder1 "/>
+    <sql id="jdbcDropTOrderItem0 "/>
+    <sql id="jdbcDropTOrderItem1 "/>
+    <sql id="jdbcDropTConfig "/>
+    <sql id="jdbcDropTGlobal "/>
+</sqls>
diff --git a/sharding-jdbc-core/src/test/resources/integrate/dbtest/master_only/database.xml b/sharding-jdbc-core/src/test/resources/integrate/dbtest/master_only/database.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <databases>
     <database>master_only</database>
-</databases>
+</databases>
diff --git a/sharding-jdbc-core/src/test/resources/integrate/dbtest/master_only/table/create-table.xml b/sharding-jdbc-core/src/test/resources/integrate/dbtest/master_only/table/create-table.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sqls>
-    <sql id="masterOnlyCreateTOrder"/>
-    <sql id="masterOnlyCreateTOrderItem"/>
-    <sql id="masterOnlyCreateTConfig"/>
-    <sql id="masterOnlyCreateTGlobal"/>
-</sqls>
+    <sql id="masterOnlyCreateTOrder "/>
+    <sql id="masterOnlyCreateTOrderItem "/>
+    <sql id="masterOnlyCreateTConfig "/>
+    <sql id="masterOnlyCreateTGlobal "/>
+</sqls>
diff --git a/sharding-jdbc-core/src/test/resources/integrate/dbtest/master_only/table/drop-table.xml b/sharding-jdbc-core/src/test/resources/integrate/dbtest/master_only/table/drop-table.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sqls>
-    <sql id="masterOnlyDropTOrder"/>
-    <sql id="masterOnlyDropTOrderItem"/>
-    <sql id="masterOnlyDropTConfig"/>
-    <sql id="masterOnlyDropTGlobal"/>
-</sqls>
+    <sql id="masterOnlyDropTOrder "/>
+    <sql id="masterOnlyDropTOrderItem "/>
+    <sql id="masterOnlyDropTConfig "/>
+    <sql id="masterOnlyDropTGlobal "/>
+</sqls>
diff --git a/sharding-jdbc-core/src/test/resources/integrate/dbtest/masterslave/database.xml b/sharding-jdbc-core/src/test/resources/integrate/dbtest/masterslave/database.xml
@@ -20,4 +20,4 @@
     <database>slave_7</database>
     <database>slave_8</database>
     <database>slave_9</database>
-</databases>
+</databases>
diff --git a/sharding-jdbc-core/src/test/resources/integrate/dbtest/masterslave/table/create-table.xml b/sharding-jdbc-core/src/test/resources/integrate/dbtest/masterslave/table/create-table.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sqls>
-    <sql id="masterCreateTOrder0"/>
-    <sql id="masterCreateTOrder1"/>
-    <sql id="masterCreateTOrder2"/>
-    <sql id="masterCreateTOrder3"/>
-    <sql id="masterCreateTOrder4"/>
-    <sql id="masterCreateTOrder5"/>
-    <sql id="masterCreateTOrder6"/>
-    <sql id="masterCreateTOrder7"/>
-    <sql id="masterCreateTOrder8"/>
-    <sql id="masterCreateTOrder9"/>
-    <sql id="masterCreateTOrderItem0"/>
-    <sql id="masterCreateTOrderItem1"/>
-    <sql id="masterCreateTOrderItem2"/>
-    <sql id="masterCreateTOrderItem3"/>
-    <sql id="masterCreateTOrderItem4"/>
-    <sql id="masterCreateTOrderItem5"/>
-    <sql id="masterCreateTOrderItem6"/>
-    <sql id="masterCreateTOrderItem7"/>
-    <sql id="masterCreateTOrderItem8"/>
-    <sql id="masterCreateTOrderItem9"/>
-    <sql id="masterCreateTConfig"/>
-    <sql id="masterCreateTGlobal"/>
-</sqls>
+    <sql id="masterCreateTOrder0 "/>
+    <sql id="masterCreateTOrder1 "/>
+    <sql id="masterCreateTOrder2 "/>
+    <sql id="masterCreateTOrder3 "/>
+    <sql id="masterCreateTOrder4 "/>
+    <sql id="masterCreateTOrder5 "/>
+    <sql id="masterCreateTOrder6 "/>
+    <sql id="masterCreateTOrder7 "/>
+    <sql id="masterCreateTOrder8 "/>
+    <sql id="masterCreateTOrder9 "/>
+    <sql id="masterCreateTOrderItem0 "/>
+    <sql id="masterCreateTOrderItem1 "/>
+    <sql id="masterCreateTOrderItem2 "/>
+    <sql id="masterCreateTOrderItem3 "/>
+    <sql id="masterCreateTOrderItem4 "/>
+    <sql id="masterCreateTOrderItem5 "/>
+    <sql id="masterCreateTOrderItem6 "/>
+    <sql id="masterCreateTOrderItem7 "/>
+    <sql id="masterCreateTOrderItem8 "/>
+    <sql id="masterCreateTOrderItem9 "/>
+    <sql id="masterCreateTConfig "/>
+    <sql id="masterCreateTGlobal "/>
+</sqls>
diff --git a/sharding-jdbc-core/src/test/resources/integrate/dbtest/masterslave/table/drop-table.xml b/sharding-jdbc-core/src/test/resources/integrate/dbtest/masterslave/table/drop-table.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sqls>
-    <sql id="masterDropTOrder0"/>
-    <sql id="masterDropTOrder1"/>
-    <sql id="masterDropTOrder2"/>
-    <sql id="masterDropTOrder3"/>
-    <sql id="masterDropTOrder4"/>
-    <sql id="masterDropTOrder5"/>
-    <sql id="masterDropTOrder6"/>
-    <sql id="masterDropTOrder7"/>
-    <sql id="masterDropTOrder8"/>
-    <sql id="masterDropTOrder9"/>
-    <sql id="masterDropTOrderItem0"/>
-    <sql id="masterDropTOrderItem1"/>
-    <sql id="masterDropTOrderItem2"/>
-    <sql id="masterDropTOrderItem3"/>
-    <sql id="masterDropTOrderItem4"/>
-    <sql id="masterDropTOrderItem5"/>
-    <sql id="masterDropTOrderItem6"/>
-    <sql id="masterDropTOrderItem7"/>
-    <sql id="masterDropTOrderItem8"/>
-    <sql id="masterDropTOrderItem9"/>
-    <sql id="masterDropTConfig"/>
-    <sql id="masterDropTGlobal"/>
-</sqls>
+    <sql id="masterDropTOrder0 "/>
+    <sql id="masterDropTOrder1 "/>
+    <sql id="masterDropTOrder2 "/>
+    <sql id="masterDropTOrder3 "/>
+    <sql id="masterDropTOrder4 "/>
+    <sql id="masterDropTOrder5 "/>
+    <sql id="masterDropTOrder6 "/>
+    <sql id="masterDropTOrder7 "/>
+    <sql id="masterDropTOrder8 "/>
+    <sql id="masterDropTOrder9 "/>
+    <sql id="masterDropTOrderItem0 "/>
+    <sql id="masterDropTOrderItem1 "/>
+    <sql id="masterDropTOrderItem2 "/>
+    <sql id="masterDropTOrderItem3 "/>
+    <sql id="masterDropTOrderItem4 "/>
+    <sql id="masterDropTOrderItem5 "/>
+    <sql id="masterDropTOrderItem6 "/>
+    <sql id="masterDropTOrderItem7 "/>
+    <sql id="masterDropTOrderItem8 "/>
+    <sql id="masterDropTOrderItem9 "/>
+    <sql id="masterDropTConfig "/>
+    <sql id="masterDropTGlobal "/>
+</sqls>
diff --git a/sharding-jdbc-core/src/test/resources/integrate/dbtest/nullable/database.xml b/sharding-jdbc-core/src/test/resources/integrate/dbtest/nullable/database.xml
@@ -10,4 +10,4 @@
     <database>nullable_7</database>
     <database>nullable_8</database>
     <database>nullable_9</database>
-</databases>
+</databases>
diff --git a/sharding-jdbc-core/src/test/resources/integrate/dbtest/nullable/table/create-table.xml b/sharding-jdbc-core/src/test/resources/integrate/dbtest/nullable/table/create-table.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sqls>
-    <sql id="nullableOnlyCreateTOrder"/>
-</sqls>
+    <sql id="nullableOnlyCreateTOrder" />
+</sqls>
diff --git a/sharding-jdbc-core/src/test/resources/integrate/dbtest/nullable/table/drop-table.xml b/sharding-jdbc-core/src/test/resources/integrate/dbtest/nullable/table/drop-table.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sqls>
-    <sql id="nullableOnlyDropTOrder"/>
-</sqls>
+    <sql id="nullableOnlyDropTOrder" />
+</sqls>
diff --git a/sharding-jdbc-core/src/test/resources/integrate/dbtest/slave_only/database.xml b/sharding-jdbc-core/src/test/resources/integrate/dbtest/slave_only/database.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <databases>
     <database>slave_only</database>
-</databases>
+</databases>
diff --git a/sharding-jdbc-core/src/test/resources/integrate/dbtest/slave_only/table/create-table.xml b/sharding-jdbc-core/src/test/resources/integrate/dbtest/slave_only/table/create-table.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sqls>
-    <sql id="slaveOnlyCreateTOrder"/>
-    <sql id="slaveOnlyCreateTOrderItem"/>
-    <sql id="slaveOnlyCreateTConfig"/>
-    <sql id="slaveOnlyCreateTGlobal"/>
-</sqls>
+    <sql id="slaveOnlyCreateTOrder "/>
+    <sql id="slaveOnlyCreateTOrderItem "/>
+    <sql id="slaveOnlyCreateTConfig "/>
+    <sql id="slaveOnlyCreateTGlobal "/>
+</sqls>