Skip to content

Commit 2e36a11

Browse files
committed
remove lombok, related to #1503
1 parent bd48d6c commit 2e36a11

File tree

4 files changed

+51
-30
lines changed

4 files changed

+51
-30
lines changed

abstract-factory/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@
3131
<artifactId>junit-jupiter-engine</artifactId>
3232
<scope>test</scope>
3333
</dependency>
34-
<dependency>
35-
<groupId>org.projectlombok</groupId>
36-
<artifactId>lombok</artifactId>
37-
<version>1.18.12</version>
38-
</dependency>
3934
</dependencies>
4035
<build>
4136
<plugins>

abstract-factory/src/main/java/com/iluwatar/abstractfactory/App.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@
2323

2424
package com.iluwatar.abstractfactory;
2525

26-
import lombok.Getter;
27-
import lombok.extern.slf4j.Slf4j;
26+
import org.slf4j.Logger;
27+
import org.slf4j.LoggerFactory;
28+
29+
import java.util.List;
2830

2931
/**
3032
* The Abstract Factory pattern provides a way to encapsulate a group of individual factories that
@@ -40,12 +42,16 @@
4042
* and its implementations ( {@link ElfKingdomFactory}, {@link OrcKingdomFactory}). The example uses
4143
* both concrete implementations to create a king, a castle and an army.
4244
*/
43-
@Slf4j
4445
public class App implements Runnable {
4546

46-
@Getter
47+
private static Logger log = LoggerFactory.getLogger(App.class);
48+
4749
private final Kingdom kingdom = new Kingdom();
4850

51+
public Kingdom getKingdom() {
52+
return kingdom;
53+
}
54+
4955
/**
5056
* Program entry point.
5157
*

abstract-factory/src/main/java/com/iluwatar/abstractfactory/Kingdom.java

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,35 @@
11
package com.iluwatar.abstractfactory;
22

3-
import lombok.Data;
4-
5-
@Data
63
public class Kingdom {
74

85
private King king;
96
private Castle castle;
107
private Army army;
118

9+
public King getKing() {
10+
return king;
11+
}
12+
13+
public Castle getCastle() {
14+
return castle;
15+
}
16+
17+
public Army getArmy() {
18+
return army;
19+
}
20+
21+
public void setKing(King king) {
22+
this.king = king;
23+
}
24+
25+
public void setCastle(Castle castle) {
26+
this.castle = castle;
27+
}
28+
29+
public void setArmy(Army army) {
30+
this.army = army;
31+
}
32+
1233
/**
1334
* The factory of kingdom factories.
1435
*/

abstract-factory/src/test/java/com/iluwatar/abstractfactory/AbstractFactoryTest.java

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
package com.iluwatar.abstractfactory;
2525

26-
import lombok.val;
2726
import org.junit.jupiter.api.BeforeEach;
2827
import org.junit.jupiter.api.Test;
2928

@@ -48,56 +47,56 @@ public void setUp() {
4847
@Test
4948
public void king() {
5049
app.createKingdom(elfFactory);
51-
val kingdom = app.getKingdom();
50+
final var kingdom = app.getKingdom();
5251

53-
val elfKing = kingdom.getKing();
52+
final var elfKing = kingdom.getKing();
5453
assertTrue(elfKing instanceof ElfKing);
5554
assertEquals(ElfKing.DESCRIPTION, elfKing.getDescription());
5655

5756
app.createKingdom(orcFactory);
58-
val orcKing = kingdom.getKing();
57+
final var orcKing = kingdom.getKing();
5958
assertTrue(orcKing instanceof OrcKing);
6059
assertEquals(OrcKing.DESCRIPTION, orcKing.getDescription());
6160
}
6261

6362
@Test
6463
public void castle() {
6564
app.createKingdom(elfFactory);
66-
val kingdom = app.getKingdom();
65+
final var kingdom = app.getKingdom();
6766

68-
val elfCastle = kingdom.getCastle();
67+
final var elfCastle = kingdom.getCastle();
6968
assertTrue(elfCastle instanceof ElfCastle);
7069
assertEquals(ElfCastle.DESCRIPTION, elfCastle.getDescription());
7170

7271
app.createKingdom(orcFactory);
73-
val orcCastle = kingdom.getCastle();
72+
final var orcCastle = kingdom.getCastle();
7473
assertTrue(orcCastle instanceof OrcCastle);
7574
assertEquals(OrcCastle.DESCRIPTION, orcCastle.getDescription());
7675
}
7776

7877
@Test
7978
public void army() {
8079
app.createKingdom(elfFactory);
81-
val kingdom = app.getKingdom();
80+
final var kingdom = app.getKingdom();
8281

83-
val elfArmy = kingdom.getArmy();
82+
final var elfArmy = kingdom.getArmy();
8483
assertTrue(elfArmy instanceof ElfArmy);
8584
assertEquals(ElfArmy.DESCRIPTION, elfArmy.getDescription());
8685

8786
app.createKingdom(orcFactory);
88-
val orcArmy = kingdom.getArmy();
87+
final var orcArmy = kingdom.getArmy();
8988
assertTrue(orcArmy instanceof OrcArmy);
9089
assertEquals(OrcArmy.DESCRIPTION, orcArmy.getDescription());
9190
}
9291

9392
@Test
9493
public void createElfKingdom() {
9594
app.createKingdom(elfFactory);
96-
val kingdom = app.getKingdom();
95+
final var kingdom = app.getKingdom();
9796

98-
val king = kingdom.getKing();
99-
val castle = kingdom.getCastle();
100-
val army = kingdom.getArmy();
97+
final var king = kingdom.getKing();
98+
final var castle = kingdom.getCastle();
99+
final var army = kingdom.getArmy();
101100
assertTrue(king instanceof ElfKing);
102101
assertEquals(ElfKing.DESCRIPTION, king.getDescription());
103102
assertTrue(castle instanceof ElfCastle);
@@ -109,11 +108,11 @@ public void createElfKingdom() {
109108
@Test
110109
public void createOrcKingdom() {
111110
app.createKingdom(orcFactory);
112-
val kingdom = app.getKingdom();
111+
final var kingdom = app.getKingdom();
113112

114-
val king = kingdom.getKing();
115-
val castle = kingdom.getCastle();
116-
val army = kingdom.getArmy();
113+
final var king = kingdom.getKing();
114+
final var castle = kingdom.getCastle();
115+
final var army = kingdom.getArmy();
117116
assertTrue(king instanceof OrcKing);
118117
assertEquals(OrcKing.DESCRIPTION, king.getDescription());
119118
assertTrue(castle instanceof OrcCastle);

0 commit comments

Comments
 (0)