From 899c4d7bbc80032815673176e6ebc5da4e47e6bf Mon Sep 17 00:00:00 2001
From: YuCheng Hu <huyuchengus@gmail.com>
Date: Tue, 30 Apr 2024 09:35:09 -0400
Subject: [PATCH] Merge List section 2 to main section

---
 .idea/compiler.xml                            |  4 ++-
 .../core-java-collections-list-2/README.md    | 15 ---------
 .../core-java-collections-list-2/pom.xml      | 32 -------------------
 .../src/main/resources/logback.xml            | 13 --------
 .../core-java-collections-list/README.md      | 10 +++++-
 .../findastring/FindAStringInGivenList.java   |  0
 .../java/com/ossez}/list/WaysToIterate.java   |  2 +-
 .../converter/ArrayConvertToListUnitTest.java |  2 +-
 .../FindItemsBasedOnOtherStreamUnitTest.java  |  0
 .../FindAStringInListUnitTest.java            |  0
 .../FlattenNestedListUnitTest.java            |  2 +-
 .../ossez/java/list/ListAssertJUnitTest.java  |  0
 .../com/ossez/java/list/ListJUnitTest.java    |  0
 .../ossez/java/list/ListTestNgUnitTest.java   |  0
 .../java/list/WaysToIterateUnitTest.java      |  0
 .../ListInitializationUnitTest.java           |  0
 core-java-modules/pom.xml                     |  1 -
 17 files changed, 15 insertions(+), 66 deletions(-)
 delete mode 100644 core-java-modules/core-java-collections-list-2/README.md
 delete mode 100644 core-java-modules/core-java-collections-list-2/pom.xml
 delete mode 100644 core-java-modules/core-java-collections-list-2/src/main/resources/logback.xml
 rename core-java-modules/{core-java-collections-list-2 => core-java-collections-list}/src/main/java/com/ossez/findastring/FindAStringInGivenList.java (100%)
 rename core-java-modules/{core-java-collections-list-2/src/main/java/com/ossez/java => core-java-collections-list/src/main/java/com/ossez}/list/WaysToIterate.java (98%)
 rename core-java-modules/{core-java-collections-list-2/src/test/java/com/ossez/array => core-java-collections-list/src/test/java/com/ossez}/converter/ArrayConvertToListUnitTest.java (99%)
 rename core-java-modules/{core-java-collections-list-2 => core-java-collections-list}/src/test/java/com/ossez/findItems/FindItemsBasedOnOtherStreamUnitTest.java (100%)
 rename core-java-modules/{core-java-collections-list-2 => core-java-collections-list}/src/test/java/com/ossez/findastring/FindAStringInListUnitTest.java (100%)
 rename core-java-modules/{core-java-collections-list-2/src/test/java/com/ossez/list => core-java-collections-list/src/test/java/com/ossez}/flattennestedlist/FlattenNestedListUnitTest.java (97%)
 rename core-java-modules/{core-java-collections-list-2 => core-java-collections-list}/src/test/java/com/ossez/java/list/ListAssertJUnitTest.java (100%)
 rename core-java-modules/{core-java-collections-list-2 => core-java-collections-list}/src/test/java/com/ossez/java/list/ListJUnitTest.java (100%)
 rename core-java-modules/{core-java-collections-list-2 => core-java-collections-list}/src/test/java/com/ossez/java/list/ListTestNgUnitTest.java (100%)
 rename core-java-modules/{core-java-collections-list-2 => core-java-collections-list}/src/test/java/com/ossez/java/list/WaysToIterateUnitTest.java (100%)
 rename core-java-modules/{core-java-collections-list-2 => core-java-collections-list}/src/test/java/com/ossez/java/listInitialization/ListInitializationUnitTest.java (100%)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fd6687cea8..0d92c7f2b6 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -32,7 +32,6 @@
         <module name="image-processing" />
         <module name="spring-data-redis" />
         <module name="core-java" />
-        <module name="core-java-collections-list-2" />
         <module name="core-java-collections-conversions-2" />
         <module name="core-java-collections-list-3" />
         <module name="core-java-8" />
@@ -40,6 +39,9 @@
         <module name="core-java-collections-2" />
       </profile>
     </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="core-java-collections-list-2" target="11" />
+    </bytecodeTargetLevel>
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
diff --git a/core-java-modules/core-java-collections-list-2/README.md b/core-java-modules/core-java-collections-list-2/README.md
deleted file mode 100644
index 77d583d7de..0000000000
--- a/core-java-modules/core-java-collections-list-2/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-## Java 核心（Core Java）集合中的 List 列表 （第2部分）
-
-This module contains articles about the Java List collection
-
-### Relevant Articles: 
-- [Check If Two Lists are Equal in Java](https://www.baeldung.com/java-test-a-list-for-ordinality-and-equality)
-- [Java 8 Streams: Find Items From One List Based On Values From Another List](https://www.baeldung.com/java-streams-find-list-items)
-- [A Guide to the Java LinkedList](https://www.baeldung.com/java-linkedlist)
-- [Java List UnsupportedOperationException](https://www.baeldung.com/java-list-unsupported-operation-exception)
-- [Java List Initialization in One Line](https://www.baeldung.com/java-init-list-one-line)
-- [Ways to Iterate Over a List in Java](https://www.baeldung.com/java-iterate-list)
-- [Flattening Nested Collections in Java](https://www.baeldung.com/java-flatten-nested-collections)
-- [Intersection of Two Lists in Java](https://www.baeldung.com/java-lists-intersection)
-- [Searching for a String in an ArrayList](https://www.baeldung.com/java-search-string-arraylist)
-- [[<-- Prev]](/core-java-modules/core-java-collections-list)[[Next -->]](/core-java-modules/core-java-collections-list-3)
diff --git a/core-java-modules/core-java-collections-list-2/pom.xml b/core-java-modules/core-java-collections-list-2/pom.xml
deleted file mode 100644
index fc022180db..0000000000
--- a/core-java-modules/core-java-collections-list-2/pom.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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>
-    <artifactId>core-java-collections-list-2</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
-    <name>core-java-collections-list-2</name>
-    <packaging>jar</packaging>
-
-    <parent>
-        <groupId>com.ossez.core-java-modules</groupId>
-        <artifactId>core-java-modules</artifactId>
-        <version>0.0.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-collections4</artifactId>
-            <version>${commons-collections4.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-collections-list-2/src/main/resources/logback.xml b/core-java-modules/core-java-collections-list-2/src/main/resources/logback.xml
deleted file mode 100644
index 7d900d8ea8..0000000000
--- a/core-java-modules/core-java-collections-list-2/src/main/resources/logback.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
-            </pattern>
-        </encoder>
-    </appender>
-
-    <root level="INFO">
-        <appender-ref ref="STDOUT" />
-    </root>
-</configuration>
\ No newline at end of file
diff --git a/core-java-modules/core-java-collections-list/README.md b/core-java-modules/core-java-collections-list/README.md
index 47d8d9c41f..36ceee579c 100644
--- a/core-java-modules/core-java-collections-list/README.md
+++ b/core-java-modules/core-java-collections-list/README.md
@@ -12,4 +12,12 @@
 - [How to Find an Element in a List with Java](http://www.baeldung.com/find-list-element-java)
 - [Finding Max/Min of a List or Collection](http://www.baeldung.com/java-collection-min-max)
 - [Remove All Occurrences of a Specific Value from a List](https://www.baeldung.com/java-remove-value-from-list)
-- [[Next -->]](/core-java-modules/core-java-collections-list-2)
+- [Check If Two Lists are Equal in Java](https://www.baeldung.com/java-test-a-list-for-ordinality-and-equality)
+- [Java 8 Streams: Find Items From One List Based On Values From Another List](https://www.baeldung.com/java-streams-find-list-items)
+- [A Guide to the Java LinkedList](https://www.baeldung.com/java-linkedlist)
+- [Java List UnsupportedOperationException](https://www.baeldung.com/java-list-unsupported-operation-exception)
+- [Java List Initialization in One Line](https://www.baeldung.com/java-init-list-one-line)
+- [Ways to Iterate Over a List in Java](https://www.baeldung.com/java-iterate-list)
+- [Flattening Nested Collections in Java](https://www.baeldung.com/java-flatten-nested-collections)
+- [Intersection of Two Lists in Java](https://www.baeldung.com/java-lists-intersection)
+- [Searching for a String in an ArrayList](https://www.baeldung.com/java-search-string-arraylist)
\ No newline at end of file
diff --git a/core-java-modules/core-java-collections-list-2/src/main/java/com/ossez/findastring/FindAStringInGivenList.java b/core-java-modules/core-java-collections-list/src/main/java/com/ossez/findastring/FindAStringInGivenList.java
similarity index 100%
rename from core-java-modules/core-java-collections-list-2/src/main/java/com/ossez/findastring/FindAStringInGivenList.java
rename to core-java-modules/core-java-collections-list/src/main/java/com/ossez/findastring/FindAStringInGivenList.java
diff --git a/core-java-modules/core-java-collections-list-2/src/main/java/com/ossez/java/list/WaysToIterate.java b/core-java-modules/core-java-collections-list/src/main/java/com/ossez/list/WaysToIterate.java
similarity index 98%
rename from core-java-modules/core-java-collections-list-2/src/main/java/com/ossez/java/list/WaysToIterate.java
rename to core-java-modules/core-java-collections-list/src/main/java/com/ossez/list/WaysToIterate.java
index 26dddc9bf3..6e0453d395 100644
--- a/core-java-modules/core-java-collections-list-2/src/main/java/com/ossez/java/list/WaysToIterate.java
+++ b/core-java-modules/core-java-collections-list/src/main/java/com/ossez/list/WaysToIterate.java
@@ -1,4 +1,4 @@
-package com.ossez.java.list;
+package com.ossez.list;
 
 import java.util.Arrays;
 import java.util.Iterator;
diff --git a/core-java-modules/core-java-collections-list-2/src/test/java/com/ossez/array/converter/ArrayConvertToListUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/ossez/converter/ArrayConvertToListUnitTest.java
similarity index 99%
rename from core-java-modules/core-java-collections-list-2/src/test/java/com/ossez/array/converter/ArrayConvertToListUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/com/ossez/converter/ArrayConvertToListUnitTest.java
index 89b0bbcf53..94cc365181 100644
--- a/core-java-modules/core-java-collections-list-2/src/test/java/com/ossez/array/converter/ArrayConvertToListUnitTest.java
+++ b/core-java-modules/core-java-collections-list/src/test/java/com/ossez/converter/ArrayConvertToListUnitTest.java
@@ -1,4 +1,4 @@
-package com.ossez.array.converter;
+package com.ossez.converter;
 
 import org.junit.Test;
 
diff --git a/core-java-modules/core-java-collections-list-2/src/test/java/com/ossez/findItems/FindItemsBasedOnOtherStreamUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/ossez/findItems/FindItemsBasedOnOtherStreamUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-collections-list-2/src/test/java/com/ossez/findItems/FindItemsBasedOnOtherStreamUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/com/ossez/findItems/FindItemsBasedOnOtherStreamUnitTest.java
diff --git a/core-java-modules/core-java-collections-list-2/src/test/java/com/ossez/findastring/FindAStringInListUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/ossez/findastring/FindAStringInListUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-collections-list-2/src/test/java/com/ossez/findastring/FindAStringInListUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/com/ossez/findastring/FindAStringInListUnitTest.java
diff --git a/core-java-modules/core-java-collections-list-2/src/test/java/com/ossez/list/flattennestedlist/FlattenNestedListUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/ossez/flattennestedlist/FlattenNestedListUnitTest.java
similarity index 97%
rename from core-java-modules/core-java-collections-list-2/src/test/java/com/ossez/list/flattennestedlist/FlattenNestedListUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/com/ossez/flattennestedlist/FlattenNestedListUnitTest.java
index 2370b7be69..ac9f77c03a 100644
--- a/core-java-modules/core-java-collections-list-2/src/test/java/com/ossez/list/flattennestedlist/FlattenNestedListUnitTest.java
+++ b/core-java-modules/core-java-collections-list/src/test/java/com/ossez/flattennestedlist/FlattenNestedListUnitTest.java
@@ -1,4 +1,4 @@
-package com.ossez.list.flattennestedlist;
+package com.ossez.flattennestedlist;
 
 import static java.util.Arrays.asList;
 import static org.junit.Assert.assertNotNull;
diff --git a/core-java-modules/core-java-collections-list-2/src/test/java/com/ossez/java/list/ListAssertJUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/ossez/java/list/ListAssertJUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-collections-list-2/src/test/java/com/ossez/java/list/ListAssertJUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/com/ossez/java/list/ListAssertJUnitTest.java
diff --git a/core-java-modules/core-java-collections-list-2/src/test/java/com/ossez/java/list/ListJUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/ossez/java/list/ListJUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-collections-list-2/src/test/java/com/ossez/java/list/ListJUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/com/ossez/java/list/ListJUnitTest.java
diff --git a/core-java-modules/core-java-collections-list-2/src/test/java/com/ossez/java/list/ListTestNgUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/ossez/java/list/ListTestNgUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-collections-list-2/src/test/java/com/ossez/java/list/ListTestNgUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/com/ossez/java/list/ListTestNgUnitTest.java
diff --git a/core-java-modules/core-java-collections-list-2/src/test/java/com/ossez/java/list/WaysToIterateUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/ossez/java/list/WaysToIterateUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-collections-list-2/src/test/java/com/ossez/java/list/WaysToIterateUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/com/ossez/java/list/WaysToIterateUnitTest.java
diff --git a/core-java-modules/core-java-collections-list-2/src/test/java/com/ossez/java/listInitialization/ListInitializationUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/ossez/java/listInitialization/ListInitializationUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-collections-list-2/src/test/java/com/ossez/java/listInitialization/ListInitializationUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/com/ossez/java/listInitialization/ListInitializationUnitTest.java
diff --git a/core-java-modules/pom.xml b/core-java-modules/pom.xml
index ade1ebdbd8..9a5afb75d8 100644
--- a/core-java-modules/pom.xml
+++ b/core-java-modules/pom.xml
@@ -27,7 +27,6 @@
         <module>core-java-collections-conversions</module>
         <module>core-java-collections-conversions-2</module>
         <module>core-java-collections-list</module>
-        <module>core-java-collections-list-2</module>
         <module>core-java-collections-list-3</module>
         <module>core-java-datetime-conversion</module>
         <module>core-java-io</module>