added differences between file1.json and file2.json

Author: DashProsh

app/src/main/java/hexlet/code/App.java

@@ -15,11 +15,11 @@
 
 class App implements Runnable {
 
-    @Option(names = { "-h", "--help" }, usageHelp = true, description = "Show this help message and exit.")
-    boolean usageHelpRequested;
-
-    @Option(names = { "-V", "--version" }, versionHelp = true, description = "Print version information and exit.")
-    boolean versionInfoRequested;
+//    @Option(names = { "-h", "--help" }, usageHelp = true, description = "Show this help message and exit.")
+//    boolean usageHelpRequested;
+//
+//    @Option(names = { "-V", "--version" }, versionHelp = true, description = "Print version information and exit.")
+//    boolean versionInfoRequested;
 
     @Option(names = { "-f", "--format " }, paramLabel = "format",
             description = "output format [default: stylish]", defaultValue = "stylish")
@@ -35,11 +35,8 @@ class App implements Runnable {
     @Override
     public void run() {
         try {
-            Map<String, Object> data1 = JsonParser.readJsonFile(filepath1);
-            Map<String, Object> data2 = JsonParser.readJsonFile(filepath2);
-
-            System.out.println("Файл 1: " + data1);
-            System.out.println("Файл 2: " + data2);
+            String diff = Differ.generate(filepath1, filepath2);
+            System.out.println(diff);
         } catch (IOException e) {
             System.err.println("Ошибка при чтении файла: " + e.getMessage());
         }
@@ -48,12 +45,4 @@ public void run() {
     public static void main(String[] args) {
         new CommandLine(new App()).execute(args);
     }
-
-    public class JsonParser {
-        public static Map<String, Object> readJsonFile(String filePath) throws IOException {
-            ObjectMapper objectMapper = new ObjectMapper();
-            return objectMapper.readValue(new File("src/main/resources/" + filePath), Map.class);
-        }
-    }
 }
-

app/src/main/java/hexlet/code/Differ.java

@@ -0,0 +1,54 @@
+package hexlet.code;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Map;
+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);
+
+        return generateDiff(fileInfo1, fileInfo2);
+    }
+
+    public static String generateDiff(Map<String, Object> fileInfo1, Map<String, Object> fileInfo2) {
+
+        //разбиваю на значения
+        Set<String> allKeys = new TreeSet<>();
+        allKeys.addAll(fileInfo1.keySet());
+        allKeys.addAll(fileInfo2.keySet());
+
+        // тут буду хранить результат сравнения
+        StringBuilder differences = new StringBuilder("\n" +
+                "{\n");
+
+        //сравниваю по значениям и вывожу обратно ключ-значение
+        for (String key : allKeys) {
+
+            Object value1 = fileInfo1.get(key);
+            Object value2 = fileInfo2.get(key);
+
+            if (value1 != null && value2 != null && value1.equals(value2)) {
+                differences.append("    ").append(key).append(": ").append(value1).append("\n");
+            } else {
+                if (value1 != null) {
+                    differences.append("  - ").append(key).append(": ").append(value1).append("\n");
+                } if (value2 != null) {
+                    differences.append("  + ").append(key).append(": ").append(value2).append("\n");
+                }
+            }
+        }
+
+        differences.append("}\n");
+        return differences.toString();
+    }
+}