From 9b9c4d4e101ac955117c855145a825ce0e41e46e Mon Sep 17 00:00:00 2001
From: YuCheng Hu <huyuchengus@gmail.com>
Date: Thu, 2 May 2024 08:25:40 -0400
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=20Apache=20HTTP=20httpCl?=
 =?UTF-8?q?ient=20=E7=9A=84=E5=A4=84=E7=90=86=E5=88=B0=20Apache=20?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=B8=8B=E9=9D=A2=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

虽然近期有关 Http 的处理更多有使用 okhttp 替代的趋势但 httpclient 还是需要知道和了解的。
---
 .../apache-httpclient}/.gitignore                   |   0
 .../apache-httpclient}/README.md                    |   0
 .../apache-httpclient}/pom.xml                      |   6 +++---
 .../src/main/resources/logback.xml                  |   0
 .../apache-httpclient}/src/main/resources/temp.txt  |   0
 .../baeldung/httpclient/GetRequestMockServer.java   |   0
 .../httpclient/HttpAsyncClientLiveTest.java         |   0
 .../httpclient/HttpClientCancelRequestLiveTest.java |   0
 .../httpclient/HttpClientMultipartLiveTest.java     |   0
 .../httpclient/HttpClientRedirectLiveTest.java      |   0
 .../java/com/baeldung/httpclient/ResponseUtil.java  |   0
 ...pClientAdvancedConfigurationIntegrationTest.java |   0
 .../HttpClientConnectionManagementLiveTest.java     |   0
 .../httpclient/conn/MultiHttpClientConnThread.java  |   0
 .../TesterVersion_MultiHttpClientConnThread.java    |   0
 .../src/test/resources/.gitignore                   |   0
 .../apache-httpclient}/src/test/resources/test.in   |   0
 .../src/test/resources/uploads/image.jpg            | Bin
 .../src/test/resources/uploads/sandbox.txt          |   0
 .../src/test/resources/uploads/temp.txt             |   0
 .../src/test/resources/uploads/zipFile.zip          | Bin
 21 files changed, 3 insertions(+), 3 deletions(-)
 rename {apache-httpclient => apache/apache-httpclient}/.gitignore (100%)
 rename {apache-httpclient => apache/apache-httpclient}/README.md (100%)
 rename {apache-httpclient => apache/apache-httpclient}/pom.xml (95%)
 rename {apache-httpclient => apache/apache-httpclient}/src/main/resources/logback.xml (100%)
 rename {apache-httpclient => apache/apache-httpclient}/src/main/resources/temp.txt (100%)
 rename {apache-httpclient => apache/apache-httpclient}/src/test/java/com/baeldung/httpclient/GetRequestMockServer.java (100%)
 rename {apache-httpclient => apache/apache-httpclient}/src/test/java/com/baeldung/httpclient/HttpAsyncClientLiveTest.java (100%)
 rename {apache-httpclient => apache/apache-httpclient}/src/test/java/com/baeldung/httpclient/HttpClientCancelRequestLiveTest.java (100%)
 rename {apache-httpclient => apache/apache-httpclient}/src/test/java/com/baeldung/httpclient/HttpClientMultipartLiveTest.java (100%)
 rename {apache-httpclient => apache/apache-httpclient}/src/test/java/com/baeldung/httpclient/HttpClientRedirectLiveTest.java (100%)
 rename {apache-httpclient => apache/apache-httpclient}/src/test/java/com/baeldung/httpclient/ResponseUtil.java (100%)
 rename {apache-httpclient => apache/apache-httpclient}/src/test/java/com/baeldung/httpclient/advancedconfig/HttpClientAdvancedConfigurationIntegrationTest.java (100%)
 rename {apache-httpclient => apache/apache-httpclient}/src/test/java/com/baeldung/httpclient/conn/HttpClientConnectionManagementLiveTest.java (100%)
 rename {apache-httpclient => apache/apache-httpclient}/src/test/java/com/baeldung/httpclient/conn/MultiHttpClientConnThread.java (100%)
 rename {apache-httpclient => apache/apache-httpclient}/src/test/java/com/baeldung/httpclient/conn/TesterVersion_MultiHttpClientConnThread.java (100%)
 rename {apache-httpclient => apache/apache-httpclient}/src/test/resources/.gitignore (100%)
 rename {apache-httpclient => apache/apache-httpclient}/src/test/resources/test.in (100%)
 rename {apache-httpclient => apache/apache-httpclient}/src/test/resources/uploads/image.jpg (100%)
 rename {apache-httpclient => apache/apache-httpclient}/src/test/resources/uploads/sandbox.txt (100%)
 rename {apache-httpclient => apache/apache-httpclient}/src/test/resources/uploads/temp.txt (100%)
 rename {apache-httpclient => apache/apache-httpclient}/src/test/resources/uploads/zipFile.zip (100%)

