Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5cf2fe0

Browse files
va1mva1m
and
va1m
authored
📍Use lombok, reformat, and optimize the code (iluwatar#1560)
* Use lombok, reformat, and optimize the code* Fix merge conflicts and some sonar issuesCo-authored-by: va1m <va1m@email.com>
1 parent0e26a6a commit5cf2fe0

File tree

681 files changed

+2468
-4962
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

681 files changed

+2468
-4962
lines changed

‎abstract-document/src/main/java/com/iluwatar/abstractdocument/App.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
importcom.iluwatar.abstractdocument.domain.enums.Property;
2828
importjava.util.List;
2929
importjava.util.Map;
30-
importorg.slf4j.Logger;
31-
importorg.slf4j.LoggerFactory;
30+
importlombok.extern.slf4j.Slf4j;
3231

3332
/**
3433
* The Abstract Document pattern enables handling additional, non-static properties. This pattern
@@ -38,10 +37,9 @@
3837
* <p>In Abstract Document pattern,({@link AbstractDocument}) fully implements {@link Document})
3938
* interface. Traits are then defined to enable access to properties in usual, static way.
4039
*/
40+
@Slf4j
4141
publicclassApp {
4242

43-
privatestaticfinalLoggerLOGGER =LoggerFactory.getLogger(App.class);
44-
4543
/**
4644
* Program entry point.
4745
*

‎abstract-document/src/test/java/com/iluwatar/abstractdocument/AbstractDocumentTest.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,18 @@
2323

2424
packagecom.iluwatar.abstractdocument;
2525

26-
importstaticorg.junit.jupiter.api.Assertions.assertEquals;
27-
importstaticorg.junit.jupiter.api.Assertions.assertNotNull;
28-
importstaticorg.junit.jupiter.api.Assertions.assertTrue;
26+
importorg.junit.jupiter.api.Test;
2927

3028
importjava.util.HashMap;
3129
importjava.util.List;
3230
importjava.util.Map;
33-
importorg.junit.jupiter.api.Test;
31+
32+
importstaticorg.junit.jupiter.api.Assertions.*;
3433

3534
/**
3635
* AbstractDocument test class
3736
*/
38-
publicclassAbstractDocumentTest {
37+
classAbstractDocumentTest {
3938

4039
privatestaticfinalStringKEY ="key";
4140
privatestaticfinalStringVALUE ="value";
@@ -50,13 +49,13 @@ private static class DocumentImplementation extends AbstractDocument {
5049
privatefinalDocumentImplementationdocument =newDocumentImplementation(newHashMap<>());
5150

5251
@Test
53-
publicvoidshouldPutAndGetValue() {
52+
voidshouldPutAndGetValue() {
5453
document.put(KEY,VALUE);
5554
assertEquals(VALUE,document.get(KEY));
5655
}
5756

5857
@Test
59-
publicvoidshouldRetrieveChildren() {
58+
voidshouldRetrieveChildren() {
6059
varchildren =List.of(Map.of(),Map.of());
6160

6261
document.put(KEY,children);
@@ -67,14 +66,14 @@ public void shouldRetrieveChildren() {
6766
}
6867

6968
@Test
70-
publicvoidshouldRetrieveEmptyStreamForNonExistingChildren() {
69+
voidshouldRetrieveEmptyStreamForNonExistingChildren() {
7170
varchildren =document.children(KEY,DocumentImplementation::new);
7271
assertNotNull(children);
7372
assertEquals(0,children.count());
7473
}
7574

7675
@Test
77-
publicvoidshouldIncludePropsInToString() {
76+
voidshouldIncludePropsInToString() {
7877
varprops =Map.of(KEY, (Object)VALUE);
7978
vardocument =newDocumentImplementation(props);
8079
assertTrue(document.toString().contains(KEY));

‎abstract-document/src/test/java/com/iluwatar/abstractdocument/DomainTest.java

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

2424
packagecom.iluwatar.abstractdocument;
2525

26-
importstaticorg.junit.jupiter.api.Assertions.assertEquals;
27-
2826
importcom.iluwatar.abstractdocument.domain.Car;
2927
importcom.iluwatar.abstractdocument.domain.Part;
3028
importcom.iluwatar.abstractdocument.domain.enums.Property;
29+
importorg.junit.jupiter.api.Test;
30+
3131
importjava.util.List;
3232
importjava.util.Map;
33-
importorg.junit.jupiter.api.Test;
33+
34+
importstaticorg.junit.jupiter.api.Assertions.assertEquals;
3435

3536
/**
3637
* Test for Part and Car
3738
*/
38-
publicclassDomainTest {
39+
classDomainTest {
3940

4041
privatestaticfinalStringTEST_PART_TYPE ="test-part-type";
4142
privatestaticfinalStringTEST_PART_MODEL ="test-part-model";
@@ -45,7 +46,7 @@ public class DomainTest {
4546
privatestaticfinallongTEST_CAR_PRICE =1L;
4647

4748
@Test
48-
publicvoidshouldConstructPart() {
49+
voidshouldConstructPart() {
4950
varpartProperties =Map.of(
5051
Property.TYPE.toString(),TEST_PART_TYPE,
5152
Property.MODEL.toString(),TEST_PART_MODEL,
@@ -58,7 +59,7 @@ public void shouldConstructPart() {
5859
}
5960

6061
@Test
61-
publicvoidshouldConstructCar() {
62+
voidshouldConstructCar() {
6263
varcarProperties =Map.of(
6364
Property.MODEL.toString(),TEST_CAR_MODEL,
6465
Property.PRICE.toString(),TEST_CAR_PRICE,

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

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

2424
packagecom.iluwatar.abstractfactory;
2525

26-
importorg.slf4j.Logger;
27-
importorg.slf4j.LoggerFactory;
26+
importlombok.extern.slf4j.Slf4j;
2827

2928
/**
3029
* The Abstract Factory pattern provides a way to encapsulate a group of individual factories that
@@ -40,10 +39,9 @@
4039
* and its implementations ( {@link ElfKingdomFactory}, {@link OrcKingdomFactory}). The example uses
4140
* both concrete implementations to create a king, a castle and an army.
4241
*/
42+
@Slf4j
4343
publicclassAppimplementsRunnable {
4444

45-
privatestaticLoggerlog =LoggerFactory.getLogger(App.class);
46-
4745
privatefinalKingdomkingdom =newKingdom();
4846

4947
publicKingdomgetKingdom() {
@@ -62,17 +60,17 @@ public static void main(String[] args) {
6260

6361
@Override
6462
publicvoidrun() {
65-
log.info("Elf Kingdom");
63+
LOGGER.info("Elf Kingdom");
6664
createKingdom(Kingdom.FactoryMaker.KingdomType.ELF);
67-
log.info(kingdom.getArmy().getDescription());
68-
log.info(kingdom.getCastle().getDescription());
69-
log.info(kingdom.getKing().getDescription());
65+
LOGGER.info(kingdom.getArmy().getDescription());
66+
LOGGER.info(kingdom.getCastle().getDescription());
67+
LOGGER.info(kingdom.getKing().getDescription());
7068

71-
log.info("Orc Kingdom");
69+
LOGGER.info("Orc Kingdom");
7270
createKingdom(Kingdom.FactoryMaker.KingdomType.ORC);
73-
log.info(kingdom.getArmy().getDescription());
74-
log.info(kingdom.getCastle().getDescription());
75-
log.info(kingdom.getKing().getDescription());
71+
LOGGER.info(kingdom.getArmy().getDescription());
72+
LOGGER.info(kingdom.getCastle().getDescription());
73+
LOGGER.info(kingdom.getKing().getDescription());
7674
}
7775

7876
/**

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

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -23,36 +23,17 @@
2323

2424
packagecom.iluwatar.abstractfactory;
2525

26+
importlombok.Getter;
27+
importlombok.Setter;
28+
29+
@Getter
30+
@Setter
2631
publicclassKingdom {
2732

2833
privateKingking;
2934
privateCastlecastle;
3035
privateArmyarmy;
3136

32-
publicKinggetKing() {
33-
returnking;
34-
}
35-
36-
publicCastlegetCastle() {
37-
returncastle;
38-
}
39-
40-
publicArmygetArmy() {
41-
returnarmy;
42-
}
43-
44-
publicvoidsetKing(Kingking) {
45-
this.king =king;
46-
}
47-
48-
publicvoidsetCastle(Castlecastle) {
49-
this.castle =castle;
50-
}
51-
52-
publicvoidsetArmy(Armyarmy) {
53-
this.army =army;
54-
}
55-
5637
/**
5738
* The factory of kingdom factories.
5839
*/

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
/**
3232
* Test for abstract factory.
3333
*/
34-
publicclassAbstractFactoryTest {
34+
classAbstractFactoryTest {
3535

3636
privatefinalAppapp =newApp();
3737

3838
@Test
39-
publicvoidking() {
39+
voidking() {
4040
app.createKingdom(Kingdom.FactoryMaker.KingdomType.ELF);
4141
finalvarkingdom =app.getKingdom();
4242

@@ -51,7 +51,7 @@ public void king() {
5151
}
5252

5353
@Test
54-
publicvoidcastle() {
54+
voidcastle() {
5555
app.createKingdom(Kingdom.FactoryMaker.KingdomType.ELF);
5656
finalvarkingdom =app.getKingdom();
5757

@@ -66,7 +66,7 @@ public void castle() {
6666
}
6767

6868
@Test
69-
publicvoidarmy() {
69+
voidarmy() {
7070
app.createKingdom(Kingdom.FactoryMaker.KingdomType.ELF);
7171
finalvarkingdom =app.getKingdom();
7272

@@ -81,7 +81,7 @@ public void army() {
8181
}
8282

8383
@Test
84-
publicvoidcreateElfKingdom() {
84+
voidcreateElfKingdom() {
8585
app.createKingdom(Kingdom.FactoryMaker.KingdomType.ELF);
8686
finalvarkingdom =app.getKingdom();
8787

@@ -97,7 +97,7 @@ public void createElfKingdom() {
9797
}
9898

9999
@Test
100-
publicvoidcreateOrcKingdom() {
100+
voidcreateOrcKingdom() {
101101
app.createKingdom(Kingdom.FactoryMaker.KingdomType.ORC);
102102
finalvarkingdom =app.getKingdom();
103103

‎acyclic-visitor/src/main/java/com/iluwatar/acyclicvisitor/ConfigureForDosVisitor.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,15 @@
2323

2424
packagecom.iluwatar.acyclicvisitor;
2525

26-
importorg.slf4j.Logger;
27-
importorg.slf4j.LoggerFactory;
26+
importlombok.extern.slf4j.Slf4j;
2827

2928
/**
3029
* ConfigureForDosVisitor class implements both zoom's and hayes' visit method for Dos
3130
* manufacturer.
3231
*/
32+
@Slf4j
3333
publicclassConfigureForDosVisitorimplementsAllModemVisitor {
3434

35-
privatestaticfinalLoggerLOGGER =LoggerFactory.getLogger(ConfigureForDosVisitor.class);
36-
3735
@Override
3836
publicvoidvisit(Hayeshayes) {
3937
LOGGER.info(hayes +" used with Dos configurator.");

‎acyclic-visitor/src/main/java/com/iluwatar/acyclicvisitor/ConfigureForUnixVisitor.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,15 @@
2323

2424
packagecom.iluwatar.acyclicvisitor;
2525

26-
importorg.slf4j.Logger;
27-
importorg.slf4j.LoggerFactory;
26+
importlombok.extern.slf4j.Slf4j;
2827

2928
/**
3029
* ConfigureForUnixVisitor class implements zoom's visit method for Unix manufacturer, unlike
3130
* traditional visitor pattern, this class may selectively implement visit for other modems.
3231
*/
32+
@Slf4j
3333
publicclassConfigureForUnixVisitorimplementsZoomVisitor {
3434

35-
privatestaticfinalLoggerLOGGER =LoggerFactory.getLogger(ConfigureForUnixVisitor.class);
36-
3735
@Override
3836
publicvoidvisit(Zoomzoom) {
3937
LOGGER.info(zoom +" used with Unix configurator.");

‎acyclic-visitor/src/main/java/com/iluwatar/acyclicvisitor/Hayes.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,14 @@
2323

2424
packagecom.iluwatar.acyclicvisitor;
2525

26-
importorg.slf4j.Logger;
27-
importorg.slf4j.LoggerFactory;
26+
importlombok.extern.slf4j.Slf4j;
2827

2928
/**
3029
* Hayes class implements its accept method.
3130
*/
31+
@Slf4j
3232
publicclassHayesextendsModem {
3333

34-
privatestaticfinalLoggerLOGGER =LoggerFactory.getLogger(ConfigureForDosVisitor.class);
35-
3634
/**
3735
* Accepts all visitors but honors only HayesVisitor.
3836
*/

‎acyclic-visitor/src/main/java/com/iluwatar/acyclicvisitor/Zoom.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,14 @@
2323

2424
packagecom.iluwatar.acyclicvisitor;
2525

26-
importorg.slf4j.Logger;
27-
importorg.slf4j.LoggerFactory;
26+
importlombok.extern.slf4j.Slf4j;
2827

2928
/**
3029
* Zoom class implements its accept method.
3130
*/
31+
@Slf4j
3232
publicclassZoomextendsModem {
3333

34-
privatestaticfinalLoggerLOGGER =LoggerFactory.getLogger(ConfigureForDosVisitor.class);
35-
3634
/**
3735
* Accepts all visitors but honors only ZoomVisitor.
3836
*/

‎acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ConfigureForDosVisitorTest.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,34 +35,34 @@
3535
/**
3636
* ConfigureForDosVisitor test class
3737
*/
38-
publicclassConfigureForDosVisitorTest {
38+
classConfigureForDosVisitorTest {
3939

4040
privatefinalTestLoggerlogger =TestLoggerFactory.getTestLogger(ConfigureForDosVisitor.class);
41-
41+
4242
@Test
43-
publicvoidtestVisitForZoom() {
43+
voidtestVisitForZoom() {
4444
varconDos =newConfigureForDosVisitor();
4545
varzoom =newZoom();
46-
46+
4747
conDos.visit(zoom);
48-
48+
4949
assertThat(logger.getLoggingEvents())
5050
.extracting("level","message")
5151
.contains(tuple(INFO,zoom +" used with Dos configurator."));
5252
}
53-
53+
5454
@Test
55-
publicvoidtestVisitForHayes() {
55+
voidtestVisitForHayes() {
5656
varconDos =newConfigureForDosVisitor();
5757
varhayes =newHayes();
58-
58+
5959
conDos.visit(hayes);
60-
60+
6161
assertThat(logger.getLoggingEvents())
6262
.extracting("level","message")
6363
.contains(tuple(INFO,hayes +" used with Dos configurator."));
6464
}
65-
65+
6666
@AfterEach
6767
publicvoidclearLoggers() {
6868
TestLoggerFactory.clear();

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp