Fix

polis-vk · May 19, 2024 · f104249 · f104249
1 parent 3bc3945
commit f104249
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/src/main/java/ru/vk/itmo/test/tuzikovalexandr/ReadRepairManager.java b/src/main/java/ru/vk/itmo/test/tuzikovalexandr/ReadRepairManager.java
@@ -8,14 +8,11 @@
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.TimeoutException;
 
-public class ReadRepairManager {
+public final class ReadRepairManager {
     public ReadRepairManager() {
-
     }
 
     public boolean checkReadRepair(List<ResponseWithUrl> sortedResponses) {

diff --git a/src/main/java/ru/vk/itmo/test/tuzikovalexandr/ServerImpl.java b/src/main/java/ru/vk/itmo/test/tuzikovalexandr/ServerImpl.java
@@ -20,8 +20,6 @@
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -281,7 +279,7 @@ private Response getQuorumResult(Request request, int from, int ack,
 
     private Response getResult(Request request, List<ResponseWithUrl> successResponses, String paramId) {
         if (request.getMethod() == Request.METHOD_GET) {
-            sortResponses(successResponses);
+            Utils.sortResponses(successResponses);
 
             if (readRepairManager.checkReadRepair(successResponses)) {
                 List<String> nodesToUpdate = readRepairManager.getNodesForUpdate(successResponses);
@@ -295,11 +293,4 @@ private Response getResult(Request request, List<ResponseWithUrl> successRespons
             return successResponses.getFirst().getResponse();
         }
     }
-
-    private void sortResponses(List<ResponseWithUrl> successResponses) {
-        successResponses.sort(Comparator.comparingLong(r -> {
-            String timestamp = r.getResponse().getHeader(Constants.NIO_TIMESTAMP_HEADER);
-            return timestamp == null ? 0 : Long.parseLong(timestamp);
-        }));
-    }
 }
diff --git a/src/main/java/ru/vk/itmo/test/tuzikovalexandr/Utils.java b/src/main/java/ru/vk/itmo/test/tuzikovalexandr/Utils.java
@@ -0,0 +1,17 @@
+package ru.vk.itmo.test.tuzikovalexandr;
+
+import java.util.Comparator;
+import java.util.List;
+
+public final class Utils {
+
+    private Utils() {
+    }
+
+    public static void sortResponses(List<ResponseWithUrl> successResponses) {
+        successResponses.sort(Comparator.comparingLong(r -> {
+            String timestamp = r.getResponse().getHeader(Constants.NIO_TIMESTAMP_HEADER);
+            return timestamp == null ? 0 : Long.parseLong(timestamp);
+        }));
+    }
+}