Skip to content

Commit 81e009c

Browse files
committed
merge code for testing
1 parent 8bc8c31 commit 81e009c

32 files changed

Lines changed: 51 additions & 18 deletions

.idea/compiler.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/jarRepositories.xml

Lines changed: 39 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core-java-modules/core-java-8-2/README.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,5 @@
33
本模块中包含有关 Java 8 核心新增功能特性的一些文章。
44

55
### 相关文章
6-
- [Run a Java Application from the Command Line](https://www.baeldung.com/java-run-jar-with-arguments)
7-
- [Java 8 Stream skip() vs limit()](https://www.baeldung.com/java-stream-skip-vs-limit)
8-
- [Guide to Java BiFunction Interface](https://www.baeldung.com/java-bifunction-interface)
9-
- [Interface With Default Methods vs Abstract Class](https://www.baeldung.com/java-interface-default-method-vs-abstract-class)
10-
- [Convert Between Byte Array and UUID in Java](https://www.baeldung.com/java-byte-array-to-uuid)
11-
- [Create a Simple “Rock-Paper-Scissors” Game in Java](https://www.baeldung.com/java-rock-paper-scissors)
12-
- [Java 8 开始新增的 Optional 类](https://www.ossez.com/t/java-8-optional/13964)
6+
137
- [[<-- Java 8 核心(第 1 部分)]](/core-java-modules/core-java-8)

core-java-modules/core-java-8-2/src/main/resources/example_manifest.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

core-java-modules/core-java-8/README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,10 @@
1212
- [Finding Min/Max in an Array with Java](https://www.baeldung.com/java-array-min-max)
1313
- [Internationalization and Localization in Java 8](https://www.baeldung.com/java-8-localization)
1414
- [Generalized Target-Type Inference in Java](https://www.baeldung.com/java-generalized-target-type-inference)
15-
- [[Java 8 核心(第 2 部分) -->]](/core-java-modules/core-java-8-2)
15+
- [Run a Java Application from the Command Line](https://www.baeldung.com/java-run-jar-with-arguments)
16+
- [Java 8 Stream skip() vs limit()](https://www.baeldung.com/java-stream-skip-vs-limit)
17+
- [Guide to Java BiFunction Interface](https://www.baeldung.com/java-bifunction-interface)
18+
- [Interface With Default Methods vs Abstract Class](https://www.baeldung.com/java-interface-default-method-vs-abstract-class)
19+
- [Convert Between Byte Array and UUID in Java](https://www.baeldung.com/java-byte-array-to-uuid)
20+
- [Create a Simple “Rock-Paper-Scissors” Game in Java](https://www.baeldung.com/java-rock-paper-scissors)
21+
- [Java 8 开始新增的 Optional 类](https://www.ossez.com/t/java-8-optional/13964)

core-java-modules/core-java-8-2/src/main/java/com/ossez/game/RockPaperScissorsGame.java renamed to core-java-modules/core-java-8/src/main/java/com/ossez/game/RockPaperScissorsGame.java

File renamed without changes.

core-java-modules/core-java-8-2/src/main/java/com/ossez/interfaceVsAbstractClass/ChidlCircleInterfaceImpl.java renamed to core-java-modules/core-java-8/src/main/java/com/ossez/interfaceVsAbstractClass/ChidlCircleInterfaceImpl.java

File renamed without changes.

core-java-modules/core-java-8-2/src/main/java/com/ossez/interfaceVsAbstractClass/ChildCircleClass.java renamed to core-java-modules/core-java-8/src/main/java/com/ossez/interfaceVsAbstractClass/ChildCircleClass.java

File renamed without changes.

core-java-modules/core-java-8-2/src/main/java/com/ossez/interfaceVsAbstractClass/CircleClass.java renamed to core-java-modules/core-java-8/src/main/java/com/ossez/interfaceVsAbstractClass/CircleClass.java

File renamed without changes.

core-java-modules/core-java-8-2/src/main/java/com/ossez/interfaceVsAbstractClass/CircleInterface.java renamed to core-java-modules/core-java-8/src/main/java/com/ossez/interfaceVsAbstractClass/CircleInterface.java

File renamed without changes.

0 commit comments

Comments
 (0)