Resolve merge conflicts3

Author: DashProsh

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

@@ -52,51 +52,3 @@ public static Map<String, Object> parse(String filePath) throws IOException {
         return objectMapper.readValue(new File(filePath), new TypeReference<Map<String, Object>>() { });
     }
 }
-
-
-
-
-
-//package hexlet.code;
-//
-//import com.fasterxml.jackson.core.type.TypeReference;
-//import com.fasterxml.jackson.databind.ObjectMapper;
-//import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
-//
-//import java.io.File;
-//import java.io.IOException;
-//import java.net.URISyntaxException;
-//import java.nio.file.Path;
-//import java.nio.file.Paths;
-//import java.util.Map;
-//import java.util.Objects;
-//
-//public class Parser {
-//
-//    public static Map<String, Object> parse(String filePath) throws IOException {
-//        ObjectMapper objectMapper;
-//
-//        if (filePath.endsWith(".json")) {
-//            objectMapper = new ObjectMapper();
-//        } else if (filePath.endsWith(".yaml") || filePath.endsWith(".yml")) {
-//            objectMapper = new ObjectMapper(new YAMLFactory()); // Используем YAML парсер
-//        } else {
-//            throw new IllegalArgumentException("Unsupported file format: " + filePath);
-//        }
-//
-//        Path path;
-//        try {
-//            path = Paths.get(Objects.requireNonNull(
-//                    Parser.class.getClassLoader().getResource("fixtures/" + filePath)).toURI());
-//        } catch (URISyntaxException e) {
-//            throw new RuntimeException("Invalid file path: " + filePath, e);
-//        }
-//
-//        return objectMapper.readValue(path.toFile(), new TypeReference<Map<String, Object>>() {});
-//    }
-//}
-
-
-
-// return objectMapper.readValue(new File("src/main/resources/fixtures/" + filePath),
-//                new TypeReference<Map<String, Object>>() { });

app/src/test/java/hexlet/code/DifferTest.java

@@ -134,7 +134,7 @@ void testGenerateDiffForJsonStylish() throws IOException {
         var data2 = Parser.parseFromResources("file2.json");
         var diff = Differ.calculateDiff(data1, data2);
         var actual = Formatter.format(diff, "stylish");
-        assertEquals(EXPECTED_JSON_STYLISH.trim(), actual.strip());
+        assertEquals(EXPECTED_JSON_STYLISH.strip(), actual.strip());
         System.out.println("ВСЕ РАБОТАЕТ!!!");
     }
 
@@ -144,7 +144,7 @@ void testGenerateDiffForJsonPlain() throws IOException {
         var data2 = Parser.parseFromResources("file2.yml");
         var diff = Differ.calculateDiff(data1, data2);
         var actual = Formatter.format(diff, "plain");
-        assertEquals(EXPECTED_DIFF_PLAIN.trim(), actual.strip());
+        assertEquals(EXPECTED_DIFF_PLAIN.strip(), actual.strip());
         System.out.println("ВСЕ РАБОТАЕТ! лала!!!");
     }
 
@@ -155,7 +155,7 @@ void testGenerateDiffForJsonJson() throws IOException {
         var data2 = Parser.parseFromResources("file2.json");
         var diff = Differ.calculateDiff(data1, data2);
         var actual = Formatter.format(diff, "json");
-        assertEquals(EXPECTED_JSON.trim(), actual.strip());
+        assertEquals(EXPECTED_JSON.strip(), actual.strip());
         System.out.println("ВСЕ РАБОТАЕТ! дада!!!");
     }
 }