Skip to content

Commit b2ef08b

Browse files
committed
auto-reformat
1 parent aa49eb2 commit b2ef08b

File tree

6 files changed

+35
-53
lines changed

6 files changed

+35
-53
lines changed

refactor-first-maven-plugin/src/main/java/org/hjug/mavenreport/RefactorFirstJsonReport/JsonReport.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.hjug.mavenreport.RefactorFirstJsonReport;
22

33
import java.util.List;
4-
54
import lombok.Builder;
65
import lombok.Data;
76

refactor-first-maven-plugin/src/main/java/org/hjug/mavenreport/RefactorFirstJsonReport/JsonReportDisharmonyEntry.java

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,14 @@
44
import java.time.format.DateTimeFormatter;
55
import java.time.format.FormatStyle;
66
import java.util.Locale;
7-
87
import lombok.Builder;
98
import lombok.Data;
109
import org.hjug.cbc.RankedDisharmony;
1110

1211
@Data
1312
@Builder
1413
class JsonReportDisharmonyEntry {
15-
private static final DateTimeFormatter formatter =
16-
DateTimeFormatter.ofLocalizedDateTime(FormatStyle.SHORT)
14+
private static final DateTimeFormatter formatter = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.SHORT)
1715
.withLocale(Locale.getDefault())
1816
.withZone(ZoneId.systemDefault());
1917

@@ -33,13 +31,13 @@ class JsonReportDisharmonyEntry {
3331

3432
public static JsonReportDisharmonyEntry fromRankedDisharmony(RankedDisharmony entry) {
3533
return JsonReportDisharmonyEntry.builder()
36-
.className(entry.getClassName())
37-
.effortRank(entry.getEffortRank())
38-
.changePronenessRank(entry.getChangePronenessRank())
39-
.priority(entry.getPriority())
40-
.weightedMethodCount(entry.getWmc())
41-
.commitCount(entry.getCommitCount())
42-
.mostRecentCommitTime(formatter.format(entry.getMostRecentCommitTime()))
43-
.build();
34+
.className(entry.getClassName())
35+
.effortRank(entry.getEffortRank())
36+
.changePronenessRank(entry.getChangePronenessRank())
37+
.priority(entry.getPriority())
38+
.weightedMethodCount(entry.getWmc())
39+
.commitCount(entry.getCommitCount())
40+
.mostRecentCommitTime(formatter.format(entry.getMostRecentCommitTime()))
41+
.build();
4442
}
4543
}

refactor-first-maven-plugin/src/main/java/org/hjug/mavenreport/RefactorFirstJsonReport/RefactorFirstMavenJsonReport.java

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package org.hjug.mavenreport.RefactorFirstJsonReport;
22

3+
import static org.hjug.mavenreport.ReportWriter.writeReportToDisk;
4+
5+
import com.fasterxml.jackson.core.JsonProcessingException;
6+
import com.fasterxml.jackson.databind.ObjectMapper;
37
import java.util.ArrayList;
48
import java.util.Collections;
59
import java.util.List;
610
import java.util.stream.Collectors;
7-
8-
import com.fasterxml.jackson.core.JsonProcessingException;
9-
import com.fasterxml.jackson.databind.ObjectMapper;
1011
import lombok.extern.slf4j.Slf4j;
1112
import org.apache.maven.plugin.AbstractMojo;
1213
import org.apache.maven.plugins.annotations.LifecyclePhase;
@@ -17,17 +18,14 @@
1718
import org.hjug.cbc.CostBenefitCalculator;
1819
import org.hjug.cbc.RankedDisharmony;
1920

