commit 44d17331863fa1163accf0f4043e642847b6863c Author: iwakeh iwakeh@torproject.org Date: Mon Dec 4 11:14:37 2017 +0000

Remove checkstyle complaints. --- src/main/java/org/torproject/metrics/connbidirect/Main.java | 3 ++- src/main/java/org/torproject/metrics/onionperf/Main.java | 3 ++- .../java/org/torproject/metrics/web/CollectorDirectoryProvider.java | 6 ------ src/test/java/org/torproject/metrics/web/DirectoryListingTest.java | 5 ----- 4 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/torproject/metrics/connbidirect/Main.java b/src/main/java/org/torproject/metrics/connbidirect/Main.java index 1624fa9..6e23ea7 100644 --- a/src/main/java/org/torproject/metrics/connbidirect/Main.java +++ b/src/main/java/org/torproject/metrics/connbidirect/Main.java @@ -429,7 +429,8 @@ public class Main { SortedSet<RawStat> rawStats) { DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); - SortedMap<String, List<Short>> fractionsByDateAndDirection = new TreeMap<>(); + SortedMap<String, List<Short>> fractionsByDateAndDirection + = new TreeMap<>(); final String[] directions = new String[] { "read", "write", "both" }; for (RawStat rawStat : rawStats) { if (rawStat.fingerprint != null) { diff --git a/src/main/java/org/torproject/metrics/onionperf/Main.java b/src/main/java/org/torproject/metrics/onionperf/Main.java index 04c5dd5..f77b85d 100644 --- a/src/main/java/org/torproject/metrics/onionperf/Main.java +++ b/src/main/java/org/torproject/metrics/onionperf/Main.java @@ -233,7 +233,8 @@ public class Main { SortedSet<String> statistics) throws IOException { webstatsPath.toFile().getParentFile().mkdirs(); List<String> lines = new ArrayList<>(); - lines.add("date,filesize,source,server,q1,md,q3,timeouts,failures,requests"); + lines + .add("date,filesize,source,server,q1,md,q3,timeouts,failures,requests"); lines.addAll(statistics); log.info("Writing {} lines to {}.", lines.size(), webstatsPath.toFile().getAbsolutePath()); diff --git a/src/main/java/org/torproject/metrics/web/CollectorDirectoryProvider.java b/src/main/java/org/torproject/metrics/web/CollectorDirectoryProvider.java index 9cd1e1e..ca0e0af 100644 --- a/src/main/java/org/torproject/metrics/web/CollectorDirectoryProvider.java +++ b/src/main/java/org/torproject/metrics/web/CollectorDirectoryProvider.java @@ -3,16 +3,10 @@

package org.torproject.metrics.web;

-import org.torproject.descriptor.index.DirectoryNode; -import org.torproject.descriptor.index.FileNode; import org.torproject.descriptor.index.IndexNode;

-import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.SortedSet; -import java.util.TreeSet; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; diff --git a/src/test/java/org/torproject/metrics/web/DirectoryListingTest.java b/src/test/java/org/torproject/metrics/web/DirectoryListingTest.java index 5c6b37a..509785e 100644 --- a/src/test/java/org/torproject/metrics/web/DirectoryListingTest.java +++ b/src/test/java/org/torproject/metrics/web/DirectoryListingTest.java @@ -11,12 +11,7 @@ import org.torproject.descriptor.index.IndexNode; import org.junit.Test;

import java.io.ByteArrayInputStream; -import java.util.ArrayList; import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects;

public class DirectoryListingTest {