Skip to content

Commit f8e68e6

Browse files
grgrzybekgrgrzybek
committed
[build] Fix cs problems
1 parent 45a5656 commit f8e68e6

File tree

2 files changed

+49
-47
lines changed

2 files changed

+49
-47
lines changed

Diff for: ‎etc/fuse-checkstyle.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
<property name="ignorePattern" value="notes\s=" />
128128
</module>
129129
<module name="MethodLength">
130-
<property name="max" value="200" />
130+
<property name="max" value="250" />
131131
<property name="countEmpty" value="false" />
132132
</module>
133133
<module name="ParameterNumber">

Diff for: ‎modules/fuse-patch/patch-management/src/main/java/org/jboss/fuse/patch/management/conflicts/DiffUtils.java

+48-46
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,17 @@
4949
/**
5050
* Helper class to generate diff reports after patching
5151
*/
52-
public class DiffUtils {
52+
public final class DiffUtils {
5353

54-
public static Logger LOG = LoggerFactory.getLogger(DiffUtils.class);
54+
public static final Logger LOG = LoggerFactory.getLogger(DiffUtils.class);
55+
private static final DateFormat DATE = new SimpleDateFormat("yyyy-MM-dd HH:mm");
5556

5657
private static String reportHeader;
5758
private static String reportFooter;
5859
private static String fileHeader1;
5960
private static String fileHeader2;
6061
private static String fileFooter;
6162

62-
private static DateFormat DATE = new SimpleDateFormat("yyyy-MM-dd HH:mm");
63-
6463
static {
6564
try {
6665
reportHeader = IOUtils.toString(DiffUtils.class.getResourceAsStream("/patch-report-header.html"), "UTF-8");
@@ -74,6 +73,9 @@ public class DiffUtils {
7473
}
7574
}
7675

76+
private DiffUtils() {
77+
}
78+
7779
/**
7880
* <p>Having four commits, generate single, HTML report about all modified files</p>
7981
* <p>Please excuse inline html code.</p>
@@ -139,35 +141,35 @@ public static void generateDiffReport(Patch patch, PatchResult patchResult, Git
139141
result.write(reportHeader.replace("@PATCH_ID@", pd.getId()));
140142
PatchReport pr = patchResult.getReport();
141143

142-
result.write("<table class=\"summary\">\n" +
143-
" <tr>\n" +
144-
" <td class=\"f\">Patch ID:</td><td>" + pr.getId() + "</td>\n" +
145-
" </tr>\n" +
146-
" <tr>\n" +
147-
" <td class=\"f\">Patch type:</td><td>" + (pr.isRollup() ? "rollup" : "non-rollup") + "</td>\n" +
148-
" </tr>\n" +
149-
" <tr>\n" +
150-
" <td class=\"f\">Installation date:</td><td>" + DATE.format(pr.getTimestamp()) + "</td>\n" +
151-
" </tr>\n" +
152-
" <tr>\n" +
153-
" <td class=\"f\">Bundles updated</td><td>" + pr.getUpdatedBundles() + "</td>\n" +
154-
" </tr>\n" +
155-
" <tr>\n" +
156-
" <td class=\"f\">Features updated</td><td>" + pr.getUpdatedFeatures() + "</td>\n" +
157-
" </tr>\n" +
158-
" <tr>\n" +
159-
" <td class=\"f\">Features overriden</td><td>" + pr.getOverridenFeatures() + "</td>\n" +
160-
" </tr>\n" +
161-
" <tr>\n" +
162-
" <td class=\"f\">File conflicts</td><td>" + conflicts.size() + "</td>\n" +
163-
" </tr>\n" +
164-
" </table>\n" +
165-
"</div>\n");
144+
result.write("<table class=\"summary\">\n"
145+
+ " <tr>\n"
146+
+ " <td class=\"f\">Patch ID:</td><td>" + pr.getId() + "</td>\n"
147+
+ " </tr>\n"
148+
+ " <tr>\n"
149+
+ " <td class=\"f\">Patch type:</td><td>" + (pr.isRollup() ? "rollup" : "non-rollup") + "</td>\n"
150+
+ " </tr>\n"
151+
+ " <tr>\n"
152+
+ " <td class=\"f\">Installation date:</td><td>" + DATE.format(pr.getTimestamp()) + "</td>\n"
153+
+ " </tr>\n"
154+
+ " <tr>\n"
155+
+ " <td class=\"f\">Bundles updated</td><td>" + pr.getUpdatedBundles() + "</td>\n"
156+
+ " </tr>\n"
157+
+ " <tr>\n"
158+
+ " <td class=\"f\">Features updated</td><td>" + pr.getUpdatedFeatures() + "</td>\n"
159+
+ " </tr>\n"
160+
+ " <tr>\n"
161+
+ " <td class=\"f\">Features overriden</td><td>" + pr.getOverridenFeatures() + "</td>\n"
162+
+ " </tr>\n"
163+
+ " <tr>\n"
164+
+ " <td class=\"f\">File conflicts</td><td>" + conflicts.size() + "</td>\n"
165+
+ " </tr>\n"
166+
+ " </table>\n"
167+
+ "</div>\n");
166168

167169
if (conflicts.size() > 0) {
168-
result.write("<h1 class=\"header\">\n" +
169-
" <div>Conflicting files</div>\n" +
170-
"</h1>\n");
170+
result.write("<h1 class=\"header\">\n"
171+
+ " <div>Conflicting files</div>\n"
172+
+ "</h1>\n");
171173
}
172174

173175
for (Map.Entry<String, DiffEntry[]> e : report.entrySet()) {
@@ -180,40 +182,40 @@ public static void generateDiffReport(Patch patch, PatchResult patchResult, Git
180182
result.write(e.getKey());
181183
result.write(fileHeader2);
182184
// we have max 3 entries (not all entries may be present
183-
result.write("<td class=\"side\">\n" +
184-
" <div class=\"header\">Custom version</div>\n" +
185-
" <div class=\"content" + (e.getValue()[0] != null ? "" : " empty") + "\">");
185+
result.write("<td class=\"side\">\n"
186+
+ " <div class=\"header\">Custom version</div>\n"
187+
+ " <div class=\"content" + (e.getValue()[0] != null ? "" : " empty") + "\">");
186188
if (e.getValue()[0] != null) {
187189
// custom change
188190
diff(git, reader, e.getValue()[0], result);
189191
} else {
190192
result.write("No change");
191193
}
192-
result.write("</div>\n" +
193-
" </td>");
194-
result.write("<td class=\"side\">\n" +
195-
" <div class=\"header\">Patch</div>\n" +
196-
" <div class=\"content" + (e.getValue()[1] != null ? "" : " empty") + "\">");
194+
result.write("</div>\n"
195+
+ " </td>");
196+
result.write("<td class=\"side\">\n"
197+
+ " <div class=\"header\">Patch</div>\n"
198+
+ " <div class=\"content" + (e.getValue()[1] != null ? "" : " empty") + "\">");
197199
if (e.getValue()[1] != null) {
198200
// patch change
199201
diff(git, reader, e.getValue()[1], result);
200202
} else {
201203
result.write("No change");
202204
}
203-
result.write("</div>\n" +
204-
" </td>");
205-
result.write("<td class=\"side\">\n" +
206-
" <div class=\"header\">Final version</div>\n" +
207-
" <div class=\"content" + (e.getValue()[2] != null ? "" : " empty") + "\">");
205+
result.write("</div>\n"
206+
+ " </td>");
207+
result.write("<td class=\"side\">\n"
208+
+ " <div class=\"header\">Final version</div>\n"
209+
+ " <div class=\"content" + (e.getValue()[2] != null ? "" : " empty") + "\">");
208210
if (e.getValue()[2] != null) {
209211
// effective change - should always be available
210212
// or maybe not when both patch and user removed the file?
211213
diff(git, reader, e.getValue()[2], result);
212214
} else {
213215
result.write("No change");
214216
}
215-
result.write("</div>\n" +
216-
" </td>");
217+
result.write("</div>\n"
218+
+ " </td>");
217219
result.write(fileFooter);
218220
}
219221

0 commit comments

Comments
 (0)