diff --git a/apache-httpclient/.gitignore b/apache/apache-httpclient/.gitignore
similarity index 100%
rename from apache-httpclient/.gitignore
rename to apache/apache-httpclient/.gitignore
diff --git a/apache-httpclient/README.md b/apache/apache-httpclient/README.md
similarity index 100%
rename from apache-httpclient/README.md
rename to apache/apache-httpclient/README.md
diff --git a/apache-httpclient/pom.xml b/apache/apache-httpclient/pom.xml
similarity index 95%
rename from apache-httpclient/pom.xml
rename to apache/apache-httpclient/pom.xml
index b44df09dd3..3164c6253e 100644
--- a/apache-httpclient/pom.xml
+++ b/apache/apache-httpclient/pom.xml
@@ -8,9 +8,9 @@
     <name>apache-httpclient</name>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <groupId>com.ossez.apache</groupId>
+        <artifactId>apache</artifactId>
+        <version>0.0.2-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/apache-httpclient/src/main/resources/logback.xml b/apache/apache-httpclient/src/main/resources/logback.xml
similarity index 100%
rename from apache-httpclient/src/main/resources/logback.xml
rename to apache/apache-httpclient/src/main/resources/logback.xml
diff --git a/apache-httpclient/src/main/resources/temp.txt b/apache/apache-httpclient/src/main/resources/temp.txt
similarity index 100%
rename from apache-httpclient/src/main/resources/temp.txt
rename to apache/apache-httpclient/src/main/resources/temp.txt
diff --git a/apache-httpclient/src/test/java/com/baeldung/httpclient/GetRequestMockServer.java b/apache/apache-httpclient/src/test/java/com/baeldung/httpclient/GetRequestMockServer.java
similarity index 100%
rename from apache-httpclient/src/test/java/com/baeldung/httpclient/GetRequestMockServer.java
rename to apache/apache-httpclient/src/test/java/com/baeldung/httpclient/GetRequestMockServer.java
diff --git a/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpAsyncClientLiveTest.java b/apache/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpAsyncClientLiveTest.java
similarity index 100%
rename from apache-httpclient/src/test/java/com/baeldung/httpclient/HttpAsyncClientLiveTest.java
rename to apache/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpAsyncClientLiveTest.java
diff --git a/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientCancelRequestLiveTest.java b/apache/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientCancelRequestLiveTest.java
similarity index 100%
rename from apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientCancelRequestLiveTest.java
rename to apache/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientCancelRequestLiveTest.java
diff --git a/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientMultipartLiveTest.java b/apache/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientMultipartLiveTest.java
similarity index 100%
rename from apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientMultipartLiveTest.java
rename to apache/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientMultipartLiveTest.java
diff --git a/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientRedirectLiveTest.java b/apache/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientRedirectLiveTest.java
similarity index 100%
rename from apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientRedirectLiveTest.java
rename to apache/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientRedirectLiveTest.java
diff --git a/apache-httpclient/src/test/java/com/baeldung/httpclient/ResponseUtil.java b/apache/apache-httpclient/src/test/java/com/baeldung/httpclient/ResponseUtil.java
similarity index 100%
rename from apache-httpclient/src/test/java/com/baeldung/httpclient/ResponseUtil.java
rename to apache/apache-httpclient/src/test/java/com/baeldung/httpclient/ResponseUtil.java
diff --git a/apache-httpclient/src/test/java/com/baeldung/httpclient/advancedconfig/HttpClientAdvancedConfigurationIntegrationTest.java b/apache/apache-httpclient/src/test/java/com/baeldung/httpclient/advancedconfig/HttpClientAdvancedConfigurationIntegrationTest.java
similarity index 100%
rename from apache-httpclient/src/test/java/com/baeldung/httpclient/advancedconfig/HttpClientAdvancedConfigurationIntegrationTest.java
rename to apache/apache-httpclient/src/test/java/com/baeldung/httpclient/advancedconfig/HttpClientAdvancedConfigurationIntegrationTest.java
diff --git a/apache-httpclient/src/test/java/com/baeldung/httpclient/conn/HttpClientConnectionManagementLiveTest.java b/apache/apache-httpclient/src/test/java/com/baeldung/httpclient/conn/HttpClientConnectionManagementLiveTest.java
similarity index 100%
rename from apache-httpclient/src/test/java/com/baeldung/httpclient/conn/HttpClientConnectionManagementLiveTest.java
rename to apache/apache-httpclient/src/test/java/com/baeldung/httpclient/conn/HttpClientConnectionManagementLiveTest.java
diff --git a/apache-httpclient/src/test/java/com/baeldung/httpclient/conn/MultiHttpClientConnThread.java b/apache/apache-httpclient/src/test/java/com/baeldung/httpclient/conn/MultiHttpClientConnThread.java
similarity index 100%
rename from apache-httpclient/src/test/java/com/baeldung/httpclient/conn/MultiHttpClientConnThread.java
rename to apache/apache-httpclient/src/test/java/com/baeldung/httpclient/conn/MultiHttpClientConnThread.java
diff --git a/apache-httpclient/src/test/java/com/baeldung/httpclient/conn/TesterVersion_MultiHttpClientConnThread.java b/apache/apache-httpclient/src/test/java/com/baeldung/httpclient/conn/TesterVersion_MultiHttpClientConnThread.java
similarity index 100%
rename from apache-httpclient/src/test/java/com/baeldung/httpclient/conn/TesterVersion_MultiHttpClientConnThread.java
rename to apache/apache-httpclient/src/test/java/com/baeldung/httpclient/conn/TesterVersion_MultiHttpClientConnThread.java
diff --git a/apache-httpclient/src/test/resources/.gitignore b/apache/apache-httpclient/src/test/resources/.gitignore
similarity index 100%
rename from apache-httpclient/src/test/resources/.gitignore
rename to apache/apache-httpclient/src/test/resources/.gitignore
diff --git a/apache-httpclient/src/test/resources/test.in b/apache/apache-httpclient/src/test/resources/test.in
similarity index 100%
rename from apache-httpclient/src/test/resources/test.in
rename to apache/apache-httpclient/src/test/resources/test.in
diff --git a/apache-httpclient/src/test/resources/uploads/image.jpg b/apache/apache-httpclient/src/test/resources/uploads/image.jpg
similarity index 100%
rename from apache-httpclient/src/test/resources/uploads/image.jpg
rename to apache/apache-httpclient/src/test/resources/uploads/image.jpg
diff --git a/apache-httpclient/src/test/resources/uploads/sandbox.txt b/apache/apache-httpclient/src/test/resources/uploads/sandbox.txt
similarity index 100%
rename from apache-httpclient/src/test/resources/uploads/sandbox.txt
rename to apache/apache-httpclient/src/test/resources/uploads/sandbox.txt
diff --git a/apache-httpclient/src/test/resources/uploads/temp.txt b/apache/apache-httpclient/src/test/resources/uploads/temp.txt
similarity index 100%
rename from apache-httpclient/src/test/resources/uploads/temp.txt
rename to apache/apache-httpclient/src/test/resources/uploads/temp.txt
diff --git a/apache-httpclient/src/test/resources/uploads/zipFile.zip b/apache/apache-httpclient/src/test/resources/uploads/zipFile.zip
similarity index 100%
rename from apache-httpclient/src/test/resources/uploads/zipFile.zip
rename to apache/apache-httpclient/src/test/resources/uploads/zipFile.zip
-- 
2.45.2