20-
import static org.hjug.mavenreport.ReportWriter.writeReportToDisk;
21-
2221
@Slf4j
2322
@Mojo(
24-
name = "jsonreport",
25-
defaultPhase = LifecyclePhase.SITE,
26-
requiresDependencyResolution = ResolutionScope.RUNTIME,
27-
requiresProject = true,
28-
threadSafe = true,
29-
inheritByDefault = false
30-
)
23+
name = "jsonreport",
24+
defaultPhase = LifecyclePhase.SITE,
25+
requiresDependencyResolution = ResolutionScope.RUNTIME,
26+
requiresProject = true,
27+
threadSafe = true,
28+
inheritByDefault = false)
3129
public class RefactorFirstMavenJsonReport extends AbstractMojo {
3230
private static final String FILE_NAME = "refactor-first-data.json";
3331

@@ -42,28 +40,25 @@ public void execute() {
4240

4341
final CostBenefitCalculator costBenefitCalculator = new CostBenefitCalculator();
4442
final List<RankedDisharmony> rankedDisharmonies =
45-
costBenefitCalculator.calculateCostBenefitValues(projectBaseDir);
43+
costBenefitCalculator.calculateCostBenefitValues(projectBaseDir);
4644
final List<JsonReportDisharmonyEntry> disharmonyEntries = rankedDisharmonies.stream()
47-
.map(JsonReportDisharmonyEntry::fromRankedDisharmony)
48-
.collect(Collectors.toList());
45+
.map(JsonReportDisharmonyEntry::fromRankedDisharmony)
46+
.collect(Collectors.toList());
4947

50-
final JsonReport report = JsonReport
51-
.builder()
52-
.rankedDisharmonies(disharmonyEntries)
53-
.build();
48+
final JsonReport report =
49+
JsonReport.builder().rankedDisharmonies(disharmonyEntries).build();
5450

5551
try {
5652
final String reportJson = MAPPER.writeValueAsString(report);
5753

5854
writeReportToDisk(project, FILE_NAME, new StringBuilder(reportJson));
59-
}
60-
catch (final JsonProcessingException jsonProcessingException) {
55+
} catch (final JsonProcessingException jsonProcessingException) {
6156
final String errorMessage = "Could not generate a json report: " + jsonProcessingException;
6257

6358
log.error(errorMessage);
6459
final JsonReport errorReport = JsonReport.builder()
65-
.errors(new ArrayList<>(Collections.singletonList(errorMessage)))
66-
.build();
60+
.errors(new ArrayList<>(Collections.singletonList(errorMessage)))
61+
.build();
6762

6863
writeErrorReport(errorReport);
6964
}
@@ -72,8 +67,7 @@ public void execute() {
7267
private void writeErrorReport(final JsonReport errorReport) {
7368
try {
7469
writeReportToDisk(project, FILE_NAME, new StringBuilder(MAPPER.writeValueAsString(errorReport)));
75-
}
76-
catch (final JsonProcessingException jsonProcessingException) {
70+
} catch (final JsonProcessingException jsonProcessingException) {
7771
log.error("failed to write error report: ", jsonProcessingException);
7872
}
7973
}

refactor-first-maven-plugin/src/main/java/org/hjug/mavenreport/RefactorFirstMavenCsvReport.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package org.hjug.mavenreport;
22

3-
import java.io.BufferedWriter;
3+
import static org.hjug.mavenreport.ReportWriter.writeReportToDisk;
4+
45
import java.io.File;
5-
import java.io.FileWriter;
6-
import java.io.IOException;
76
import java.time.Instant;
87
import java.time.ZoneId;
98
import java.time.format.DateTimeFormatter;
@@ -22,8 +21,6 @@
2221
import org.hjug.cbc.RankedDisharmony;
2322
import org.hjug.git.GitLogReader;
2423

25-
import static org.hjug.mavenreport.ReportWriter.writeReportToDisk;
26-
2724
@Slf4j
2825
@Mojo(
2926
name = "csvreport",

refactor-first-maven-plugin/src/main/java/org/hjug/mavenreport/RefactorFirstMavenReport.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.hjug.mavenreport;
22

3+
import static org.hjug.mavenreport.ReportWriter.writeReportToDisk;
4+
35
import java.io.BufferedWriter;
46
import java.io.File;
57
import java.io.FileWriter;
@@ -24,8 +26,6 @@
2426
import org.hjug.gdg.GraphDataGenerator;
2527
import org.hjug.git.GitLogReader;
2628

27-
import static org.hjug.mavenreport.ReportWriter.writeReportToDisk;
28-
2929
@Slf4j
3030
@Mojo(
3131
name = "report",

refactor-first-maven-plugin/src/main/java/org/hjug/mavenreport/ReportWriter.java

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,13 @@
55
import java.io.IOException;
66
import java.nio.charset.Charset;
77
import java.nio.file.Files;
8-
98
import lombok.extern.slf4j.Slf4j;
109
import org.apache.maven.project.MavenProject;
1110

1211
@Slf4j
1312
public class ReportWriter {
1413
public static void writeReportToDisk(
15-
final MavenProject project,
16-
final String filename,
17-
final StringBuilder stringBuilder
18-
) {
14+
final MavenProject project, final String filename, final StringBuilder stringBuilder) {
1915
final String reportOutputDirectory = project.getModel().getReporting().getOutputDirectory();
2016
final File reportOutputDir = new File(reportOutputDirectory);
2117

@@ -29,15 +25,13 @@ public static void writeReportToDisk(
2925

3026
try {
3127
reportFile.createNewFile();
32-
}
33-
catch (IOException e) {
28+
} catch (IOException e) {
3429
log.error("Failure creating chart script file", e);
3530
}
3631

3732
try (BufferedWriter writer = Files.newBufferedWriter(reportFile.toPath(), Charset.defaultCharset())) {
3833
writer.write(stringBuilder.toString());
39-
}
40-
catch (IOException e) {
34+
} catch (IOException e) {
4135
log.error("Error writing chart script file", e);
4236
}
4337

0 commit comments

Comments
 (0)