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 @@ - @@ -40,6 +39,9 @@ + + + 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 @@ - - - 4.0.0 - core-java-collections-list-2 - 0.1.0-SNAPSHOT - core-java-collections-list-2 - jar - - - com.ossez.core-java-modules - core-java-modules - 0.0.2-SNAPSHOT - ../pom.xml - - - - - org.apache.commons - commons-collections4 - ${commons-collections4.version} - - - org.projectlombok - lombok - ${lombok.version} - provided - - - - \ 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 @@ - - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - \ 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 @@ core-java-collections-conversions core-java-collections-conversions-2 core-java-collections-list - core-java-collections-list-2 core-java-collections-list-3 core-java-datetime-conversion core-java-io