From 9c08c5559cb9252c52499a2397d1c804dfbc4840 Mon Sep 17 00:00:00 2001
From: YuCheng Hu <huyuchengus@gmail.com>
Date: Thu, 2 May 2024 08:26:56 -0400
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20apache=20=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E5=88=B0=E9=A1=B9=E7=9B=AE=E4=B8=AD=EF=BC=8CApache=20?=
 =?UTF-8?q?=E5=BA=94=E8=AF=A5=E9=9C=80=E8=A6=81=E5=8D=95=E7=8B=AC=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E6=A8=A1=E5=9D=97=EF=BC=8C=E5=9B=A0=E4=B8=BA=20Apache?=
 =?UTF-8?q?=20=E7=9A=84=E5=86=85=E5=AE=B9=E9=80=9A=E5=B8=B8=E8=BF=98?=
 =?UTF-8?q?=E6=98=AF=E6=AF=94=E8=BE=83=E5=A4=9A=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/compiler.xml  |  1 +
 .idea/encodings.xml |  4 ++++
 .idea/jpa.xml       |  7 +++++++
 apache/README.md    |  4 ++++
 apache/pom.xml      | 45 +++++++++++++++++++++++++++++++++++++++++++++
 pom.xml             |  1 +
 6 files changed, 62 insertions(+)
 create mode 100644 .idea/jpa.xml
 create mode 100644 apache/README.md
 create mode 100644 apache/pom.xml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index dd2c73c531..d1117e714c 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -35,6 +35,7 @@
         <module name="core-java-collections-list-2" />
         <module name="core-java-collections-conversions-2" />
         <module name="core-java-8" />
