Skip to content

Commit

Permalink
Fix ErrorProne warnings.
Browse files Browse the repository at this point in the history
  • Loading branch information
@uhafner
uhafner committed Sep 12, 2024
1 parent 4a755a5 commit 70e89fd
Show file tree
Hide file tree
Showing 37 changed files with 281 additions and 281 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>edu.hm.hafner</groupId>
<artifactId>codingstyle-pom</artifactId>
<version>4.13.0</version>
<version>4.14.0</version>
<relativePath />
</parent>

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/edu/hm/hafner/analysis/Report.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1121,7 +1121,7 @@ private void readIssues(final ObjectInputStream input, final int size) throws IO
var additionalProperties = (Serializable) input.readObject();
var uuid = (UUID) input.readObject();

Issue issue = new Issue(path, fileName,
var issue = new Issue(path, fileName,
lineStart, lineEnd, columnStart, columnEnd,
lineRanges, category, type, packageName, moduleName,
severity, message, description,
Expand Down
14 changes: 7 additions & 7 deletions src/test/java/edu/hm/hafner/analysis/DuplicationGroupTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class DuplicationGroupTest extends SerializableTest<DuplicationGroup> {

@Override
protected DuplicationGroup createSerializable() {
DuplicationGroup group = new DuplicationGroup();
var group = new DuplicationGroup();

try (IssueBuilder builder = new IssueBuilder()) {
group.add(builder.setAdditionalProperties(group).setFileName("1").build());
Expand Down Expand Up @@ -54,15 +54,15 @@ void shouldReadIssueFromOldSerialization() {

@Test
void shouldBeEmptyWhenCreated() {
DuplicationGroup group = new DuplicationGroup();
var group = new DuplicationGroup();

assertThat(group.getCodeFragment()).isEmpty();
assertThat(group.getDuplications()).isEmpty();
}

@Test
void shouldNotOverwriteFragmentOnceItHasBeenSet() {
DuplicationGroup group = new DuplicationGroup();
var group = new DuplicationGroup();

assertThat(group.getCodeFragment()).isEmpty();

Expand All @@ -72,7 +72,7 @@ void shouldNotOverwriteFragmentOnceItHasBeenSet() {
group.setCodeFragment("other");
assertThat(group.getCodeFragment()).isEqualTo(CODE_FRAGMENT);

DuplicationGroup groupWithFragment = new DuplicationGroup(CODE_FRAGMENT);
var groupWithFragment = new DuplicationGroup(CODE_FRAGMENT);
assertThat(groupWithFragment.getCodeFragment()).isEqualTo(CODE_FRAGMENT);

groupWithFragment.setCodeFragment("other");
Expand All @@ -82,7 +82,7 @@ void shouldNotOverwriteFragmentOnceItHasBeenSet() {
@Test
void shouldReferenceAllDuplications() {
try (IssueBuilder builder = new IssueBuilder()) {
DuplicationGroup group = new DuplicationGroup(CODE_FRAGMENT);
var group = new DuplicationGroup(CODE_FRAGMENT);

assertThat(group.getDuplications()).isEmpty();

Expand All @@ -100,9 +100,9 @@ void shouldReferenceAllDuplications() {
@Test
void shouldObeyEqualsContract() {
try (IssueBuilder builder = new IssueBuilder()) {
LineRangeList red = new LineRangeList();
var red = new LineRangeList();
red.add(new LineRange(1));
LineRangeList blue = new LineRangeList();
var blue = new LineRangeList();
blue.add(new LineRange(2));
EqualsVerifier
.forClass(DuplicationGroup.class)
Expand Down
20 changes: 9 additions & 11 deletions src/test/java/edu/hm/hafner/analysis/FileNameResolverTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class FileNameResolverTest {
@ValueSource(strings = {"/does/not/exist", "!<>$&/&(", "\0 Null-Byte", "C:/!<>$&/&( \0", "/!<>$&/&( \0"})
@DisplayName("Should not change path on errors")
void shouldReturnFallbackOnError(final String fileName) {
Report report = createIssuesSingleton(fileName, new IssueBuilder());
var report = createIssuesSingleton(fileName, new IssueBuilder());

resolvePaths(report, RESOURCE_FOLDER_PATH);

Expand All @@ -66,7 +66,7 @@ private void resolvePaths(final Report report, final Path resourceFolderPath,
@Test
@DisplayName("Should skip processing if there are no issues")
void shouldDoNothingIfNoIssuesPresent() {
Report report = new Report();
var report = new Report();

resolvePaths(report, RESOURCE_FOLDER_PATH);

Expand All @@ -77,7 +77,7 @@ void shouldDoNothingIfNoIssuesPresent() {
@Test
@DisplayName("Should set path if the relative file name exists")
void shouldSetPath() {
Report report = new Report();
var report = new Report();

try (IssueBuilder builder = new IssueBuilder()) {
report.add(builder.setFileName(RELATIVE_FILE).build());
Expand All @@ -98,7 +98,7 @@ void shouldSetPath() {
@Test
@DisplayName("Should not set path if the relative file name doe not exist")
void shouldNotSetPath() {
Report report = new Report();
var report = new Report();

try (IssueBuilder builder = new IssueBuilder()) {
report.add(builder.setFileName("not here").build());
Expand All @@ -119,7 +119,7 @@ void shouldNotSetPath() {
@Test
@DisplayName("Should skip existing absolute paths")
void shouldNotTouchAbsolutePathOrEmptyPath() {
Report report = new Report();
var report = new Report();

try (IssueBuilder builder = new IssueBuilder()) {
report.add(builder.setFileName("").build());
Expand Down Expand Up @@ -170,8 +170,7 @@ void shouldNotTouchAbsolutePathOrEmptyPath() {
@DisplayName("Should normalize different relative paths to the same file (file name is relative)")
void shouldResolveRelativePath(final String fileName) {
try (IssueBuilder builder = new IssueBuilder()) {
Report report;
report = createIssuesSingleton(fileName, builder.setOrigin(ID));
var report = createIssuesSingleton(fileName, builder.setOrigin(ID));
resolvePaths(report, RESOURCE_FOLDER_PATH);

assertThatFileResolvesToRelativeFile(report, fileName);
Expand All @@ -183,12 +182,11 @@ void shouldResolveRelativePath(final String fileName) {
@DisplayName("Should normalize different relative paths to the same file (file name is absolute)")
void shouldNormalizePaths(final String fileName) {
try (IssueBuilder issueBuilder = new IssueBuilder()) {
Report report = new Report();
Issue issue;
issue = issueBuilder
Issue issue = issueBuilder
.setDirectory(RESOURCE_FOLDER_STRING)
.setFileName(normalize(fileName))
.build();
var report = new Report();
report.add(issue);

resolvePaths(report, Paths.get(RESOURCE_FOLDER));
Expand Down Expand Up @@ -252,7 +250,7 @@ private static boolean isWindows() {
}

private Report createIssuesSingleton(final String fileName, final IssueBuilder issueBuilder) {
Report report = new Report();
var report = new Report();
Issue issue = issueBuilder.setFileName(fileName).build();
report.add(issue);
return report;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/edu/hm/hafner/analysis/FileReaderFactoryTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class FileReaderFactoryTest extends ResourceTest {

@Test
void shouldRemoveColorCodesAfterAllLineMappers() {
ConsoleLogReaderFactory factory = new ConsoleLogReaderFactory(
var factory = new ConsoleLogReaderFactory(
getResourceAsFile("ath-colored.log"));

assertThat(factory.readString()).isEqualTo("[WARNING]\n"
Expand Down
7 changes: 4 additions & 3 deletions src/test/java/edu/hm/hafner/analysis/FingerprintGeneratorBenchmark.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class FingerprintGeneratorBenchmark extends AbstractBenchmark {
*/
@Benchmark
public void benchmarkingOneIssue(final BenchmarkState state) {
FingerprintGenerator generator = new FingerprintGenerator();
var generator = new FingerprintGenerator();

generator.run(state.getFullTextFingerprint(), state.getSingleIssueReport(), CHARSET_AFFECTED_FILE);
}
Expand All @@ -41,7 +41,7 @@ public void benchmarkingOneIssue(final BenchmarkState state) {
*/
@Benchmark
public void benchmarkingMultipleIssues(final BenchmarkState state) {
FingerprintGenerator generator = new FingerprintGenerator();
var generator = new FingerprintGenerator();

generator.run(new FullTextFingerprint(), state.getMultipleIssuesReport(), CHARSET_AFFECTED_FILE);
}
Expand All @@ -57,6 +57,7 @@ public static class BenchmarkState {
private Report singleIssueReport = new Report();
private FullTextFingerprint fingerprint = new FullTextFingerprint();
private Report multipleIssuesReport = new Report();
@SuppressWarnings("NullAway")
private Random random;

public Report getSingleIssueReport() {
Expand Down Expand Up @@ -87,7 +88,7 @@ public void doSetup() {

@SuppressFBWarnings("PREDICTABLE_RANDOM")
private Report createMultipleIssues(final int number) {
Report report = new Report();
var report = new Report();
try (IssueBuilder builder = new IssueBuilder()) {
builder.setFileName(AFFECTED_FILE_NAME);
for (int i = 0; i < number; i++) {
Expand Down
37 changes: 18 additions & 19 deletions src/test/java/edu/hm/hafner/analysis/FingerprintGeneratorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class FingerprintGeneratorTest extends ResourceTest {

@Test
void shouldSkipFingerprintingIfEncodingIsWrong() throws IOException {
FingerprintGenerator generator = new FingerprintGenerator();
var generator = new FingerprintGenerator();

Report report;
try (IssueBuilder issueBuilder = new IssueBuilder()) {
Expand All @@ -50,7 +50,7 @@ void shouldSkipFingerprintingIfEncodingIsWrong() throws IOException {
@Test
void shouldNotChangeIssuesWithFingerPrint() {
try (IssueBuilder issueBuilder = new IssueBuilder()) {
FingerprintGenerator generator = new FingerprintGenerator();
var generator = new FingerprintGenerator();

issueBuilder.setFileName(AFFECTED_FILE_NAME);
Report report = createIssues();
Expand All @@ -70,9 +70,9 @@ void shouldNotChangeIssuesWithFingerPrint() {
@Test
void shouldSetDefaultFingerprintIfNoFileIsGiven() {
try (IssueBuilder issueBuilder = new IssueBuilder()) {
FingerprintGenerator generator = new FingerprintGenerator();
var generator = new FingerprintGenerator();

Report report = new Report();
var report = new Report();
report.add(issueBuilder.build());

generator.run(new FullTextFingerprint(), report, CHARSET_AFFECTED_FILE);
Expand All @@ -84,14 +84,14 @@ void shouldSetDefaultFingerprintIfNoFileIsGiven() {

@Test
void shouldAssignIdenticalFingerprint() {
Report report = createTwoIssues();
FingerprintGenerator generator = new FingerprintGenerator();
FullTextFingerprint fingerprint = createFullTextFingerprint("fingerprint-one.txt");
var report = createTwoIssues();
var generator = new FingerprintGenerator();
var fingerprint = createFullTextFingerprint("fingerprint-one.txt");

generator.run(fingerprint, report, CHARSET_AFFECTED_FILE);

Issue referenceIssue = report.get(0);
Issue currentIssue = report.get(1);
var referenceIssue = report.get(0);
var currentIssue = report.get(1);

assertThat(referenceIssue).isNotEqualTo(currentIssue);
assertThat(referenceIssue.getFingerprint()).isEqualTo(currentIssue.getFingerprint());
Expand All @@ -105,7 +105,7 @@ void shouldAssignIdenticalFingerprint() {
@SuppressWarnings("MustBeClosedChecker")
private FileSystem stubFileSystem(final String firstFile, final String secondFile) {
try {
FileSystem fileSystem = mock(FileSystem.class);
var fileSystem = mock(FileSystem.class);
when(fileSystem.readLinesFromFile(anyString(), any()))
.thenReturn(asStream(firstFile)).thenReturn(asStream(secondFile));
return fileSystem;
Expand All @@ -117,9 +117,9 @@ private FileSystem stubFileSystem(final String firstFile, final String secondFil

@Test
void shouldAssignDifferentFingerprint() {
Report report = createTwoIssues();
FingerprintGenerator generator = new FingerprintGenerator();
FullTextFingerprint fingerprint = createFullTextFingerprint("fingerprint-two.txt");
var report = createTwoIssues();
var generator = new FingerprintGenerator();
var fingerprint = createFullTextFingerprint("fingerprint-two.txt");

generator.run(fingerprint, report, CHARSET_AFFECTED_FILE);

Expand All @@ -135,7 +135,7 @@ void shouldAssignDifferentFingerprint() {
void shouldUseFallbackFingerprintOnError(final String fileName) {
var report = createReportWithOneIssueFor(fileName);

FingerprintGenerator generator = new FingerprintGenerator();
var generator = new FingerprintGenerator();
generator.run(new FullTextFingerprint(), report, CHARSET_AFFECTED_FILE);

assertThatIssueHasDefaultFingerprint(report);
Expand All @@ -148,7 +148,7 @@ void shouldUseFallbackFingerprintOnError(final String fileName) {
void shouldUseFallbackFingerprintOnNonSourceFiles(final String fileName) {
var report = createReportWithOneIssueFor(fileName);

FingerprintGenerator generator = new FingerprintGenerator();
var generator = new FingerprintGenerator();
generator.run(createFullTextFingerprint("fingerprint-two.txt"),
report, CHARSET_AFFECTED_FILE);

Expand All @@ -162,20 +162,19 @@ void shouldUseFallbackFingerprintOnIllegalFilenamesOnWindows(final String fileNa

var report = createReportWithOneIssueFor(fileName);

FingerprintGenerator generator = new FingerprintGenerator();
var generator = new FingerprintGenerator();
generator.run(createFullTextFingerprint("fingerprint-two.txt"),
report, CHARSET_AFFECTED_FILE);

assertThatIssueHasDefaultFingerprint(report);
}

private Report createReportWithOneIssueFor(final String fileName) {
Report report;
try (IssueBuilder issueBuilder = new IssueBuilder()) {
report = new Report();
var report = new Report();
report.add(issueBuilder.setFileName(fileName).build());
return report;
}
return report;
}

private void assertThatIssueHasDefaultFingerprint(final Report report) {
Expand Down
14 changes: 7 additions & 7 deletions src/test/java/edu/hm/hafner/analysis/FullTextFingerprintTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ class FullTextFingerprintTest extends ResourceTest {
*/
@Test
void shouldExtractCorrectLines() {
String affectedFile = new String(readAllBytes("context.txt"), StandardCharsets.UTF_8);
var affectedFile = new String(readAllBytes("context.txt"), StandardCharsets.UTF_8);

FullTextFingerprint fingerprint = new FullTextFingerprint();
var fingerprint = new FullTextFingerprint();

assertThat(fingerprint.extractContext(-1, asIterator(affectedFile)))
.as("Fingerprint for illegal line numbers should be empty").isEmpty();
Expand All @@ -44,7 +44,7 @@ void shouldExtractCorrectLines() {
assertThat(fingerprint.extractContext(29, asIterator(affectedFile))).isEqualTo("67890");
assertThat(fingerprint.extractContext(30, asIterator(affectedFile))).isEqualTo("7890");

// actually illegal but we use the remaining lines:
// actually illegal, but we use the remaining lines:
assertThat(fingerprint.extractContext(31, asIterator(affectedFile))).isEqualTo("890");
assertThat(fingerprint.extractContext(32, asIterator(affectedFile))).isEqualTo("90");
assertThat(fingerprint.extractContext(33, asIterator(affectedFile))).isEqualTo("0");
Expand All @@ -59,11 +59,11 @@ void shouldExtractCorrectLines() {
*/
@Test
void shouldAssignIdenticalFingerprints() {
String affectedFile = new String(readAllBytes("context.txt"), StandardCharsets.UTF_8);
var affectedFile = new String(readAllBytes("context.txt"), StandardCharsets.UTF_8);

FullTextFingerprint code = new FullTextFingerprint();
var code = new FullTextFingerprint();

String fingerprint = code.createFingerprint(10, getTextLinesAsStream(affectedFile), StandardCharsets.UTF_8);
var fingerprint = code.createFingerprint(10, getTextLinesAsStream(affectedFile), StandardCharsets.UTF_8);
assertThat(fingerprint).isEqualTo("C10CFE4EC75F0C7F54980D432624D1C9");

for (int line = 0; line < 34; line++) {
Expand All @@ -80,7 +80,7 @@ void shouldAssignIdenticalFingerprints() {

@Test
void shouldThrowNoSuchFileExceptionIfFileDoesNotExist() {
FullTextFingerprint fingerprint = new FullTextFingerprint();
var fingerprint = new FullTextFingerprint();

assertThatExceptionOfType(NoSuchFileException.class)
.isThrownBy(() -> fingerprint.compute("/does/not/exist", 1, StandardCharsets.UTF_8));
Expand Down
Loading

0 comments on commit 70e89fd

Please sign in to comment.