From 31dd65261a7c29facb28cf8221b0771a391f4403 Mon Sep 17 00:00:00 2001
From: YuCheng Hu <huyuchengus@gmail.com>
Date: Sat, 30 Apr 2022 19:23:18 -0400
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E6=89=80=E6=9C=89=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E5=B7=B2=E6=9C=89=E7=9A=84=E6=96=87=E4=BB=B6=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E5=88=B0=20Git=20=E4=BB=A5=E4=BE=BF=E4=BA=8E=E5=90=8E=E7=BB=AD?=
 =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/compiler.xml       | 168 +++++++++++++++++++++++++++++++--------
 .idea/misc.xml           |   1 +
 .idea/thriftCompiler.xml |   6 ++
 .idea/workspace.xml      |  20 +----
 4 files changed, 144 insertions(+), 51 deletions(-)
 create mode 100644 .idea/thriftCompiler.xml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 450847bd62..415d8be780 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -7,22 +7,120 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="assertion-libraries" />
-        <module name="core-java-annotations" />
         <module name="codebank" />
         <module name="core-java-collections-list" />
-        <module name="junit5-migration" />
-        <module name="discourse" />
+        <module name="core-java-annotations" />
         <module name="core-java-8" />
+        <module name="junit-5-basics" />
+        <module name="discourse" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
-      <module name="cucumber" target="14" />
-      <module name="easy-random" target="11" />
-      <module name="easymock" target="1.5" />
+      <module name="assertion-libraries" target="1.8" />
+      <module name="core-java" target="1.8" />
+      <module name="core-java-8-2" target="1.8" />
+      <module name="core-java-8-datetime" target="1.8" />
+      <module name="core-java-8-datetime-2" target="1.8" />
+      <module name="core-java-arrays-convert" target="1.8" />
+      <module name="core-java-arrays-guides" target="1.8" />
+      <module name="core-java-arrays-multidimensional" target="1.8" />
+      <module name="core-java-arrays-operations-advanced" target="1.8" />
+      <module name="core-java-arrays-operations-basic" target="1.8" />
+      <module name="core-java-arrays-sorting" target="1.8" />
+      <module name="core-java-char" target="1.8" />
+      <module name="core-java-collections" target="1.8" />
+      <module name="core-java-collections-2" target="1.8" />
+      <module name="core-java-collections-3" target="1.8" />
+      <module name="core-java-collections-4" target="1.8" />
+      <module name="core-java-collections-array-list" target="1.8" />
+      <module name="core-java-collections-list-2" target="1.8" />
+      <module name="core-java-collections-list-3" target="1.8" />
+      <module name="core-java-collections-maps" target="1.8" />
+      <module name="core-java-collections-maps-2" target="1.8" />
+      <module name="core-java-collections-maps-3" target="1.8" />
+      <module name="core-java-concurrency-2" target="1.8" />
+      <module name="core-java-concurrency-advanced" target="1.8" />
+      <module name="core-java-concurrency-advanced-2" target="1.8" />
+      <module name="core-java-concurrency-advanced-3" target="1.8" />
+      <module name="core-java-concurrency-advanced-4" target="1.8" />
+      <module name="core-java-concurrency-basic" target="1.8" />
+      <module name="core-java-concurrency-basic-2" target="1.8" />
+      <module name="core-java-concurrency-basic-3" target="1.8" />
+      <module name="core-java-concurrency-collections" target="1.8" />
+      <module name="core-java-concurrency-collections-2" target="1.8" />
+      <module name="core-java-console" target="1.8" />
+      <module name="core-java-date-operations-2" target="1.8" />
+      <module name="core-java-exceptions" target="1.8" />
+      <module name="core-java-exceptions-2" target="1.8" />
+      <module name="core-java-exceptions-3" target="1.8" />
+      <module name="core-java-exceptions-4" target="1.8" />
+      <module name="core-java-function" target="1.8" />
+      <module name="core-java-functional" target="1.8" />
+      <module name="core-java-io" target="1.8" />
+      <module name="core-java-io-2" target="1.8" />
+      <module name="core-java-io-3" target="1.8" />
+      <module name="core-java-io-4" target="1.8" />
+      <module name="core-java-io-apis" target="1.8" />
+      <module name="core-java-io-conversions" target="1.8" />
+      <module name="core-java-jar" target="1.8" />
+      <module name="core-java-jndi" target="1.8" />
+      <module name="core-java-jvm" target="1.8" />
+      <module name="core-java-jvm-2" target="1.8" />
+      <module name="core-java-lambdas" target="1.8" />
+      <module name="core-java-lang" target="1.8" />
+      <module name="core-java-lang-2" target="1.8" />
+      <module name="core-java-lang-3" target="1.8" />
+      <module name="core-java-lang-4" target="1.8" />
+      <module name="core-java-lang-math" target="1.8" />
+      <module name="core-java-lang-math-2" target="1.8" />
+      <module name="core-java-lang-math-3" target="1.8" />
+      <module name="core-java-lang-oop-constructors" target="1.8" />
+      <module name="core-java-lang-oop-generics" target="1.8" />
+      <module name="core-java-lang-oop-inheritance" target="1.8" />
+      <module name="core-java-lang-oop-methods" target="1.8" />
+      <module name="core-java-lang-oop-modifiers" target="1.8" />
+      <module name="core-java-lang-oop-others" target="1.8" />
+      <module name="core-java-lang-oop-patterns" target="1.8" />
+      <module name="core-java-lang-oop-types" target="1.8" />
+      <module name="core-java-lang-oop-types-2" target="1.8" />
+      <module name="core-java-lang-operators" target="1.8" />
+      <module name="core-java-lang-operators-2" target="1.8" />
+      <module name="core-java-lang-syntax" target="1.8" />
+      <module name="core-java-lang-syntax-2" target="1.8" />
+      <module name="core-java-networking" target="1.8" />
+      <module name="core-java-networking-2" target="1.8" />
+      <module name="core-java-nio" target="1.8" />
+      <module name="core-java-nio-2" target="1.8" />
+      <module name="core-java-optional" target="1.8" />
+      <module name="core-java-perf" target="1.8" />
+      <module name="core-java-reflection" target="1.8" />
+      <module name="core-java-reflection-2" target="1.8" />
+      <module name="core-java-regex" target="1.8" />
+      <module name="core-java-regex-2" target="1.8" />
+      <module name="core-java-security" target="1.8" />
+      <module name="core-java-security-2" target="1.8" />
+      <module name="core-java-security-3" target="1.8" />
+      <module name="core-java-security-algorithms" target="1.8" />
+      <module name="core-java-serialization" target="1.8" />
+      <module name="core-java-streams" target="1.8" />
+      <module name="core-java-streams-2" target="1.8" />
+      <module name="core-java-streams-3" target="1.8" />
+      <module name="core-java-streams-4" target="1.8" />
+      <module name="core-java-string-algorithms" target="1.8" />
+      <module name="core-java-string-algorithms-2" target="1.8" />
+      <module name="core-java-string-apis" target="1.8" />
+      <module name="core-java-string-conversions" target="1.8" />
+      <module name="core-java-string-conversions-2" target="1.8" />
+      <module name="core-java-string-operations" target="1.8" />
+      <module name="core-java-string-operations-2" target="1.8" />
+      <module name="core-java-sun" target="1.8" />
+      <module name="core-java-uuid" target="1.8" />
+      <module name="cucumber" target="1.8" />
+      <module name="easy-random" target="1.8" />
+      <module name="easymock" target="1.8" />
       <module name="gatling" target="1.8" />
