Skip to content

Commit 3d564b0

Browse files
eugenpdavidmorley
eugenp
authored and
davidmorley
committed
minor cleanup work
1 parent e2d30f5 commit 3d564b0

File tree

6 files changed

+50
-51
lines changed

6 files changed

+50
-51
lines changed

‎core-java-8/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
eclipse.preferences.version=1
2+
org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
23
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
34
org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
45
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
@@ -26,7 +27,7 @@ org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
2627
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
2728
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
2829
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
29-
org.eclipse.jdt.core.compiler.problem.fieldHiding=error
30+
org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
3031
org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
3132
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
3233
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
@@ -35,7 +36,7 @@ org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
3536
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
3637
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
3738
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
38-
org.eclipse.jdt.core.compiler.problem.localVariableHiding=error
39+
org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
3940
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
4041
org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
4142
org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
@@ -48,6 +49,7 @@ org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignor
4849
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
4950
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
5051
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
52+
org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
5153
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
5254
org.eclipse.jdt.core.compiler.problem.nullReference=warning
5355
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
@@ -68,6 +70,7 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
6870
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
6971
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
7072
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
73+
org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
7174
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
7275
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
7376
org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
@@ -82,6 +85,7 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
8285
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
8386
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
8487
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
88+
org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
8589
org.eclipse.jdt.core.compiler.problem.unusedImport=warning
8690
org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
8791
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
@@ -91,6 +95,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=
9195
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
9296
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
9397
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
98+
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
9499
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
95100
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
96101
org.eclipse.jdt.core.compiler.source=1.8

