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

Commit543eb9a

Browse files
committed
Minor refactorings and code style changes. 1) Removed several use of raw types 2) Removed unnecessary throws clauses 3) Used lambda expressions wherever applicable 4) Used apt assertion methods for readability 5) Use of try with resources wherever applicable 6) Corrected incorrect order of assertXXX arguments
1 parent2f569d6 commit543eb9a

File tree

73 files changed

+207
-298
lines changed

Some content is hidden

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

73 files changed

+207
-298
lines changed

‎fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/simple/SimpleFluentIterable.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,11 +171,11 @@ public List<E> asList() {
171171
/**
172172
* @return a FluentIterable from a given iterable. Calls the SimpleFluentIterable constructor.
173173
*/
174-
publicstaticfinal<E>FluentIterable<E>from(Iterable<E>iterable) {
174+
publicstatic <E>FluentIterable<E>from(Iterable<E>iterable) {
175175
returnnewSimpleFluentIterable<>(iterable);
176176
}
177177

178-
publicstaticfinal<E>FluentIterable<E>fromCopyOf(Iterable<E>iterable) {
178+
publicstatic <E>FluentIterable<E>fromCopyOf(Iterable<E>iterable) {
179179
List<E>copy =FluentIterable.copyToList(iterable);
180180
returnnewSimpleFluentIterable<>(copy);
181181
}

‎front-controller/src/main/java/com/iluwatar/front/controller/FrontController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ public void handleRequest(String request) {
3636
}
3737

3838
privateCommandgetCommand(Stringrequest) {
39-
ClasscommandClass =getCommandClass(request);
39+
Class<?>commandClass =getCommandClass(request);
4040
try {
4141
return (Command)commandClass.newInstance();
4242
}catch (Exceptione) {
4343
thrownewApplicationException(e);
4444
}
4545
}
4646

47-
privatestaticClassgetCommandClass(Stringrequest) {
48-
Classresult;
47+
privatestaticClass<?>getCommandClass(Stringrequest) {
48+
Class<?>result;
4949
try {
5050
result =Class.forName("com.iluwatar.front.controller." +request +"Command");
5151
}catch (ClassNotFoundExceptione) {

‎front-controller/src/test/java/com/iluwatar/front/controller/ApplicationExceptionTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
publicclassApplicationExceptionTest {
3535

3636
@Test
37-
publicvoidtestCause()throwsException{
37+
publicvoidtestCause() {
3838
finalExceptioncause =newException();
3939
assertSame(cause,newApplicationException(cause).getCause());
4040
}

‎guarded-suspension/src/test/java/com/iluwatar/guarded/suspension/GuardedQueueTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void testGet() {
4141
GuardedQueueg =newGuardedQueue();
4242
ExecutorServiceexecutorService =Executors.newFixedThreadPool(2);
4343
executorService.submit(() ->value =g.get());
44-
executorService.submit(() ->g.put(Integer.valueOf(10)));
44+
executorService.submit(() ->g.put(10));
4545
executorService.shutdown();
4646
try {
4747
executorService.awaitTermination(30,TimeUnit.SECONDS);

‎half-sync-half-async/src/test/java/com/iluwatar/halfsynchalfasync/AppTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
publicclassAppTest {
3535

3636
@Test
37-
publicvoidtest()throwsInterruptedException,ExecutionException{
37+
publicvoidtest() {
3838
App.main(null);
3939
}
4040
}

‎half-sync-half-async/src/test/java/com/iluwatar/halfsynchalfasync/AsynchronousServiceTest.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
*/
2323
packagecom.iluwatar.halfsynchalfasync;
2424

25+
importorg.junit.jupiter.api.BeforeEach;
2526
importorg.junit.jupiter.api.Test;
2627
importorg.mockito.InOrder;
2728

@@ -44,11 +45,17 @@
4445
* @author Jeroen Meulemeester
4546
*/
4647
publicclassAsynchronousServiceTest {
48+
privateAsynchronousServiceservice;
49+
privateAsyncTask<Object>task;
50+
51+
@BeforeEach
52+
publicvoidsetUp() {
53+
service =newAsynchronousService(newLinkedBlockingQueue<>());
54+
task =mock(AsyncTask.class);
55+
}
4756

4857
@Test
4958
publicvoidtestPerfectExecution()throwsException {
50-
finalAsynchronousServiceservice =newAsynchronousService(newLinkedBlockingQueue<>());
51-
finalAsyncTask<Object>task =mock(AsyncTask.class);
5259
finalObjectresult =newObject();
5360
when(task.call()).thenReturn(result);
5461
service.execute(task);
@@ -65,8 +72,6 @@ public void testPerfectExecution() throws Exception {
6572

6673
@Test
6774
publicvoidtestCallException()throwsException {
68-
finalAsynchronousServiceservice =newAsynchronousService(newLinkedBlockingQueue<>());
69-
finalAsyncTask<Object>task =mock(AsyncTask.class);
7075
finalIOExceptionexception =newIOException();
7176
when(task.call()).thenThrow(exception);
7277
service.execute(task);
@@ -82,9 +87,7 @@ public void testCallException() throws Exception {
8287
}
8388

8489
@Test
85-
publicvoidtestPreCallException()throwsException {
86-
finalAsynchronousServiceservice =newAsynchronousService(newLinkedBlockingQueue<>());
87-
finalAsyncTask<Object>task =mock(AsyncTask.class);
90+
publicvoidtestPreCallException() {
8891
finalIllegalStateExceptionexception =newIllegalStateException();
8992
doThrow(exception).when(task).onPreCall();
9093
service.execute(task);

‎intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Client.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@
2222
*/
2323
packagecom.iluwatar.intercepting.filter;
2424

25-
importjava.awt.BorderLayout;
26-
importjava.awt.GridLayout;
27-
2825
importjavax.swing.JButton;
2926
importjavax.swing.JFrame;
3027
importjavax.swing.JLabel;
@@ -33,6 +30,9 @@
3330
importjavax.swing.JTextArea;
3431
importjavax.swing.JTextField;
3532
importjavax.swing.SwingUtilities;
33+
importjavax.swing.WindowConstants;
34+
importjava.awt.BorderLayout;
35+
importjava.awt.GridLayout;
3636

3737
/**
3838
* The Client class is responsible for handling the input and running them through filters inside the
@@ -60,7 +60,7 @@ public class Client extends JFrame { // NOSONAR
6060
*/
6161
publicClient() {
6262
super("Client System");
63-
setDefaultCloseOperation(EXIT_ON_CLOSE);
63+
setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
6464
setSize(300,300);
6565
jl =newJLabel("RUNNING...");
6666
jtFields =newJTextField[3];

‎intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Target.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@
2222
*/
2323
packagecom.iluwatar.intercepting.filter;
2424

25-
importjava.awt.BorderLayout;
26-
importjava.awt.Dimension;
27-
importjava.awt.event.ActionEvent;
28-
importjava.awt.event.ActionListener;
29-
3025
importjavax.swing.JButton;
3126
importjavax.swing.JFrame;
3227
importjavax.swing.JPanel;
3328
importjavax.swing.JRootPane;
3429
importjavax.swing.JScrollPane;
3530
importjavax.swing.JTable;
3631
importjavax.swing.SwingUtilities;
32+
importjavax.swing.WindowConstants;
3733
importjavax.swing.table.DefaultTableModel;
34+
importjava.awt.BorderLayout;
35+
importjava.awt.Dimension;
36+
importjava.awt.event.ActionEvent;
37+
importjava.awt.event.ActionListener;
3838

3939
/**
4040
* This is where the requests are displayed after being validated by filters.
@@ -47,7 +47,6 @@ public class Target extends JFrame { //NOSONAR
4747
privatestaticfinallongserialVersionUID =1L;
4848

4949
privateJTablejt;
50-
privateJScrollPanejsp;
5150
privateDefaultTableModeldtm;
5251
privateJButtondel;
5352

@@ -56,7 +55,7 @@ public class Target extends JFrame { //NOSONAR
5655
*/
5756
publicTarget() {
5857
super("Order System");
59-
setDefaultCloseOperation(EXIT_ON_CLOSE);
58+
setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
6059
setSize(640,480);
6160
dtm =
6261
newDefaultTableModel(newObject[] {"Name","Contact Number","Address","Deposit Number",
@@ -73,7 +72,7 @@ private void setup() {
7372
bot.setLayout(newBorderLayout());
7473
bot.add(del,BorderLayout.EAST);
7574
add(bot,BorderLayout.SOUTH);
76-
jsp =newJScrollPane(jt);
75+
JScrollPanejsp =newJScrollPane(jt);
7776
jsp.setPreferredSize(newDimension(500,250));
7877
add(jsp,BorderLayout.CENTER);
7978

‎intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/FilterManagerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@
4040
publicclassFilterManagerTest {
4141

4242
@Test
43-
publicvoidtestFilterRequest()throwsException{
43+
publicvoidtestFilterRequest() {
4444
finalTargettarget =mock(Target.class);
4545
finalFilterManagerfilterManager =newFilterManager();
4646
assertEquals("RUNNING...",filterManager.filterRequest(mock(Order.class)));
4747
verifyZeroInteractions(target);
4848
}
4949

5050
@Test
51-
publicvoidtestAddFilter()throwsException{
51+
publicvoidtestAddFilter() {
5252
finalTargettarget =mock(Target.class);
5353
finalFilterManagerfilterManager =newFilterManager();
5454

‎intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/FilterTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,15 @@ static List<Object[]> getTestData() {
8989

9090
@ParameterizedTest
9191
@MethodSource("getTestData")
92-
publicvoidtestExecute(Filterfilter,Orderorder,StringexpectedResult)throwsException{
92+
publicvoidtestExecute(Filterfilter,Orderorder,StringexpectedResult) {
9393
finalStringresult =filter.execute(order);
9494
assertNotNull(result);
9595
assertEquals(expectedResult,result.trim());
9696
}
9797

9898
@ParameterizedTest
9999
@MethodSource("getTestData")
100-
publicvoidtestNext(Filterfilter)throwsException{
100+
publicvoidtestNext(Filterfilter) {
101101
assertNull(filter.getNext());
102102
assertSame(filter,filter.getLast());
103103
}

‎intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/OrderTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,35 +36,35 @@ public class OrderTest {
3636
privatestaticfinalStringEXPECTED_VALUE ="test";
3737

3838
@Test
39-
publicvoidtestSetName()throwsException{
39+
publicvoidtestSetName() {
4040
finalOrderorder =newOrder();
4141
order.setName(EXPECTED_VALUE);
4242
assertEquals(EXPECTED_VALUE,order.getName());
4343
}
4444

4545
@Test
46-
publicvoidtestSetContactNumber()throwsException{
46+
publicvoidtestSetContactNumber() {
4747
finalOrderorder =newOrder();
4848
order.setContactNumber(EXPECTED_VALUE);
4949
assertEquals(EXPECTED_VALUE,order.getContactNumber());
5050
}
5151

5252
@Test
53-
publicvoidtestSetAddress()throwsException{
53+
publicvoidtestSetAddress() {
5454
finalOrderorder =newOrder();
5555
order.setAddress(EXPECTED_VALUE);
5656
assertEquals(EXPECTED_VALUE,order.getAddress());
5757
}
5858

5959
@Test
60-
publicvoidtestSetDepositNumber()throwsException{
60+
publicvoidtestSetDepositNumber() {
6161
finalOrderorder =newOrder();
6262
order.setDepositNumber(EXPECTED_VALUE);
6363
assertEquals(EXPECTED_VALUE,order.getDepositNumber());
6464
}
6565

6666
@Test
67-
publicvoidtestSetOrder()throwsException{
67+
publicvoidtestSetOrder() {
6868
finalOrderorder =newOrder();
6969
order.setOrderItem(EXPECTED_VALUE);
7070
assertEquals(EXPECTED_VALUE,order.getOrderItem());

‎iterator/src/test/java/com/iluwatar/iterator/bst/BstIteratorTest.java

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -50,49 +50,49 @@ void createTrees() {
5050

5151
@Test
5252
voidnextForEmptyTree() {
53-
BstIteratoriter =newBstIterator<>(emptyRoot);
53+
BstIterator<Integer>iter =newBstIterator<>(emptyRoot);
5454
assertThrows(NoSuchElementException.class,iter::next,
5555
"next() should throw an IllegalStateException if hasNext() is false.");
5656
}
5757

5858
@Test
5959
voidnextOverEntirePopulatedTree() {
60-
BstIteratoriter =newBstIterator<>(nonEmptyRoot);
61-
assertEquals(1,iter.next().getVal(),"First Node is 1.");
62-
assertEquals(3,iter.next().getVal(),"Second Node is 3.");
63-
assertEquals(4,iter.next().getVal(),"Third Node is 4.");
64-
assertEquals(5,iter.next().getVal(),"Fourth Node is 5.");
65-
assertEquals(6,iter.next().getVal(),"Fifth Node is 6.");
66-
assertEquals(7,iter.next().getVal(),"Sixth Node is 7.");
60+
BstIterator<Integer>iter =newBstIterator<>(nonEmptyRoot);
61+
assertEquals(Integer.valueOf(1),iter.next().getVal(),"First Node is 1.");
62+
assertEquals(Integer.valueOf(3),iter.next().getVal(),"Second Node is 3.");
63+
assertEquals(Integer.valueOf(4),iter.next().getVal(),"Third Node is 4.");
64+
assertEquals(Integer.valueOf(5),iter.next().getVal(),"Fourth Node is 5.");
65+
assertEquals(Integer.valueOf(6),iter.next().getVal(),"Fifth Node is 6.");
66+
assertEquals(Integer.valueOf(7),iter.next().getVal(),"Sixth Node is 7.");
6767
}
6868

6969
@Test
7070
voidhasNextForEmptyTree() {
71-
BstIteratoriter =newBstIterator<>(emptyRoot);
71+
BstIterator<Integer>iter =newBstIterator<>(emptyRoot);
7272
assertFalse(iter.hasNext(),"hasNext() should return false for empty tree.");
7373
}
7474

7575
@Test
7676
voidhasNextForPopulatedTree() {
77-
BstIteratoriter =newBstIterator<>(nonEmptyRoot);
77+
BstIterator<Integer>iter =newBstIterator<>(nonEmptyRoot);
7878
assertTrue(iter.hasNext(),"hasNext() should return true for populated tree.");
7979
}
8080

8181
@Test
8282
voidnextAndHasNextOverEntirePopulatedTree() {
83-
BstIteratoriter =newBstIterator<>(nonEmptyRoot);
83+
BstIterator<Integer>iter =newBstIterator<>(nonEmptyRoot);
8484
assertTrue(iter.hasNext(),"Iterator hasNext() should be true.");
85-
assertEquals(1,iter.next().getVal(),"First Node is 1.");
85+
assertEquals(Integer.valueOf(1),iter.next().getVal(),"First Node is 1.");
8686
assertTrue(iter.hasNext(),"Iterator hasNext() should be true.");
87-
assertEquals(3,iter.next().getVal(),"Second Node is 3.");
87+
assertEquals(Integer.valueOf(3),iter.next().getVal(),"Second Node is 3.");
8888
assertTrue(iter.hasNext(),"Iterator hasNext() should be true.");
89-
assertEquals(4,iter.next().getVal(),"Third Node is 4.");
89+
assertEquals(Integer.valueOf(4),iter.next().getVal(),"Third Node is 4.");
9090
assertTrue(iter.hasNext(),"Iterator hasNext() should be true.");
91-
assertEquals(5,iter.next().getVal(),"Fourth Node is 5.");
91+
assertEquals(Integer.valueOf(5),iter.next().getVal(),"Fourth Node is 5.");
9292
assertTrue(iter.hasNext(),"Iterator hasNext() should be true.");
93-
assertEquals(6,iter.next().getVal(),"Fifth Node is 6.");
93+
assertEquals(Integer.valueOf(6),iter.next().getVal(),"Fifth Node is 6.");
9494
assertTrue(iter.hasNext(),"Iterator hasNext() should be true.");
95-
assertEquals(7,iter.next().getVal(),"Sixth Node is 7.");
95+
assertEquals(Integer.valueOf(7),iter.next().getVal(),"Sixth Node is 7.");
9696
assertFalse(iter.hasNext(),"Iterator hasNext() should be false, end of tree.");
9797
}
9898

‎layers/src/main/java/com/iluwatar/layers/CakeViewImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ public CakeViewImpl(CakeBakingService cakeBakingService) {
4141
}
4242

4343
publicvoidrender() {
44-
cakeBakingService.getAllCakes().stream().forEach(cake ->LOGGER.info(cake.toString()));
44+
cakeBakingService.getAllCakes().forEach(cake ->LOGGER.info(cake.toString()));
4545
}
4646
}

‎layers/src/test/java/com/iluwatar/layers/CakeBakingExceptionTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@
3535
publicclassCakeBakingExceptionTest {
3636

3737
@Test
38-
publicvoidtestConstructor()throwsException{
38+
publicvoidtestConstructor() {
3939
finalCakeBakingExceptionexception =newCakeBakingException();
4040
assertNull(exception.getMessage());
4141
assertNull(exception.getCause());
4242
}
4343

4444
@Test
45-
publicvoidtestConstructorWithMessage()throwsException{
45+
publicvoidtestConstructorWithMessage() {
4646
finalStringexpectedMessage ="message";
4747
finalCakeBakingExceptionexception =newCakeBakingException(expectedMessage);
4848
assertEquals(expectedMessage,exception.getMessage());

‎layers/src/test/java/com/iluwatar/layers/CakeBakingServiceImplTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
publicclassCakeBakingServiceImplTest {
4343

4444
@Test
45-
publicvoidtestLayers()throwsCakeBakingException{
45+
publicvoidtestLayers() {
4646
finalCakeBakingServiceImplservice =newCakeBakingServiceImpl();
4747

4848
finalList<CakeLayerInfo>initialLayers =service.getAvailableLayers();
@@ -65,7 +65,7 @@ public void testLayers() throws CakeBakingException {
6565
}
6666

6767
@Test
68-
publicvoidtestToppings()throwsCakeBakingException{
68+
publicvoidtestToppings() {
6969
finalCakeBakingServiceImplservice =newCakeBakingServiceImpl();
7070

7171
finalList<CakeToppingInfo>initialToppings =service.getAvailableToppings();
@@ -125,7 +125,7 @@ public void testBakeCakes() throws CakeBakingException {
125125
}
126126

127127
@Test
128-
publicvoidtestBakeCakeMissingTopping()throwsCakeBakingException{
128+
publicvoidtestBakeCakeMissingTopping() {
129129
finalCakeBakingServiceImplservice =newCakeBakingServiceImpl();
130130

131131
finalCakeLayerInfolayer1 =newCakeLayerInfo("Layer1",1000);
@@ -140,7 +140,7 @@ public void testBakeCakeMissingTopping() throws CakeBakingException {
140140
}
141141

142142
@Test
143-
publicvoidtestBakeCakeMissingLayer()throwsCakeBakingException{
143+
publicvoidtestBakeCakeMissingLayer() {
144144
finalCakeBakingServiceImplservice =newCakeBakingServiceImpl();
145145

146146
finalList<CakeInfo>initialCakes =service.getAllCakes();

0 commit comments

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