Skip to content

Commit 5f033be

Browse files
iluwatariluwatar
committed
Fix PMD violations iluwatar#327 
1 parent df911ba commit 5f033be

File tree

94 files changed

+91
-318
lines changed

Some content is hidden

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

94 files changed

+91
-318
lines changed

‎adapter/src/test/java/com/iluwatar/adapter/AdapterPatternTest.java

+4-9
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
11
package com.iluwatar.adapter;
22

3-
import static org.mockito.Mockito.spy;
4-
import static org.mockito.Mockito.verify;
3+
import org.junit.Before;
4+
import org.junit.Test;
55

66
import java.util.HashMap;
77
import java.util.Map;
88

9-
import org.junit.Before;
10-
import org.junit.Test;
11-
12-
import com.iluwatar.adapter.BattleFishingBoat;
13-
import com.iluwatar.adapter.BattleShip;
14-
import com.iluwatar.adapter.Captain;
15-
import com.iluwatar.adapter.FishingBoat;
9+
import static org.mockito.Mockito.spy;
10+
import static org.mockito.Mockito.verify;
1611

1712
/**
1813
* Test class

‎async-method-invocation/src/main/java/com/iluwatar/async/method/invocation/ThreadAsyncExecutor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ void setException(Exception exception) {
102102

103103
@Override
104104
public boolean isCompleted() {
105-
return (state > RUNNING);
105+
return state > RUNNING;
106106
}
107107

108108
@Override

‎async-method-invocation/src/test/java/com/iluwatar/async/method/invocation/ThreadAsyncExecutorTest.java

+2-12
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,9 @@
88
import java.util.concurrent.Callable;
99
import java.util.concurrent.ExecutionException;
1010

11-
import static org.junit.Assert.assertEquals;
12-
import static org.junit.Assert.assertFalse;
13-
import static org.junit.Assert.assertNotNull;
14-
import static org.junit.Assert.assertSame;
15-
import static org.junit.Assert.assertTrue;
16-
import static org.junit.Assert.fail;
11+
import static org.junit.Assert.*;
1712
import static org.mockito.Matchers.eq;
18-
import static org.mockito.Mockito.mock;
19-
import static org.mockito.Mockito.timeout;
20-
import static org.mockito.Mockito.verify;
21-
import static org.mockito.Mockito.verifyNoMoreInteractions;
22-
import static org.mockito.Mockito.verifyZeroInteractions;
23-
import static org.mockito.Mockito.when;
13+
import static org.mockito.Mockito.*;
2414
import static org.mockito.internal.verification.VerificationModeFactory.times;
2515

2616
/**

‎bridge/src/test/java/com/iluwatar/bridge/AppTest.java

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import org.junit.Test;
44

5-
import com.iluwatar.bridge.App;
6-
75
/**
86
*
97
* Application test

‎builder/src/test/java/com/iluwatar/builder/AppTest.java

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import org.junit.Test;
44

5-
import com.iluwatar.builder.App;
6-
75
/**
86
*
97
* Application test

‎callback/src/main/java/com/iluwatar/callback/Callback.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
*/
88
public interface Callback {
99

10-
public void call();
10+
void call();
1111
}

‎chain/src/test/java/com/iluwatar/chain/AppTest.java

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import org.junit.Test;
44

5-
import com.iluwatar.chain.App;
6-
75
/**
86
*
97
* Application test

‎composite/src/test/java/com/iluwatar/composite/AppTest.java

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import org.junit.Test;
44

5-
import com.iluwatar.composite.App;
6-
75
/**
86
*
97
* Application test

‎dao/src/main/java/com/iluwatar/dao/Customer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public boolean equals(final Object o) {
5555
boolean isEqual = false;
5656
if (this == o) {
5757
isEqual = true;
58-
} else if (o != null && (getClass() == o.getClass())) {
58+
} else if (o != null && getClass() == o.getClass()) {
5959
final Customer customer = (Customer) o;
6060
if (getId() == customer.getId()) {
6161
isEqual = true;

‎decorator/src/test/java/com/iluwatar/decorator/AppTest.java

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import org.junit.Test;
44

5-
import com.iluwatar.decorator.App;
6-
75
/**
86
*
97
* Application test

‎decorator/src/test/java/com/iluwatar/decorator/SmartTrollTest.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
import org.junit.Test;
44

55
import static org.junit.Assert.assertEquals;
6-
import static org.mockito.Mockito.spy;
7-
import static org.mockito.Mockito.verify;
8-
import static org.mockito.Mockito.verifyNoMoreInteractions;
6+
import static org.mockito.Mockito.*;
97
import static org.mockito.internal.verification.VerificationModeFactory.times;
108

119
/**

‎decorator/src/test/java/com/iluwatar/decorator/TrollTest.java

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,11 @@
44
import org.junit.Before;
55
import org.junit.Test;
66

7-
import java.io.FileDescriptor;
8-
import java.io.FileOutputStream;
97
import java.io.PrintStream;
108

119
import static org.junit.Assert.assertEquals;
1210
import static org.mockito.Matchers.eq;
13-
import static org.mockito.Mockito.mock;
14-
import static org.mockito.Mockito.verify;
15-
import static org.mockito.Mockito.verifyNoMoreInteractions;
11+
import static org.mockito.Mockito.*;
1612
import static org.mockito.internal.verification.VerificationModeFactory.times;
1713

1814
/**

‎dependency-injection/src/test/java/com/iluwatar/dependency/injection/AppTest.java

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import org.junit.Test;
44

5-
import com.iluwatar.dependency.injection.App;
6-
75
/**
86
*
97
* Application test

‎dependency-injection/src/test/java/com/iluwatar/dependency/injection/SimpleWizardTest.java

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
11
package com.iluwatar.dependency.injection;
22

3-
import org.junit.After;
4-
import org.junit.Before;
53
import org.junit.Test;
64

7-
import java.io.PrintStream;
8-
9-
import static org.mockito.Mockito.mock;
10-
import static org.mockito.Mockito.times;
11-
import static org.mockito.Mockito.verify;
12-
import static org.mockito.Mockito.verifyNoMoreInteractions;
5+
import static org.mockito.Mockito.*;
136

147
/**
158
* Date: 12/10/15 - 8:26 PM

‎double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/Item.java

-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,4 @@
66
*
77
*/
88
public class Item {
9-
10-
private String name;
11-
private int level;
129
}