-      <module name="groovy-spock" target="11" />
-      <module name="hamcrest" target="1.5" />
+      <module name="groovy-spock" target="1.8" />
+      <module name="hamcrest" target="1.8" />
       <module name="jackson" target="11" />
       <module name="jackson-annotations" target="11" />
       <module name="jackson-conversions" target="11" />
@@ -34,35 +132,37 @@
       <module name="java-numbers" target="11" />
       <module name="java-numbers-2" target="11" />
       <module name="jmh" target="11" />
-      <module name="junit-4" target="1.5" />
-      <module name="junit-5" target="11" />
-      <module name="junit-5-advanced" target="11" />
-      <module name="junit-5-basics" target="11" />
-      <module name="junit5-annotations" target="11" />
+      <module name="junit-4" target="1.8" />
+      <module name="junit-5" target="1.8" />
+      <module name="junit-5-advanced" target="1.8" />
+      <module name="junit5-annotations" target="1.8" />
+      <module name="junit5-migration" target="1.8" />
       <module name="load-testing-comparison" target="1.8" />
-      <module name="math-test-functions" target="1.5" />
-      <module name="mockito" target="1.5" />
-      <module name="mockito-2" target="11" />
-      <module name="mockito-3" target="1.5" />
-      <module name="mocks" target="1.5" />
-      <module name="mockserver" target="11" />
-      <module name="parallel-tests-junit" target="1.5" />
+      <module name="math-test-functions" target="1.8" />
+      <module name="mockito" target="1.8" />
+      <module name="mockito-2" target="1.8" />
+      <module name="mockito-3" target="1.8" />
+      <module name="mocks" target="1.8" />
+      <module name="mockserver" target="1.8" />
+      <module name="parallel-tests-junit" target="1.8" />
       <module name="parent-java" target="11" />
