diff --git a/src/main/java/ru/vk/itmo/test/tuzikovalexandr/ReadRepairManager.java b/src/main/java/ru/vk/itmo/test/tuzikovalexandr/ReadRepairManager.java index 837e9b888..346acd377 100644 --- 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 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 index c6b3d9134..c30e928e4 100644 --- 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 successResponses, String paramId) { if (request.getMethod() == Request.METHOD_GET) { - sortResponses(successResponses); + Utils.sortResponses(successResponses); if (readRepairManager.checkReadRepair(successResponses)) { List nodesToUpdate = readRepairManager.getNodesForUpdate(successResponses); @@ -295,11 +293,4 @@ private Response getResult(Request request, List successRespons return successResponses.getFirst().getResponse(); } } - - private void sortResponses(List 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 new file mode 100644 index 000000000..77e36839c --- /dev/null +++ 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 successResponses) { + successResponses.sort(Comparator.comparingLong(r -> { + String timestamp = r.getResponse().getHeader(Constants.NIO_TIMESTAMP_HEADER); + return timestamp == null ? 0 : Long.parseLong(timestamp); + })); + } +}