‎double-checked-locking/src/test/java/com/iluwatar/doublechecked/locking/AppTest.java

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import org.junit.Test;
44

5-
import com.iluwatar.doublechecked.locking.App;
6-
75
/**
86
*
97
* Application test

‎double-checked-locking/src/test/java/com/iluwatar/doublechecked/locking/InventoryTest.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@
1414
import static junit.framework.Assert.assertTrue;
1515
import static junit.framework.TestCase.assertEquals;
1616
import static org.junit.Assert.assertNotNull;
17-
import static org.mockito.Mockito.mock;
18-
import static org.mockito.Mockito.times;
19-
import static org.mockito.Mockito.verify;
20-
import static org.mockito.Mockito.verifyNoMoreInteractions;
17+
import static org.mockito.Mockito.*;
2118

2219
/**
2320
* Date: 12/10/15 - 9:34 PM

‎double-dispatch/src/test/java/com/iluwatar/doubledispatch/AppTest.java

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import org.junit.Test;
44

5-
import com.iluwatar.doubledispatch.App;
6-
75
/**
86
*
97
* Application test

‎double-dispatch/src/test/java/com/iluwatar/doubledispatch/CollisionTest.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@
77
import java.util.Objects;
88

99
import static org.junit.Assert.assertEquals;
10-
import static org.mockito.Mockito.mock;
11-
import static org.mockito.Mockito.times;
12-
import static org.mockito.Mockito.verify;
13-
import static org.mockito.Mockito.verifyNoMoreInteractions;
10+
import static org.mockito.Mockito.*;
1411

1512
/**
1613
* Date: 12/10/15 - 8:37 PM

‎event-aggregator/src/test/java/com/iluwatar/event/aggregator/AppTest.java

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import org.junit.Test;
44

5-
import com.iluwatar.event.aggregator.App;
6-
75
/**
86
*
97
* Application test

‎event-aggregator/src/test/java/com/iluwatar/event/aggregator/EventEmitterTest.java

+1-5
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@
77
import java.util.function.Supplier;
88

99
import static org.mockito.Matchers.eq;
10-
import static org.mockito.Mockito.mock;
11-
import static org.mockito.Mockito.times;
12-
import static org.mockito.Mockito.verify;
13-
import static org.mockito.Mockito.verifyNoMoreInteractions;
14-
import static org.mockito.Mockito.verifyZeroInteractions;
10+
import static org.mockito.Mockito.*;
1511

1612
/**
1713
* Date: 12/12/15 - 10:58 PM

‎event-aggregator/src/test/java/com/iluwatar/event/aggregator/KingJoffreyTest.java

+1-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66

77
import java.io.PrintStream;
88

9-
import static org.mockito.Mockito.mock;
10-
import static org.mockito.Mockito.times;
11-
import static org.mockito.Mockito.verify;
12-
import static org.mockito.Mockito.verifyNoMoreInteractions;
13-
import static org.mockito.Mockito.verifyZeroInteractions;
9+
import static org.mockito.Mockito.*;
1410

1511
/**
1612
* Date: 12/12/15 - 3:04 PM

‎event-aggregator/src/test/java/com/iluwatar/event/aggregator/KingsHandTest.java

+1-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
33
import org.junit.Test;
44

55
import static org.mockito.Matchers.eq;
6-
import static org.mockito.Mockito.mock;
7-
import static org.mockito.Mockito.times;
8-
import static org.mockito.Mockito.verify;
9-
import static org.mockito.Mockito.verifyNoMoreInteractions;
10-
import static org.mockito.Mockito.verifyZeroInteractions;
6+
import static org.mockito.Mockito.*;
117

128
/**
139
* Date: 12/12/15 - 10:57 AM

‎execute-around/src/test/java/com/iluwatar/execute/around/AppTest.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package com.iluwatar.execute.around;
22

3-
import java.io.File;
4-
import java.io.IOException;
5-
63
import org.junit.After;
74
import org.junit.Before;
85
import org.junit.Test;
96

10-
import com.iluwatar.execute.around.App;
7+
import java.io.File;
8+
import java.io.IOException;
119

1210
/**
1311
*

‎execute-around/src/test/java/com/iluwatar/execute/around/SimpleFileWriterTest.java

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import java.nio.file.Files;
1111

1212
import static org.junit.Assert.assertFalse;
13-
import static org.junit.Assert.assertNotNull;
1413
import static org.junit.Assert.assertTrue;
1514

1615
/**

‎facade/src/test/java/com/iluwatar/facade/AppTest.java

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import org.junit.Test;
44

5-
import com.iluwatar.facade.App;
6-
75
/**
86
*
97
* Application test

‎facade/src/test/java/com/iluwatar/facade/DwarvenGoldmineFacadeTest.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
import java.io.PrintStream;
88

99
import static org.mockito.Matchers.eq;
10-
import static org.mockito.Mockito.mock;
11-
import static org.mockito.Mockito.verify;
12-
import static org.mockito.Mockito.verifyNoMoreInteractions;
10+
import static org.mockito.Mockito.*;
1311
import static org.mockito.internal.verification.VerificationModeFactory.times;
1412

1513
/**

‎fluentinterface/src/main/java/com/iluwatar/fluentinterface/app/App.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public static void main(String[] args) {
6565

6666
List<String> lastTwoOfFirstFourStringMapped =
6767
LazyFluentIterable.from(integerList).filter(positives()).first(4).last(2)
68-
.map(number -> "String[" + String.valueOf(number) + "]").asList();
68+
.map(number -> "String[" + valueOf(number) + "]").asList();
6969
prettyPrint(
7070
"The lazy list contains the last two of the first four positive numbers mapped to Strings: ",
7171
lastTwoOfFirstFourStringMapped);
@@ -85,19 +85,19 @@ private static Function<Integer, String> transformToString() {
8585
}
8686

8787
private static Predicate<? super Integer> negatives() {
88-
return integer -> (integer < 0);
88+
return integer -> integer < 0;
8989
}
9090

9191
private static Predicate<? super Integer> positives() {
92-
return integer -> (integer > 0);
92+
return integer -> integer > 0;
9393
}
9494

9595
private static <TYPE> void prettyPrint(String prefix, Iterable<TYPE> iterable) {
96-
prettyPrint(", ", prefix, ".", iterable);
96+
prettyPrint(", ", prefix, iterable);
9797
}
9898

99-
private static <TYPE> void prettyPrint(String delimiter, String prefix, String suffix,
100-
Iterable<TYPE> iterable) {
99+
private static <TYPE> void prettyPrint(String delimiter, String prefix,
100+
Iterable<TYPE> iterable) {
101101
StringJoiner joiner = new StringJoiner(delimiter, prefix, ".");
102102
Iterator<TYPE> iterator = iterable.iterator();
103103
while (iterator.hasNext()) {

‎fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/lazy/LazyFluentIterable.java

+9-11
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,9 @@ public Iterator<TYPE> iterator() {
5353
public TYPE computeNext() {
5454
while (fromIterator.hasNext()) {
5555
TYPE candidate = fromIterator.next();
56-
if (!predicate.test(candidate)) {
57-
continue;
56+
if (predicate.test(candidate)) {
57+
return candidate;
5858
}
59-
return candidate;
6059
}
6160

6261
return null;
@@ -94,12 +93,10 @@ public Iterator<TYPE> iterator() {
9493

9594
@Override
9695
public TYPE computeNext() {
97-
if (currentIndex < count) {
98-
if (fromIterator.hasNext()) {
99-
TYPE candidate = fromIterator.next();
100-
currentIndex++;
101-
return candidate;
102-
}
96+
if (currentIndex < count && fromIterator.hasNext()) {
97+
TYPE candidate = fromIterator.next();
98+
currentIndex++;
99+
return candidate;
103100
}
104101
return null;
105102
}
@@ -188,11 +185,12 @@ public Iterator<NEW_TYPE> iterator() {
188185

189186
@Override
190187
public NEW_TYPE computeNext() {
191-
while (oldTypeIterator.hasNext()) {
188+
if (oldTypeIterator.hasNext()) {
192189
TYPE candidate = oldTypeIterator.next();
193190
return function.apply(candidate);
191+
} else {
192+
return null;
194193
}
195-
return null;
196194
}
197195
};
198196
}

‎fluentinterface/src/test/java/com/iluwatar/fluentinterface/app/AppTest.java

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import org.junit.Test;
44

5-
import com.iluwatar.fluentinterface.app.App;
6-
75
public class AppTest {
86

97
@Test

0 commit comments

Comments
 (0)