Refactor some codes

Author: YongGoose

lib-extra/src/main/java/com/diffplug/spotless/extra/middleware/ReviewDogGenerator.java

@@ -26,6 +26,8 @@
  */
 public final class ReviewDogGenerator {
 
+	private static final String SOURCE = "spotless";
+
 	private ReviewDogGenerator() {
 		// Prevent instantiation
 	}
@@ -34,8 +36,8 @@ private ReviewDogGenerator() {
 	 * Generates a ReviewDog compatible JSON line (rdjsonl) for a diff between
 	 * the actual content and the formatted content of a file.
 	 *
-	 * @param path The file path
-	 * @param actualContent The content as it currently exists in the file
+	 * @param path             The file path
+	 * @param actualContent    The content as it currently exists in the file
 	 * @param formattedContent The content after formatting is applied
 	 * @return A string in rdjsonl format representing the diff
 	 */
@@ -56,14 +58,12 @@ public static String rdjsonlDiff(String path, String actualContent, String forma
 	 * Generates ReviewDog compatible JSON lines (rdjsonl) for lint issues
 	 * identified by formatting steps.
 	 *
-	 * @param path The file path
-	 * @param formattedContent The content after formatting is applied
-	 * @param steps The list of formatter steps applied
-	 * @param lintsPerStep The list of lints produced by each step
+	 * @param path             The file path
+	 * @param steps            The list of formatter steps applied
+	 * @param lintsPerStep     The list of lints produced by each step
 	 * @return A string in rdjsonl format representing the lints
 	 */
-	public static String rdjsonlLints(String path, String formattedContent,
-			List<FormatterStep> steps, List<List<Lint>> lintsPerStep) {
+	public static String rdjsonlLints(String path, List<FormatterStep> steps, List<List<Lint>> lintsPerStep) {
 		if (lintsPerStep == null || lintsPerStep.isEmpty()) {
 			return "";
 		}
@@ -111,13 +111,23 @@ private static String createUnifiedDiff(String path, String actualContent, Strin
 	/**
 	 * Formats a single lint issue as a JSON line.
 	 */
-	private static String formatLintAsJson(String path, Lint lint, String stepName) {
+	private static String formatLintAsJson(String path, Lint lint, String ruleCode) {
 		return String.format(
-				"{\"message\":{\"path\":\"%s\",\"line\":%d,\"column\":1,\"message\":\"%s: %s\"}}",
+				"{"
+						+ "\"source\":\"%s\","
+						+ "\"code\":\"%s\","
+						+ "\"level\":\"warning\","
+						+ "\"message\":\"%s\","
+						+ "\"path\":\"%s\","
+						+ "\"line\":%d,"
+						+ "\"column\":%d"
+						+ "}",
+				escapeJson(SOURCE),
+				escapeJson(ruleCode),
+				escapeJson(lint.getDetail()),
 				escapeJson(path),
 				lint.getLineStart(),
-				escapeJson(lint.getShortCode()),
-				escapeJson(lint.getDetail()));
+				1);
 	}
 
 	/**

lib-extra/src/test/java/com/diffplug/spotless/extra/middleware/ReviewDogGeneratorTest.java

@@ -66,7 +66,7 @@ public void lintsEmpty() {
 		List<FormatterStep> steps = new ArrayList<>();
 		List<List<Lint>> lintsPerStep = new ArrayList<>();
 
-		String result = ReviewDogGenerator.rdjsonlLints("test.txt", "content", steps, lintsPerStep);
+		String result = ReviewDogGenerator.rdjsonlLints("test.txt", steps, lintsPerStep);
 		assertEquals("", result);
 	}
 
@@ -81,12 +81,13 @@ public void lintsSingleIssue() {
 		Lint lint = Lint.atLine(1, "TEST001", "Test lint message");
 		List<List<Lint>> lintsPerStep = Collections.singletonList(Collections.singletonList(lint));
 
-		String result = ReviewDogGenerator.rdjsonlLints("src/main.java", "content", steps, lintsPerStep);
+		String result = ReviewDogGenerator.rdjsonlLints("src/main.java", steps, lintsPerStep);
 
 		assertNotNull(result);
 		assertTrue(result.contains("\"path\":\"src/main.java\""));
 		assertTrue(result.contains("\"line\":1"));
-		assertTrue(result.contains("TEST001: Test lint message"));
+		assertTrue(result.contains("\"message\":\"Test lint message\""));
+		assertTrue(result.contains("\"code\":\"testStep\""));
 	}
 
 	@Test
@@ -120,13 +121,13 @@ public void close() {}
 				Collections.singletonList(lint1),
 				Collections.singletonList(lint2));
 
-		String result = ReviewDogGenerator.rdjsonlLints("src/main.java", "content", steps, lintsPerStep);
+		String result = ReviewDogGenerator.rdjsonlLints("src/main.java", steps, lintsPerStep);
 
 		assertNotNull(result);
-		assertTrue(result.contains("RULE1"));
-		assertTrue(result.contains("RULE2"));
-		assertTrue(result.contains("First issue"));
-		assertTrue(result.contains("Second issue"));
+		assertTrue(result.contains("\"code\":\"step1\""));
+		assertTrue(result.contains("\"code\":\"step2\""));
+		assertTrue(result.contains("\"message\":\"First issue\""));
+		assertTrue(result.contains("\"message\":\"Second issue\""));
 
 		String[] lines = result.split("\n");
 		assertEquals(2, lines.length);