From 3a7d93f5c7b7d3edfeffde13e5e2d2ba1a2c38d7 Mon Sep 17 00:00:00 2001 From: devezhao Date: Thu, 28 Feb 2019 17:11:00 +0800 Subject: [PATCH] rename package com.rebuild.server.business.datas > com.rebuild.server.business.dataio --- .../server/business/{datas => dataio}/DataFileParser.java | 2 +- .../server/business/{datas => dataio}/DataImporter.java | 2 +- .../server/business/{datas => dataio}/ImportEnter.java | 2 +- .../server/business/{datas => dataio}/RbCellCodec.java | 2 +- .../com/rebuild/web/base/entity/DataImportControll.java | 6 +++--- .../business/{datas => dataio}/DataFileParserTest.java | 3 ++- .../server/business/{datas => dataio}/DataImporterTest.java | 4 +++- 7 files changed, 12 insertions(+), 9 deletions(-) rename src/main/java/com/rebuild/server/business/{datas => dataio}/DataFileParser.java (98%) rename src/main/java/com/rebuild/server/business/{datas => dataio}/DataImporter.java (99%) rename src/main/java/com/rebuild/server/business/{datas => dataio}/ImportEnter.java (99%) rename src/main/java/com/rebuild/server/business/{datas => dataio}/RbCellCodec.java (97%) rename src/test/java/com/rebuild/server/business/{datas => dataio}/DataFileParserTest.java (96%) rename src/test/java/com/rebuild/server/business/{datas => dataio}/DataImporterTest.java (94%) diff --git a/src/main/java/com/rebuild/server/business/datas/DataFileParser.java b/src/main/java/com/rebuild/server/business/dataio/DataFileParser.java similarity index 98% rename from src/main/java/com/rebuild/server/business/datas/DataFileParser.java rename to src/main/java/com/rebuild/server/business/dataio/DataFileParser.java index 1f4c93787..c45a270e8 100644 --- a/src/main/java/com/rebuild/server/business/datas/DataFileParser.java +++ b/src/main/java/com/rebuild/server/business/dataio/DataFileParser.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -package com.rebuild.server.business.datas; +package com.rebuild.server.business.dataio; import java.io.Closeable; import java.io.File; diff --git a/src/main/java/com/rebuild/server/business/datas/DataImporter.java b/src/main/java/com/rebuild/server/business/dataio/DataImporter.java similarity index 99% rename from src/main/java/com/rebuild/server/business/datas/DataImporter.java rename to src/main/java/com/rebuild/server/business/dataio/DataImporter.java index ad380e68f..99089cd82 100644 --- a/src/main/java/com/rebuild/server/business/datas/DataImporter.java +++ b/src/main/java/com/rebuild/server/business/dataio/DataImporter.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -package com.rebuild.server.business.datas; +package com.rebuild.server.business.dataio; import java.util.Date; import java.util.HashMap; diff --git a/src/main/java/com/rebuild/server/business/datas/ImportEnter.java b/src/main/java/com/rebuild/server/business/dataio/ImportEnter.java similarity index 99% rename from src/main/java/com/rebuild/server/business/datas/ImportEnter.java rename to src/main/java/com/rebuild/server/business/dataio/ImportEnter.java index 4b9b4a521..7c6d9001f 100644 --- a/src/main/java/com/rebuild/server/business/datas/ImportEnter.java +++ b/src/main/java/com/rebuild/server/business/dataio/ImportEnter.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -package com.rebuild.server.business.datas; +package com.rebuild.server.business.dataio; import java.io.File; import java.net.URISyntaxException; diff --git a/src/main/java/com/rebuild/server/business/datas/RbCellCodec.java b/src/main/java/com/rebuild/server/business/dataio/RbCellCodec.java similarity index 97% rename from src/main/java/com/rebuild/server/business/datas/RbCellCodec.java rename to src/main/java/com/rebuild/server/business/dataio/RbCellCodec.java index aa4a8071a..437e6c1ff 100644 --- a/src/main/java/com/rebuild/server/business/datas/RbCellCodec.java +++ b/src/main/java/com/rebuild/server/business/dataio/RbCellCodec.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -package com.rebuild.server.business.datas; +package com.rebuild.server.business.dataio; import java.io.IOException; import java.lang.reflect.Type; diff --git a/src/main/java/com/rebuild/web/base/entity/DataImportControll.java b/src/main/java/com/rebuild/web/base/entity/DataImportControll.java index a5f7c65cc..713d41d81 100644 --- a/src/main/java/com/rebuild/web/base/entity/DataImportControll.java +++ b/src/main/java/com/rebuild/web/base/entity/DataImportControll.java @@ -36,9 +36,9 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializeConfig; import com.alibaba.fastjson.serializer.ToStringSerializer; -import com.rebuild.server.business.datas.DataFileParser; -import com.rebuild.server.business.datas.DataImporter; -import com.rebuild.server.business.datas.ImportEnter; +import com.rebuild.server.business.dataio.DataFileParser; +import com.rebuild.server.business.dataio.DataImporter; +import com.rebuild.server.business.dataio.ImportEnter; import com.rebuild.server.helper.SystemConfig; import com.rebuild.server.helper.task.BulkTask; import com.rebuild.server.helper.task.BulkTaskExecutor; diff --git a/src/test/java/com/rebuild/server/business/datas/DataFileParserTest.java b/src/test/java/com/rebuild/server/business/dataio/DataFileParserTest.java similarity index 96% rename from src/test/java/com/rebuild/server/business/datas/DataFileParserTest.java rename to src/test/java/com/rebuild/server/business/dataio/DataFileParserTest.java index 170409bb7..8b167097b 100644 --- a/src/test/java/com/rebuild/server/business/datas/DataFileParserTest.java +++ b/src/test/java/com/rebuild/server/business/dataio/DataFileParserTest.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -package com.rebuild.server.business.datas; +package com.rebuild.server.business.dataio; import java.io.File; import java.net.URISyntaxException; @@ -27,6 +27,7 @@ import org.apache.commons.lang.StringUtils; import org.junit.Test; import com.rebuild.server.TestSupport; +import com.rebuild.server.business.dataio.DataFileParser; import cn.devezhao.commons.excel.Cell; diff --git a/src/test/java/com/rebuild/server/business/datas/DataImporterTest.java b/src/test/java/com/rebuild/server/business/dataio/DataImporterTest.java similarity index 94% rename from src/test/java/com/rebuild/server/business/datas/DataImporterTest.java rename to src/test/java/com/rebuild/server/business/dataio/DataImporterTest.java index 50c8bce9a..db0778475 100644 --- a/src/test/java/com/rebuild/server/business/datas/DataImporterTest.java +++ b/src/test/java/com/rebuild/server/business/dataio/DataImporterTest.java @@ -16,13 +16,15 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -package com.rebuild.server.business.datas; +package com.rebuild.server.business.dataio; import org.junit.Test; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.rebuild.server.TestSupport; +import com.rebuild.server.business.dataio.DataImporter; +import com.rebuild.server.business.dataio.ImportEnter; import com.rebuild.server.service.bizz.UserService; /**