‎core-java-8/src/main/java/com/baeldung/AdderImpl.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
public class AdderImpl implements Adder {
77

88
@Override
9-
public String addWithFunction(Function<String, String> f) {
9+
public String addWithFunction(Function<String, String> f) {
1010
return f.apply("Something ");
1111
}
1212

1313
@Override
14-
public void addWithConsumer(Consumer<Integer> f) {}
14+
public void addWithConsumer(Consumer<Integer> f) {
15+
}
1516

1617
}

‎core-java-8/src/main/java/com/baeldung/Foo.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ public interface Foo {
55

66
String method(String string);
77

8-
default void defaultMethod() {}
8+
default void defaultMethod() {
9+
}
910
}

‎core-java-8/src/main/java/com/baeldung/UseFoo.java‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,34 +6,32 @@ public class UseFoo {
66

77
private String value = "Enclosing scope value";
88

9-
public String add(String string, Foo foo) {
9+
public String add(final String string, final Foo foo) {
1010
return foo.method(string);
1111
}
1212

13-
public String addWithStandardFI(String string, Function<String, String> fn) {
13+
public String addWithStandardFI(final String string, final Function<String, String> fn) {
1414
return fn.apply(string);
1515
}
1616

1717
public String scopeExperiment() {
18-
Foo fooIC = new Foo() {
18+
final Foo fooIC = new Foo() {
1919
String value = "Inner class value";
2020

2121
@Override
22-
public String method(String string) {
23-
return this.value;
22+
public String method(final String string) {
23+
return value;
2424
}
2525
};
26-
String resultIC = fooIC.method("");
26+
final String resultIC = fooIC.method("");
2727

28-
Foo fooLambda = parameter -> {
29-
String value = "Lambda value";
28+
final Foo fooLambda = parameter -> {
29+
final String value = "Lambda value";
3030
return this.value;
3131
};
32-
String resultLambda = fooLambda.method("");
32+
final String resultLambda = fooLambda.method("");
3333

34-
return "Results: resultIC = " + resultIC +
35-
", resultLambda = " + resultLambda;
34+
return "Results: resultIC = " + resultIC + ", resultLambda = " + resultLambda;
3635
}
3736

38-
3937
}

‎core-java-8/src/test/java/com/baeldung/java8/Java8FunctionalInteracesLambdasTest.java‎

Lines changed: 27 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
package com.baeldung.java8;
22

3-
import com.baeldung.Foo;
4-
import com.baeldung.FooExtended;
5-
import com.baeldung.UseFoo;
6-
import org.junit.Before;
7-
import org.junit.Test;
3+
import static org.junit.Assert.assertEquals;
4+
import static org.junit.Assert.assertNotEquals;
85

96
import java.util.function.Function;
107

11-
import static org.junit.Assert.assertEquals;
12-
import static org.junit.Assert.assertNotEquals;
8+
import org.junit.Before;
9+
import org.junit.Test;
10+
11+
import com.baeldung.Foo;
12+
import com.baeldung.FooExtended;
13+
import com.baeldung.UseFoo;
1314

1415
public class Java8FunctionalInteracesLambdasTest {
1516

@@ -22,39 +23,35 @@ public void init() {
2223

2324
@Test
2425
public void functionalInterfaceInstantiation_whenReturnDefiniteString_thenCorrect() {
25-
26-
Foo foo = parameter -> parameter + "from lambda";
27-
String result = useFoo.add("Message ", foo);
26+
final Foo foo = parameter -> parameter + "from lambda";
27+
final String result = useFoo.add("Message ", foo);
2828

2929
assertEquals("Message from lambda", result);
3030
}
3131

3232
@Test
3333
public void standardFIParameter_whenReturnDefiniteString_thenCorrect() {
34-
35-
Function<String, String> fn = parameter -> parameter + "from lambda";
36-
String result = useFoo.addWithStandardFI("Message ", fn);
34+
final Function<String, String> fn = parameter -> parameter + "from lambda";
35+
final String result = useFoo.addWithStandardFI("Message ", fn);
3736

3837
assertEquals("Message from lambda", result);
3938
}
4039

4140
@Test
4241
public void defaultMethodFromExtendedInterface_whenReturnDefiniteString_thenCorrect() {
43-
44-
FooExtended fooExtended = string -> string;
45-
String result = fooExtended.defaultMethod();
42+
final FooExtended fooExtended = string -> string;
43+
final String result = fooExtended.defaultMethod();
4644

4745
assertEquals("String from Bar", result);
4846
}
4947

5048
@Test
5149
public void lambdaAndInnerClassInstantiation_whenReturnSameString_thenCorrect() {
50+
final Foo foo = parameter -> parameter + "from Foo";
5251

53-
Foo foo = parameter -> parameter + "from Foo";
54-
55-
Foo fooByIC = new Foo() {
52+
final Foo fooByIC = new Foo() {
5653
@Override
57-
public String method(String string) {
54+
public String method(final String string) {
5855
return string + "from Foo";
5956
}
6057
};
@@ -64,35 +61,32 @@ public String method(String string) {
6461

6562
@Test
6663
public void accessVariablesFromDifferentScopes_whenReturnPredefinedString_thenCorrect() {
67-
68-
assertEquals("Results: resultIC = Inner class value, resultLambda = Enclosing scope value",
69-
useFoo.scopeExperiment());
64+
assertEquals("Results: resultIC = Inner class value, resultLambda = Enclosing scope value", useFoo.scopeExperiment());
7065
}
7166

7267
@Test
7368
public void shorteningLambdas_whenReturnEqualsResults_thenCorrect() {
69+
final Foo foo = parameter -> buildString(parameter);
7470

75-
Foo foo = parameter -> buildString(parameter);
76-
77-
Foo fooHuge = parameter -> { String result = "Something " + parameter;
78-
//many lines of code
71+
final Foo fooHuge = parameter -> {
72+
final String result = "Something " + parameter;
73+
// many lines of code
7974
return result;
8075
};
8176

8277
assertEquals(foo.method("Something"), fooHuge.method("Something"));
8378
}
8479

85-
private String buildString(String parameter) {
86-
String result = "Something " + parameter;
87-
//many lines of code
80+
private String buildString(final String parameter) {
81+
final String result = "Something " + parameter;
82+
// many lines of code
8883
return result;
8984
}
9085

9186
@Test
9287
public void mutatingOfEffectivelyFinalVariable_whenNotEquals_thenCorrect() {
93-
94-
int[] total = new int[1];
95-
Runnable r = () -> total[0]++;
88+
final int[] total = new int[1];
89+
final Runnable r = () -> total[0]++;
9690
r.run();
9791

9892
assertNotEquals(0, total[0]);

‎core-java-8/src/test/java/com/baeldung/java8/Java8SortUnitTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
import java.util.Comparator;
77
import java.util.List;
88

9-
import com.baeldung.java8.entity.Human;
109
import org.junit.Assert;
1110
import org.junit.Test;
1211

12+
import com.baeldung.java8.entity.Human;
1313
import com.google.common.collect.Lists;
1414
import com.google.common.primitives.Ints;
1515

0 commit comments

Comments
 (0)