Java 11 migraiton: multiton

iluwatar · Apr 12, 2020 · 9b105d7 · 9b105d7
1 parent 109d33c
commit 9b105d7
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 17 deletions.
diff --git a/multiton/src/main/java/com/iluwatar/multiton/Nazgul.java b/multiton/src/main/java/com/iluwatar/multiton/Nazgul.java
@@ -31,7 +31,7 @@
  */
 public final class Nazgul {
 
-  private static Map<NazgulName, Nazgul> nazguls;
+  private static final Map<NazgulName, Nazgul> nazguls;
 
   private NazgulName name;
 

diff --git a/multiton/src/main/java/com/iluwatar/multiton/NazgulEnum.java b/multiton/src/main/java/com/iluwatar/multiton/NazgulEnum.java
@@ -27,7 +27,13 @@
  * enum based multiton implementation.
  */
 public enum NazgulEnum {
-
-  KHAMUL, MURAZOR, DWAR, JI_INDUR, AKHORAHIL, HOARMURATH, ADUNAPHEL, REN, UVATHA;
-
+  KHAMUL,
+  MURAZOR,
+  DWAR,
+  JI_INDUR,
+  AKHORAHIL,
+  HOARMURATH,
+  ADUNAPHEL,
+  REN,
+  UVATHA
 }
diff --git a/multiton/src/main/java/com/iluwatar/multiton/NazgulName.java b/multiton/src/main/java/com/iluwatar/multiton/NazgulName.java
@@ -27,7 +27,13 @@
  * Each Nazgul has different {@link NazgulName}.
  */
 public enum NazgulName {
-
-  KHAMUL, MURAZOR, DWAR, JI_INDUR, AKHORAHIL, HOARMURATH, ADUNAPHEL, REN, UVATHA;
-
+  KHAMUL,
+  MURAZOR,
+  DWAR,
+  JI_INDUR,
+  AKHORAHIL,
+  HOARMURATH,
+  ADUNAPHEL,
+  REN,
+  UVATHA
 }
diff --git a/multiton/src/test/java/com/iluwatar/multiton/AppTest.java b/multiton/src/test/java/com/iluwatar/multiton/AppTest.java
@@ -26,15 +26,12 @@
 import org.junit.jupiter.api.Test;
 
 /**
- * 
  * Application test
- *
  */
 public class AppTest {
 
   @Test
   public void test() {
-    String[] args = {};
-    App.main(args);
+    App.main(new String[]{});
   }
 }
diff --git a/multiton/src/test/java/com/iluwatar/multiton/NazgulEnumTest.java b/multiton/src/test/java/com/iluwatar/multiton/NazgulEnumTest.java
@@ -39,10 +39,10 @@ class NazgulEnumTest {
    */
   @Test
   public void testTheSameObjectIsReturnedWithMultipleCalls() {
-    for (int i = 0; i < NazgulEnum.values().length; i++) {
-      NazgulEnum instance1 = NazgulEnum.values()[i];
-      NazgulEnum instance2 = NazgulEnum.values()[i];
-      NazgulEnum instance3 = NazgulEnum.values()[i];
+    for (var i = 0; i < NazgulEnum.values().length; i++) {
+      var instance1 = NazgulEnum.values()[i];
+      var instance2 = NazgulEnum.values()[i];
+      var instance3 = NazgulEnum.values()[i];
       assertSame(instance1, instance2);
       assertSame(instance1, instance3);
       assertSame(instance2, instance3);

diff --git a/multiton/src/test/java/com/iluwatar/multiton/NazgulTest.java b/multiton/src/test/java/com/iluwatar/multiton/NazgulTest.java
@@ -41,8 +41,8 @@ public class NazgulTest {
    */
   @Test
   public void testGetInstance() {
-    for (final NazgulName name : NazgulName.values()) {
-      final Nazgul nazgul = Nazgul.getInstance(name);
+    for (final var name : NazgulName.values()) {
+      final var nazgul = Nazgul.getInstance(name);
       assertNotNull(nazgul);
       assertSame(nazgul, Nazgul.getInstance(name));
       assertEquals(name, nazgul.getName());