Merge pull request #4685 from chimp1984/update-monitor-with-last-vers…

…ion-from-freimairs-repo

Update monitor with last version from freimairs repo

core/src/main/java/bisq/core/account/witness/AccountAgeWitnessStore.java

@@ -35,7 +35,7 @@
 @Slf4j
 public class AccountAgeWitnessStore extends PersistableNetworkPayloadStore<AccountAgeWitness> {
 
-    AccountAgeWitnessStore() {
+    public AccountAgeWitnessStore() {
     }
 
 

core/src/main/java/bisq/core/trade/statistics/TradeStatistics3Store.java

@@ -35,7 +35,7 @@
 @Slf4j
 public class TradeStatistics3Store extends PersistableNetworkPayloadStore<TradeStatistics3> {
 
-    TradeStatistics3Store() {
+    public TradeStatistics3Store() {
     }
 
 

monitor/src/main/java/bisq/monitor/AvailableTor.java

@@ -17,13 +17,15 @@
 
 package bisq.monitor;
 
-import java.io.File;
-import org.berndpruenster.netlayer.tor.Tor;
 import bisq.network.p2p.network.TorMode;
 
+import org.berndpruenster.netlayer.tor.Tor;
+
+import java.io.File;
+
 /**
  * This class uses an already defined Tor via <code>Tor.getDefault()</code>
- * 
+ *
  * @author Florian Reimair
  *
  */

monitor/src/main/java/bisq/monitor/Metric.java

@@ -122,11 +122,11 @@ public void run() {
 
             // execute all the things
             synchronized (this) {
-                    log.info("{} started", getName());
-                    execute();
-                    log.info("{} done", getName());
+                log.info("{} started", getName());
+                execute();
+                log.info("{} done", getName());
             }
-        } catch(Throwable e) {
+        } catch (Throwable e) {
             log.error("A metric misbehaved!", e);
         }
     }

monitor/src/main/java/bisq/monitor/OnionParser.java

@@ -17,11 +17,11 @@
 
 package bisq.monitor;
 
+import bisq.network.p2p.NodeAddress;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import bisq.network.p2p.NodeAddress;
-
 /**
  * Helper for parsing and pretty printing onion addresses.
  *

monitor/src/main/java/bisq/monitor/StatisticsHelper.java

@@ -17,11 +17,13 @@
 
 package bisq.monitor;
 
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.LongSummaryStatistics;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * Calculates average, max, min, p25, p50, p75 off of a list of samples and
@@ -31,7 +33,9 @@
  */
 public class StatisticsHelper {
 
-    public static Map<String, String> process(List<Long> samples) {
+    public static Map<String, String> process(Collection<Long> input) {
+
+        List<Long> samples = input.stream().collect(Collectors.toList());
 
         // aftermath
         Collections.sort(samples);

monitor/src/main/java/bisq/monitor/ThreadGate.java

@@ -41,7 +41,7 @@ public void engage() {
 
     /**
      * Make everyone wait until the gate is open again.
-     * 
+     *
      * @param numberOfLocks how often the gate has to be unlocked until the gate
      *                      opens.
      */