From 616eb837d40b3fba3249feb5ad897278989a662c Mon Sep 17 00:00:00 2001 From: terrymanu Date: Fri, 4 May 2018 16:19:34 +0800 Subject: [PATCH] for #601: format xml --- .../io/shardingjdbc/dbtest/StartTest.java | 6 +-- .../integrate/dbtest/db/database.xml | 2 +- .../dbtest/db/table/create-table.xml | 6 +-- .../integrate/dbtest/db/table/drop-table.xml | 6 +-- .../integrate/dbtest/dbtbl/database.xml | 2 +- .../dbtest/dbtbl/table/create-table.xml | 46 +++++++++---------- .../dbtest/dbtbl/table/drop-table.xml | 46 +++++++++---------- .../integrate/dbtest/jdbc/database.xml | 2 +- .../dbtest/jdbc/table/create-table.xml | 14 +++--- .../dbtest/jdbc/table/drop-table.xml | 14 +++--- .../integrate/dbtest/master_only/database.xml | 2 +- .../dbtest/master_only/table/create-table.xml | 10 ++-- .../dbtest/master_only/table/drop-table.xml | 10 ++-- .../integrate/dbtest/masterslave/database.xml | 2 +- .../dbtest/masterslave/table/create-table.xml | 46 +++++++++---------- .../dbtest/masterslave/table/drop-table.xml | 46 +++++++++---------- .../integrate/dbtest/nullable/database.xml | 2 +- .../dbtest/nullable/table/create-table.xml | 4 +- .../dbtest/nullable/table/drop-table.xml | 4 +- .../integrate/dbtest/slave_only/database.xml | 2 +- .../dbtest/slave_only/table/create-table.xml | 10 ++-- .../dbtest/slave_only/table/drop-table.xml | 10 ++-- .../integrate/dbtest/tbl/database.xml | 2 +- .../dbtest/tbl/table/create-table.xml | 46 +++++++++---------- .../integrate/dbtest/tbl/table/drop-table.xml | 46 +++++++++---------- 25 files changed, 193 insertions(+), 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 index 335fc07be710f..6266bee58880c 100644 --- 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 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 index 444a0627bd131..2d1d37e4a62cd 100644 --- 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 @@ db_7 db_8 db_9 - \ No newline at end of file + 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 index 4cfec404c950c..15f704270fa61 100644 --- 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 @@ - - - \ No newline at end of file + + + 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 index d717ade4f0cb0..84d5b2af78420 100644 --- 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 @@ - - - \ No newline at end of file + + + 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 index 691c1be81b075..a45d7083c0726 100644 --- 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 @@ dbtbl_7 dbtbl_8 dbtbl_9 - \ No newline at end of file + 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 index 0564232ad52b3..badfcc541c44d 100644 --- 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 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + 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 index 6bcebc4a6653f..3ed98aacaf5bc 100644 --- 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 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + 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 index 9a670f09a7e8c..83a349a70dccc 100644 --- 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 @@ jdbc_0 jdbc_1 - \ No newline at end of file + 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 index 471de483b1355..f939eef1d283e 100644 --- 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 @@ - - - - - - - \ No newline at end of file + + + + + + + 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 index 27812efc41f6d..a1f629fb15975 100644 --- 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 @@ - - - - - - - \ No newline at end of file + + + + + + + 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 index 27b59b30fd7f7..d5f10613701a1 100644 --- 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 @@ master_only - \ No newline at end of file + 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 index d1701947a4aa9..293b6246e0950 100644 --- 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 @@ - - - - - \ No newline at end of file + + + + + 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 index be8daa5975c0a..a759093fc43f6 100644 --- 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 @@ - - - - - \ No newline at end of file + + + + + 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 index 9d0acfd8e7be6..82cef7433e17e 100644 --- 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 @@ slave_7 slave_8 slave_9 - \ No newline at end of file + 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 index 788f325472255..facca2883439f 100644 --- 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 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + 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 index aa615b8b8eba2..419571e9a25dd 100644 --- 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 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + 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 index a62d1f2cfd4e3..297685a490cba 100644 --- 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 @@ nullable_7 nullable_8 nullable_9 - \ No newline at end of file + 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 index 5bb0659be1d57..37dc529ab1033 100644 --- 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 @@ - - \ No newline at end of file + + 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 index c67acdb2044dc..cd8df407e4c26 100644 --- 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 @@ - - \ No newline at end of file + + 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 index e417b9d186944..ce60e97751ff7 100644 --- 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 @@ slave_only - \ No newline at end of file + 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 index 1266c00f61b2c..1bbf17f48265a 100644 --- 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 @@ - - - - - \ No newline at end of file + + + + + diff --git a/sharding-jdbc-core/src/test/resources/integrate/dbtest/slave_only/table/drop-table.xml b/sharding-jdbc-core/src/test/resources/integrate/dbtest/slave_only/table/drop-table.xml index fa8976ee6603a..4fd2c1c7818f1 100644 --- a/sharding-jdbc-core/src/test/resources/integrate/dbtest/slave_only/table/drop-table.xml +++ b/sharding-jdbc-core/src/test/resources/integrate/dbtest/slave_only/table/drop-table.xml @@ -1,7 +1,7 @@ - - - - - \ No newline at end of file + + + + + diff --git a/sharding-jdbc-core/src/test/resources/integrate/dbtest/tbl/database.xml b/sharding-jdbc-core/src/test/resources/integrate/dbtest/tbl/database.xml index 500a574940b80..b6f7cbe4d6251 100644 --- a/sharding-jdbc-core/src/test/resources/integrate/dbtest/tbl/database.xml +++ b/sharding-jdbc-core/src/test/resources/integrate/dbtest/tbl/database.xml @@ -1,4 +1,4 @@ tbl - \ No newline at end of file + diff --git a/sharding-jdbc-core/src/test/resources/integrate/dbtest/tbl/table/create-table.xml b/sharding-jdbc-core/src/test/resources/integrate/dbtest/tbl/table/create-table.xml index 1f3fa39725b87..2f5976fc2ba0c 100644 --- a/sharding-jdbc-core/src/test/resources/integrate/dbtest/tbl/table/create-table.xml +++ b/sharding-jdbc-core/src/test/resources/integrate/dbtest/tbl/table/create-table.xml @@ -1,25 +1,25 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sharding-jdbc-core/src/test/resources/integrate/dbtest/tbl/table/drop-table.xml b/sharding-jdbc-core/src/test/resources/integrate/dbtest/tbl/table/drop-table.xml index 58bea47005557..9b13fdc752a6e 100644 --- a/sharding-jdbc-core/src/test/resources/integrate/dbtest/tbl/table/drop-table.xml +++ b/sharding-jdbc-core/src/test/resources/integrate/dbtest/tbl/table/drop-table.xml @@ -1,25 +1,25 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + +