From 5e4156910a893da39f718ce482dbcd9337cded38 Mon Sep 17 00:00:00 2001
From: chimp1984 <chimp1984@gmx.com>
Date: Sun, 8 Nov 2020 16:23:05 -0500
Subject: [PATCH] Add hasError util method Reformattings, cleanups

---
 .../p2p/inventory/model/RequestInfo.java      |  4 +++
 .../java/bisq/inventory/InventoryMonitor.java |  3 +-
 .../bisq/inventory/InventoryWebServer.java    | 35 ++++++++++---------
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/core/src/main/java/bisq/core/network/p2p/inventory/model/RequestInfo.java b/core/src/main/java/bisq/core/network/p2p/inventory/model/RequestInfo.java
index 36f0b30201..925fec690a 100644
--- a/core/src/main/java/bisq/core/network/p2p/inventory/model/RequestInfo.java
+++ b/core/src/main/java/bisq/core/network/p2p/inventory/model/RequestInfo.java
@@ -56,6 +56,10 @@ public class RequestInfo {
                 null;
     }
 
+    public boolean hasError() {
+        return errorMessage != null && !errorMessage.isEmpty();
+    }
+
     @Value
     public static class Data {
         private final String value;
diff --git a/inventory/src/main/java/bisq/inventory/InventoryMonitor.java b/inventory/src/main/java/bisq/inventory/InventoryMonitor.java
index c807b351cf..9f863fc8c5 100644
--- a/inventory/src/main/java/bisq/inventory/InventoryMonitor.java
+++ b/inventory/src/main/java/bisq/inventory/InventoryMonitor.java
@@ -154,12 +154,11 @@ public class InventoryMonitor implements SetupListener {
                                  RequestInfo requestInfo,
                                  @Nullable Map<InventoryItem, String> result,
                                  @Nullable String errorMessage) {
-        long responseTime = System.currentTimeMillis();
         if (errorMessage != null && !errorMessage.isEmpty()) {
             log.warn("Error at connection to peer {}: {}", nodeAddress, errorMessage);
             requestInfo.setErrorMessage(errorMessage);
         } else {
-            requestInfo.setResponseTime(responseTime);
+            requestInfo.setResponseTime(System.currentTimeMillis());
         }
 
         boolean ignoreDeviationAtStartup;
diff --git a/inventory/src/main/java/bisq/inventory/InventoryWebServer.java b/inventory/src/main/java/bisq/inventory/InventoryWebServer.java
index cfb74bf240..6e6f665caf 100644
--- a/inventory/src/main/java/bisq/inventory/InventoryWebServer.java
+++ b/inventory/src/main/java/bisq/inventory/InventoryWebServer.java
@@ -191,7 +191,8 @@ public class InventoryWebServer {
                     "n/a";
             sb.append("Run duration: ").append(duration).append("<br/>");
 
-            String filteredSeedNodes = requestInfo.getDisplayValue(InventoryItem.filteredSeeds).replace(System.getProperty("line.separator"), "<br/>");
+            String filteredSeedNodes = requestInfo.getDisplayValue(InventoryItem.filteredSeeds)
+                    .replace(System.getProperty("line.separator"), "<br/>");
             if (filteredSeedNodes.isEmpty()) {
                 filteredSeedNodes = "-";
             }
@@ -386,16 +387,20 @@ public class InventoryWebServer {
             }
 
             if (!warningsAtRequestNumber.isEmpty()) {
-                historicalWarnings = warningsAtRequestNumber.size() + " repeated warning(s) at request(s) " + Joiner.on(", ").join(warningsAtRequestNumber);
+                historicalWarnings = warningsAtRequestNumber.size() + " repeated warning(s) at request(s) " +
+                        Joiner.on(", ").join(warningsAtRequestNumber);
             }
             if (!alertsAtRequestNumber.isEmpty()) {
-                historicalAlerts = alertsAtRequestNumber.size() + " repeated alert(s) at request(s): " + Joiner.on(", ").join(alertsAtRequestNumber);
+                historicalAlerts = alertsAtRequestNumber.size() + " repeated alert(s) at request(s): " +
+                        Joiner.on(", ").join(alertsAtRequestNumber);
             }
         }
         String historicalWarningsHtml = warningsAtRequestNumber.isEmpty() ? "" :
-                ", <b><a id=\"warn\" href=\"#\" title=\"" + historicalWarnings + "\">" + WARNING_ICON + warningsAtRequestNumber.size() + "</a></b>";
+                ", <b><a id=\"warn\" href=\"#\" title=\"" + historicalWarnings + "\">" + WARNING_ICON +
+                        warningsAtRequestNumber.size() + "</a></b>";
         String historicalAlertsHtml = alertsAtRequestNumber.isEmpty() ? "" :
-                ", <b><a id=\"alert\" href=\"#\" title=\"" + historicalAlerts + "\">" + ALERT_ICON + alertsAtRequestNumber.size() + "</a></b>";
+                ", <b><a id=\"alert\" href=\"#\" title=\"" + historicalAlerts + "\">" + ALERT_ICON +
+                        alertsAtRequestNumber.size() + "</a></b>";
 
         return title +
                 getColorTagByDeviationSeverity(deviationSeverity) +
@@ -473,9 +478,7 @@ public class InventoryWebServer {
     private String getErrorMsgLine(NodeAddress seedNode,
                                    RequestInfo requestInfo,
                                    Map<NodeAddress, List<RequestInfo>> map) {
-        boolean isError = requestInfo.getErrorMessage() != null &&
-                !requestInfo.getErrorMessage().isEmpty();
-        String errorMessage = isError ? requestInfo.getErrorMessage() : "-";
+        String errorMessage = requestInfo.hasError() ? requestInfo.getErrorMessage() : "-";
         List<RequestInfo> requestInfoList = map.get(seedNode);
         List<String> errorsAtRequestNumber = new ArrayList<>();
         String historicalErrorsHtml = "";
@@ -484,14 +487,12 @@ public class InventoryWebServer {
                 RequestInfo requestInfo1 = requestInfoList.get(i);
 
                 // We ignore old errors as at startup timeouts are expected and each node restarts once a day
-                if (requestInfo1.getRequestStartTime() > 0 &&
-                        System.currentTimeMillis() - requestInfo1.getRequestStartTime() > TimeUnit.HOURS.toMillis(24)) {
+                long duration = System.currentTimeMillis() - requestInfo1.getRequestStartTime();
+                if (requestInfo1.getRequestStartTime() > 0 && duration > TimeUnit.HOURS.toMillis(24)) {
                     continue;
                 }
 
-                boolean isError1 = requestInfo1.getErrorMessage() != null &&
-                        !requestInfo1.getErrorMessage().isEmpty();
-                if (isError1) {
+                if (requestInfo1.hasError()) {
                     errorsAtRequestNumber.add((i + 1) + " (" + requestInfo1.getErrorMessage() + ")");
                 }
             }
@@ -509,12 +510,14 @@ public class InventoryWebServer {
                     type = "warning";
                     style = "warn";
                 }
-                String historicalAlerts = errorsAtRequestNumber.size() + " repeated " + type + "(s) at request(s): " + Joiner.on(", ").join(errorsAtRequestNumber);
+                String historicalAlerts = errorsAtRequestNumber.size() + " repeated " + type + "(s) at request(s): " +
+                        Joiner.on(", ").join(errorsAtRequestNumber);
                 historicalErrorsHtml = errorsAtRequestNumber.isEmpty() ? "" :
-                        ", <b><a id=\"" + style + "\" href=\"#\" title=\"" + historicalAlerts + "\">" + errorIcon + errorsAtRequestNumber.size() + "</a></b>";
+                        ", <b><a id=\"" + style + "\" href=\"#\" title=\"" + historicalAlerts + "\">" + errorIcon +
+                                errorsAtRequestNumber.size() + "</a></b>";
             }
         }
-        DeviationSeverity deviationSeverity = isError ?
+        DeviationSeverity deviationSeverity = requestInfo.hasError() ?
                 errorsAtRequestNumber.size() > 4 ? DeviationSeverity.ALERT : DeviationSeverity.WARN
                 : DeviationSeverity.OK;