added badges

Author: DashProsh

.github/workflows/checkstyle.yml

@@ -0,0 +1,29 @@
+name: Checkstyle
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  checkstyle:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
+      - name: Set up Gradle
+        uses: gradle/gradle-build-action@v2
+
+      - name: Run Checkstyle
+        run: ./gradlew checkstyleMain checkstyleTest

.github/workflows/codeclimate.yml

@@ -0,0 +1,34 @@
+name: CodeClimate
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  codeclimate:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
+      - name: Install CodeClimate Test Reporter
+        run: curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter && chmod +x ./cc-test-reporter
+
+      - name: Run Checkstyle and report to CodeClimate
+        env:
+          CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
+        run: |
+          ./gradlew checkstyleMain checkstyleTest
+          ./cc-test-reporter format-coverage build/reports/checkstyle/main.xml --input-type checkstyle
+          ./cc-test-reporter upload-coverage

.idea/gradle.xml

@@ -1,2 +1,5 @@
 ### Hexlet tests and linter status:
-[![Actions Status](https://github.com/DashProsh/java-project-71/actions/workflows/hexlet-check.yml/badge.svg)](https://github.com/DashProsh/java-project-71/actions)
+[![Actions Status](https://github.com/DashProsh/java-project-71/actions/workflows/hexlet-check.yml/badge.svg)](https://github.com/DashProsh/java-project-71/actions)
+[![Maintainability](https://api.codeclimate.com/v1/badges/0b1e0037af9861a38f11/maintainability)](https://codeclimate.com/github/DashProsh/java-project-71/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/0b1e0037af9861a38f11/test_coverage)](https://codeclimate.com/github/DashProsh/java-project-71/test_coverage)
+

.idea/java-project-71.iml

@@ -36,6 +36,13 @@ tasks.test {
     }
 }
 
+checkstyle {
+    toolVersion = "10.12.1" // Убедись, что используешь актуальную версию
+    configFile = file("${rootProject.projectDir}/config/checkstyle/checkstyle.xml")
+    isIgnoreFailures = false // Если true, ошибки не будут прерывать билд
+    isShowViolations = true // Показывает найденные проблемы
+}
+
 tasks.jacocoTestReport {
     reports {
         xml.required.set(true)

.idea/misc.xml

@@ -4,11 +4,7 @@
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import java.io.File;
 import java.io.IOException;
-import java.util.Map;
-
 
 @Command(name = "gendiff", mixinStandardHelpOptions = true, version = "gendiff 1.1.1",
         description = "Compares two configuration files and shows a difference.")

README.md

@@ -1,5 +1,6 @@
 package hexlet.code;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import java.io.File;
@@ -8,14 +9,19 @@
 import java.util.Set;
 import java.util.TreeSet;
 
+
+
 public class Differ {
 
     public static String generate(String filePath1, String filePath2) throws IOException {
         ObjectMapper objectMapper = new ObjectMapper();
 
         // Читаю JSON и складываю в Map
-        Map<String, Object> fileInfo1 = objectMapper.readValue(new File("src/main/resources/" + filePath1), Map.class);
-        Map<String, Object> fileInfo2 = objectMapper.readValue(new File("src/main/resources/" + filePath2), Map.class);
+
+        Map<String, Object> fileInfo1 = objectMapper.readValue(new File("src/main/resources/" + filePath1),
+                new TypeReference<Map<String, Object>>() { });
+        Map<String, Object> fileInfo2 = objectMapper.readValue(new File("src/main/resources/" + filePath2),
+                new TypeReference<Map<String, Object>>() { });
 
         return generateDiff(fileInfo1, fileInfo2);
     }
@@ -28,8 +34,8 @@ public static String generateDiff(Map<String, Object> fileInfo1, Map<String, Obj
         allKeys.addAll(fileInfo2.keySet());
 
         // тут буду хранить результат сравнения
-        StringBuilder differences = new StringBuilder("\n" +
-                "{\n");
+        StringBuilder differences = new StringBuilder("\n"
+                + "{\n");
 
         //сравниваю по значениям и вывожу обратно ключ-значение
         for (String key : allKeys) {
@@ -42,7 +48,8 @@ public static String generateDiff(Map<String, Object> fileInfo1, Map<String, Obj
             } else {
                 if (value1 != null) {
                     differences.append("  - ").append(key).append(": ").append(value1).append("\n");
-                } if (value2 != null) {
+                }
+                if (value2 != null) {
                     differences.append("  + ").append(key).append(": ").append(value2).append("\n");
                 }
             }

app/build.gradle.kts

@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+        "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+        "https://checkstyle.sourceforge.io/dtds/configuration_1_3.dtd">
+<module name="Checker">
+    <module name="TreeWalker">
+        <module name="WhitespaceAfter"/>
+        <module name="FinalLocalVariable"/>
+        <module name="AvoidStarImport"/>
+        <module name="UnusedImports"/>
+        <module name="JavadocMethod"/>
+    </module>
+</module>