bugfix checkstyle

Author: AlexSorb

app/Makefile

@@ -19,7 +19,14 @@ run-dist: build install
 run-help: build install
 	./build/install/app/bin/app -h
 
-run-json: build install
+run-stylish: build install
 	./build/install/app/bin/app -f=stylish ./src/main/java/resources/json/FirstJsonFile.json ./src/main/java/resources/json/SecondJsonFile.json
 
+run-plain: build install
+	./build/install/app/bin/app -f=plain ./src/main/java/resources/json/FirstJsonFile.json ./src/main/java/resources/json/SecondJsonFile.json
+
+run-json: build install
+	./build/install/app/bin/app -f=json ./src/main/java/resources/json/FirstJsonFile.json ./src/main/java/resources/json/SecondJsonFile.json
+
+
 .PHONY: build

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

@@ -11,7 +11,7 @@
 
 
 public class Differ {
-    public final static String DEFAULT_FORMAT = "stylish";
+    public static final String DEFAULT_FORMAT = "stylish";
 
     public static String generate(String filePath1, String filePath2, String format) throws IOException {
         var normalizedPath1 = FileManager.normaolizePath(Path.of(filePath1));

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

@@ -14,23 +14,23 @@ public class TreeBuilder {
     public static final String UNCHANGED = "UNCHANGED";
 
     public static Map<String, List<Object>> getTreeDifference(Map<String, Object> firstDataMap,
-                                                              Map<String, Object> SecondDataMap) {
+                                                              Map<String, Object> secondDataMap) {
 
         Map<String, List<Object>> result = new TreeMap<>();
         Set<String> keySet = new TreeSet<>(firstDataMap.keySet());
-        keySet.addAll(SecondDataMap.keySet());
+        keySet.addAll(secondDataMap.keySet());
 
         keySet.forEach(key -> {
             String stage;
             var dataFirstValue = firstDataMap.get(key) == null ? "null" : firstDataMap.get(key);
-            var dataSecondValue = SecondDataMap.get(key) == null ? "null" : SecondDataMap.get(key);
+            var dataSecondValue = secondDataMap.get(key) == null ? "null" : secondDataMap.get(key);
 
-            if (firstDataMap.containsKey(key) && SecondDataMap.containsKey(key)) {
+            if (firstDataMap.containsKey(key) && secondDataMap.containsKey(key)) {
 
                 stage = (dataFirstValue.equals(dataSecondValue)) ? UNCHANGED : CHANGED;
 
             } else {
-                stage = SecondDataMap.containsKey(key) ? ADDED : DELETED;
+                stage = secondDataMap.containsKey(key) ? ADDED : DELETED;
             }
 
             List<Object> date = new ArrayList<>();

app/src/main/java/hexlet/code/formatters/Plain.java

@@ -1,6 +1,5 @@
 package hexlet.code.formatters;
 
-import hexlet.code.Differ;
 import hexlet.code.TreeBuilder;
 
 import java.util.List;

app/src/main/java/hexlet/code/formatters/Stylish.java

@@ -1,6 +1,5 @@
 package hexlet.code.formatters;
 
-import hexlet.code.Differ;
 import hexlet.code.TreeBuilder;
 
 import java.util.List;

app/src/test/java/source/TestDiffer.java

@@ -85,7 +85,7 @@ public void testWrongPathFile() {
 
     @Test
     public void testGenerateWithSomeFile() throws IOException {
-        String differs = readReroptAsString(Path.of("src/test/java/fixtures/Stylish_same_file"));
+        String differs = readReroptAsString(Path.of("src/test/java/resources/fixtures/Stylish_same_file"));
         var formant = "stylish";
         String differenceJson = Differ.generate(firstTestJsonFilePath, firstTestJsonFilePath, formant);
         assertEquals(differenceJson, differs);