-      <module name="powermock" target="1.5" />
-      <module name="rest-assured" target="11" />
-      <module name="rest-testing" target="11" />
-      <module name="selenium-junit-testng" target="1.5" />
-      <module name="spring-testing" target="11" />
-      <module name="spring-testing-2" target="11" />
-      <module name="string-test-functions" target="1.5" />
-      <module name="test-containers" target="1.5" />
+      <module name="powermock" target="1.8" />
+      <module name="pre-jpms" target="1.8" />
+      <module name="rest-assured" target="1.8" />
+      <module name="rest-testing" target="1.8" />
+      <module name="selenium-junit-testng" target="1.8" />
+      <module name="spring-testing" target="1.8" />
+      <module name="spring-testing-2" target="1.8" />
+      <module name="string-test-functions" target="1.8" />
+      <module name="test-containers" target="1.8" />
       <module name="testing-assertions" target="1.5" />
-      <module name="testing-libraries" target="1.5" />
-      <module name="testing-libraries-2" target="1.5" />
-      <module name="testng" target="1.5" />
+      <module name="testing-libraries" target="1.8" />
+      <module name="testing-libraries-2" target="1.8" />
+      <module name="testng" target="1.8" />
+      <module name="testng-command-line" target="1.8" />
       <module name="xml" target="11" />
-      <module name="xmlunit-2" target="1.5" />
-      <module name="zerocode" target="8" />
+      <module name="xmlunit-2" target="1.8" />
+      <module name="zerocode" target="1.8" />
     </bytecodeTargetLevel>
   </component>
   <component name="JavacSettings">
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 44c4c0bfc4..5581558b26 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,6 +8,7 @@
         <option value="$PROJECT_DIR$/testing-modules/pom.xml" />
         <option value="$PROJECT_DIR$/core-java-modules/pom.xml" />
         <option value="$PROJECT_DIR$/testing-modules/junit5-migration/pom.xml" />
+        <option value="$PROJECT_DIR$/testing-modules/junit-5-basics/pom.xml" />
       </list>
     </option>
   </component>
diff --git a/.idea/thriftCompiler.xml b/.idea/thriftCompiler.xml
new file mode 100644
index 0000000000..7bc123c6bc
--- /dev/null
+++ b/.idea/thriftCompiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ThriftCompiler">
+    <compilers />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f109c1626f..755687eac1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,20 +4,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="080575e3-7e62-4649-ae70-06fb6130a866" name="Changes" comment="提交所有代码，为将默认分支名从 master 切换到 main 做准备">
+    <list default="true" id="080575e3-7e62-4649-ae70-06fb6130a866" name="Changes" comment="将所有本地已有的文件提交到 Git 以便于后续的修改">
+      <change afterPath="$PROJECT_DIR$/.idea/thriftCompiler.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/jpa-buddy.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jackson-modules/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/jackson-modules/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/ossez/codebank/algorithm/tests/VariableTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/ossez/codebank/algorithm/tests/VariableTest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/testing-modules/junit-5-basics/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/testing-modules/junit-5-basics/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/toolkits/codebank/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/toolkits/codebank/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/toolkits/codebank/src/test/java/com/ossez/toolkits/codebank/tests/BitOperationTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/toolkits/codebank/src/test/java/com/ossez/toolkits/codebank/tests/BitOperationTest.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -31,14 +22,8 @@
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="HighlightingSettingsPerFile">
-    <setting file="file://$PROJECT_DIR$/core-java-modules/core-java-collections-list/src/test/resources/logback.xml" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/core-java-modules/core-java-collections-list/src/test/java/com/ossez/list/RemoveFirstElementTest.java" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/core-java-modules/core-java-collections-list/src/test/java/com/ossez/list/random/RandomListElementUnitTest.java" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/toolkits/codebank/src/test/resources/log4j2.xml" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/core-java-modules/pom.xml" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/core-java-modules/core-java-collections-list/pom.xml" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/src/test/resources/log4j2.xml" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/testing-modules/junit-5-advanced/src/test/resources/junit-platform.properties" root0="FORCE_HIGHLIGHTING" />
   </component>
   <component name="MarkdownSettingsMigration">
     <option name="stateVersion" value="1" />
@@ -59,6 +44,7 @@
     <property name="Git.Branch.Popup.ShowAllRemotes" value="true" />
     <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="TF_FMT" value="false" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="go.format.on.save.advertiser.fired" value="true" />