+        <module name="apache-httpclient" />
         <module name="core-java-collections-3" />
         <module name="core-java-9" />
         <module name="core-java-collections-2" />
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 9b5a7e8870..ffb87cefe3 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/apache/apache-httpclient/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/apache/apache-httpclient/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/apache/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/apache/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/core-java-modules/core-java-10/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/core-java-modules/core-java-10/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/core-java-modules/core-java-11-2/src/main/java" charset="UTF-8" />
diff --git a/.idea/jpa.xml b/.idea/jpa.xml
new file mode 100644
index 0000000000..898e07a675
--- /dev/null
+++ b/.idea/jpa.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JpaBuddyIdeaProjectConfig">
+    <option name="defaultUnitInitialized" value="true" />
+    <option name="renamerInitialized" value="true" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/apache/README.md b/apache/README.md
new file mode 100644
index 0000000000..14656e4845
--- /dev/null
+++ b/apache/README.md
@@ -0,0 +1,4 @@
+## Apache 模块
+
+Apache 软件基金会是对 Java 开源包中贡献非常大的，很多优秀的代码都能够在 Apache 的开源包中找到。
+
diff --git a/apache/pom.xml b/apache/pom.xml
new file mode 100644
index 0000000000..6282eb98e5
--- /dev/null
+++ b/apache/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.ossez.apache</groupId>
+    <artifactId>apache</artifactId>
+    <name>apache-modules</name>
+    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>com.ossez</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>0.0.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modules>
+        <module>apache-httpclient</module>
+    </modules>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>${junit4.version}</version>
+                <scope>test</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter</artifactId>
+                <version>${junit-jupiter.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.junit.vintage</groupId>
+                <artifactId>junit-vintage-engine</artifactId>
+                <version>${junit-jupiter.version}</version>
+                <scope>test</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+</project>
diff --git a/pom.xml b/pom.xml
index 02ec984661..e8b5a3b708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,6 +39,7 @@
     </licenses>
 
     <modules>
+        <module>apache</module>
         <module>core-java-modules</module>
         <module>image-compressing</module>
         <module>image-processing</module>
-- 
2.45.2