Skip to content

Commit 9b105d7

Browse files
Java 11 migraiton: multiton
1 parent 109d33c commit 9b105d7

File tree

6 files changed

+26
-17
lines changed

6 files changed

+26
-17
lines changed

multiton/src/main/java/com/iluwatar/multiton/Nazgul.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
*/
3232
public final class Nazgul {
3333

34-
private static Map<NazgulName, Nazgul> nazguls;
34+
private static final Map<NazgulName, Nazgul> nazguls;
3535

3636
private NazgulName name;
3737

multiton/src/main/java/com/iluwatar/multiton/NazgulEnum.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,13 @@
2727
* enum based multiton implementation.
2828
*/
2929
public enum NazgulEnum {
30-
31-
KHAMUL, MURAZOR, DWAR, JI_INDUR, AKHORAHIL, HOARMURATH, ADUNAPHEL, REN, UVATHA;
32-
30+
KHAMUL,
31+
MURAZOR,
32+
DWAR,
33+
JI_INDUR,
34+
AKHORAHIL,
35+
HOARMURATH,
36+
ADUNAPHEL,
37+
REN,
38+
UVATHA
3339
}

multiton/src/main/java/com/iluwatar/multiton/NazgulName.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,13 @@
2727
* Each Nazgul has different {@link NazgulName}.
2828
*/
2929
public enum NazgulName {
30-
31-
KHAMUL, MURAZOR, DWAR, JI_INDUR, AKHORAHIL, HOARMURATH, ADUNAPHEL, REN, UVATHA;
32-
30+
KHAMUL,
31+
MURAZOR,
32+
DWAR,
33+
JI_INDUR,
34+
AKHORAHIL,
35+
HOARMURATH,
36+
ADUNAPHEL,
37+
REN,
38+
UVATHA
3339
}

multiton/src/test/java/com/iluwatar/multiton/AppTest.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,12 @@
2626
import org.junit.jupiter.api.Test;
2727

2828
/**
29-
*
3029
* Application test
31-
*
3230
*/
3331
public class AppTest {
3432

3533
@Test
3634
public void test() {
37-
String[] args = {};
38-
App.main(args);
35+
App.main(new String[]{});
3936
}
4037
}

multiton/src/test/java/com/iluwatar/multiton/NazgulEnumTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ class NazgulEnumTest {
3939
*/
4040
@Test
4141
public void testTheSameObjectIsReturnedWithMultipleCalls() {
42-
for (int i = 0; i < NazgulEnum.values().length; i++) {
43-
NazgulEnum instance1 = NazgulEnum.values()[i];
44-
NazgulEnum instance2 = NazgulEnum.values()[i];
45-
NazgulEnum instance3 = NazgulEnum.values()[i];
42+
for (var i = 0; i < NazgulEnum.values().length; i++) {
43+
var instance1 = NazgulEnum.values()[i];
44+
var instance2 = NazgulEnum.values()[i];
45+
var instance3 = NazgulEnum.values()[i];
4646
assertSame(instance1, instance2);
4747
assertSame(instance1, instance3);
4848
assertSame(instance2, instance3);

multiton/src/test/java/com/iluwatar/multiton/NazgulTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ public class NazgulTest {
4141
*/
4242
@Test
4343
public void testGetInstance() {
44-
for (final NazgulName name : NazgulName.values()) {
45-
final Nazgul nazgul = Nazgul.getInstance(name);
44+
for (final var name : NazgulName.values()) {
45+
final var nazgul = Nazgul.getInstance(name);
4646
assertNotNull(nazgul);
4747
assertSame(nazgul, Nazgul.getInstance(name));
4848
assertEquals(name, nazgul.getName());

0 commit comments

Comments
 (0)