From df180b2e12b5de1120ab085e8b7e07339e70a120 Mon Sep 17 00:00:00 2001 From: Looly Date: Fri, 23 Aug 2024 18:45:49 +0800 Subject: [PATCH] multipart change to package http --- .../org/dromara/hutool/http}/multipart/MultipartFormData.java | 2 +- .../hutool/http}/multipart/MultipartRequestInputStream.java | 2 +- .../java/org/dromara/hutool/http}/multipart/UploadFile.java | 2 +- .../org/dromara/hutool/http}/multipart/UploadFileHeader.java | 2 +- .../org/dromara/hutool/http}/multipart/UploadSetting.java | 2 +- .../java/org/dromara/hutool/http}/multipart/package-info.java | 2 +- .../org/dromara/hutool/http/server/HttpServerRequest.java | 4 ++-- .../dromara/hutool/http/server/servlet/JavaxServletUtil.java | 4 ++-- .../org/dromara/hutool/http/server/servlet/ServletUtil.java | 4 ++-- .../java/org/dromara/hutool/http/server/IssueI6Q30XTest.java | 2 +- .../java/org/dromara/hutool/http/server/SimpleServerTest.java | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) rename {hutool-core/src/main/java/org/dromara/hutool/core/net => hutool-http/src/main/java/org/dromara/hutool/http}/multipart/MultipartFormData.java (99%) rename {hutool-core/src/main/java/org/dromara/hutool/core/net => hutool-http/src/main/java/org/dromara/hutool/http}/multipart/MultipartRequestInputStream.java (99%) rename {hutool-core/src/main/java/org/dromara/hutool/core/net => hutool-http/src/main/java/org/dromara/hutool/http}/multipart/UploadFile.java (99%) rename {hutool-core/src/main/java/org/dromara/hutool/core/net => hutool-http/src/main/java/org/dromara/hutool/http}/multipart/UploadFileHeader.java (99%) rename {hutool-core/src/main/java/org/dromara/hutool/core/net => hutool-http/src/main/java/org/dromara/hutool/http}/multipart/UploadSetting.java (98%) rename {hutool-core/src/main/java/org/dromara/hutool/core/net => hutool-http/src/main/java/org/dromara/hutool/http}/multipart/package-info.java (93%) diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/MultipartFormData.java b/hutool-http/src/main/java/org/dromara/hutool/http/multipart/MultipartFormData.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/MultipartFormData.java rename to hutool-http/src/main/java/org/dromara/hutool/http/multipart/MultipartFormData.java index f514d70c9..4afe0db18 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/MultipartFormData.java +++ b/hutool-http/src/main/java/org/dromara/hutool/http/multipart/MultipartFormData.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.net.multipart; +package org.dromara.hutool.http.multipart; import org.dromara.hutool.core.collection.CollUtil; import org.dromara.hutool.core.convert.ConvertUtil; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/MultipartRequestInputStream.java b/hutool-http/src/main/java/org/dromara/hutool/http/multipart/MultipartRequestInputStream.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/MultipartRequestInputStream.java rename to hutool-http/src/main/java/org/dromara/hutool/http/multipart/MultipartRequestInputStream.java index f45edeb51..782703ebb 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/MultipartRequestInputStream.java +++ b/hutool-http/src/main/java/org/dromara/hutool/http/multipart/MultipartRequestInputStream.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.net.multipart; +package org.dromara.hutool.http.multipart; import org.dromara.hutool.core.io.stream.FastByteArrayOutputStream; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/UploadFile.java b/hutool-http/src/main/java/org/dromara/hutool/http/multipart/UploadFile.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/UploadFile.java rename to hutool-http/src/main/java/org/dromara/hutool/http/multipart/UploadFile.java index cca36452f..c943deb94 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/UploadFile.java +++ b/hutool-http/src/main/java/org/dromara/hutool/http/multipart/UploadFile.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.net.multipart; +package org.dromara.hutool.http.multipart; import org.dromara.hutool.core.io.file.FileUtil; import org.dromara.hutool.core.io.IoUtil; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/UploadFileHeader.java b/hutool-http/src/main/java/org/dromara/hutool/http/multipart/UploadFileHeader.java similarity index 99% rename from hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/UploadFileHeader.java rename to hutool-http/src/main/java/org/dromara/hutool/http/multipart/UploadFileHeader.java index e77acfe74..3f0c2251f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/UploadFileHeader.java +++ b/hutool-http/src/main/java/org/dromara/hutool/http/multipart/UploadFileHeader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.net.multipart; +package org.dromara.hutool.http.multipart; import org.dromara.hutool.core.io.file.FileUtil; import org.dromara.hutool.core.text.StrUtil; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/UploadSetting.java b/hutool-http/src/main/java/org/dromara/hutool/http/multipart/UploadSetting.java similarity index 98% rename from hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/UploadSetting.java rename to hutool-http/src/main/java/org/dromara/hutool/http/multipart/UploadSetting.java index 218e4b92a..975589d4e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/UploadSetting.java +++ b/hutool-http/src/main/java/org/dromara/hutool/http/multipart/UploadSetting.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.hutool.core.net.multipart; +package org.dromara.hutool.http.multipart; /** * 上传文件设定文件 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/package-info.java b/hutool-http/src/main/java/org/dromara/hutool/http/multipart/package-info.java similarity index 93% rename from hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/package-info.java rename to hutool-http/src/main/java/org/dromara/hutool/http/multipart/package-info.java index bcf072067..8afc92394 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/package-info.java +++ b/hutool-http/src/main/java/org/dromara/hutool/http/multipart/package-info.java @@ -20,4 +20,4 @@ * @author looly * */ -package org.dromara.hutool.core.net.multipart; +package org.dromara.hutool.http.multipart; diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/HttpServerRequest.java b/hutool-http/src/main/java/org/dromara/hutool/http/server/HttpServerRequest.java index e6acfb8a0..1906dae7c 100644 --- a/hutool-http/src/main/java/org/dromara/hutool/http/server/HttpServerRequest.java +++ b/hutool-http/src/main/java/org/dromara/hutool/http/server/HttpServerRequest.java @@ -26,8 +26,8 @@ import org.dromara.hutool.core.map.CaseInsensitiveMap; import org.dromara.hutool.core.map.MapUtil; import org.dromara.hutool.core.map.multi.ListValueMap; import org.dromara.hutool.core.net.NetUtil; -import org.dromara.hutool.core.net.multipart.MultipartFormData; -import org.dromara.hutool.core.net.multipart.UploadSetting; +import org.dromara.hutool.http.multipart.MultipartFormData; +import org.dromara.hutool.http.multipart.UploadSetting; import org.dromara.hutool.core.net.url.UrlQueryUtil; import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.core.util.CharsetUtil; diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/JavaxServletUtil.java b/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/JavaxServletUtil.java index 8bf1c245f..eebccdb82 100644 --- a/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/JavaxServletUtil.java +++ b/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/JavaxServletUtil.java @@ -35,8 +35,8 @@ import org.dromara.hutool.core.io.file.FileUtil; import org.dromara.hutool.core.map.CaseInsensitiveMap; import org.dromara.hutool.core.map.MapUtil; import org.dromara.hutool.core.net.NetUtil; -import org.dromara.hutool.core.net.multipart.MultipartFormData; -import org.dromara.hutool.core.net.multipart.UploadSetting; +import org.dromara.hutool.http.multipart.MultipartFormData; +import org.dromara.hutool.http.multipart.UploadSetting; import org.dromara.hutool.core.net.url.UrlEncoder; import org.dromara.hutool.core.reflect.ConstructorUtil; import org.dromara.hutool.core.text.StrUtil; diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/ServletUtil.java b/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/ServletUtil.java index 4e763a627..4adaa34c7 100644 --- a/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/ServletUtil.java +++ b/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/ServletUtil.java @@ -29,8 +29,8 @@ import org.dromara.hutool.core.map.CaseInsensitiveMap; import org.dromara.hutool.core.map.MapUtil; import org.dromara.hutool.core.net.NetUtil; import org.dromara.hutool.core.net.url.UrlEncoder; -import org.dromara.hutool.core.net.multipart.MultipartFormData; -import org.dromara.hutool.core.net.multipart.UploadSetting; +import org.dromara.hutool.http.multipart.MultipartFormData; +import org.dromara.hutool.http.multipart.UploadSetting; import org.dromara.hutool.core.reflect.ConstructorUtil; import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.core.array.ArrayUtil; diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/server/IssueI6Q30XTest.java b/hutool-http/src/test/java/org/dromara/hutool/http/server/IssueI6Q30XTest.java index 0af92ba1c..d1f404216 100644 --- a/hutool-http/src/test/java/org/dromara/hutool/http/server/IssueI6Q30XTest.java +++ b/hutool-http/src/test/java/org/dromara/hutool/http/server/IssueI6Q30XTest.java @@ -15,7 +15,7 @@ package org.dromara.hutool.http.server; import org.dromara.hutool.core.date.DateUtil; import org.dromara.hutool.core.date.StopWatch; import org.dromara.hutool.core.lang.Console; -import org.dromara.hutool.core.net.multipart.MultipartFormData; +import org.dromara.hutool.http.multipart.MultipartFormData; import org.dromara.hutool.http.HttpUtil; import java.util.concurrent.TimeUnit; diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/server/SimpleServerTest.java b/hutool-http/src/test/java/org/dromara/hutool/http/server/SimpleServerTest.java index a2d4f4006..ea40e9b7a 100644 --- a/hutool-http/src/test/java/org/dromara/hutool/http/server/SimpleServerTest.java +++ b/hutool-http/src/test/java/org/dromara/hutool/http/server/SimpleServerTest.java @@ -15,7 +15,7 @@ package org.dromara.hutool.http.server; import org.dromara.hutool.core.collection.ListUtil; import org.dromara.hutool.core.io.file.FileUtil; import org.dromara.hutool.core.lang.Console; -import org.dromara.hutool.core.net.multipart.UploadFile; +import org.dromara.hutool.http.multipart.UploadFile; import org.dromara.hutool.http.meta.ContentType; import org.dromara.hutool.http.meta.HeaderName; import org.dromara.hutool.http.HttpUtil;