[metrics-web/master] Let Eclipse organize imports.
commit dcd46097fa9f1edc24fc58f10125003a288bd2da Author: Karsten Loesing <karsten.loesing@gmx.net> Date: Tue Mar 20 13:10:07 2012 +0100 Let Eclipse organize imports. --- src/org/torproject/ernie/cron/ArchiveReader.java | 20 +++++++- .../ernie/cron/BridgeDescriptorParser.java | 17 +++++-- .../ernie/cron/BridgeStatsFileHandler.java | 27 ++++++++-- src/org/torproject/ernie/cron/Configuration.java | 11 +++-- .../ernie/cron/ConsensusStatsFileHandler.java | 27 ++++++++-- .../ernie/cron/ExoneraTorDatabaseImporter.java | 35 +++++++++++-- .../ernie/cron/GeoipDatabaseImporter.java | 16 +++++-- src/org/torproject/ernie/cron/GetTorProcessor.java | 25 ++++++++-- src/org/torproject/ernie/cron/LockFile.java | 9 +++- .../ernie/cron/LoggingConfiguration.java | 12 ++++- src/org/torproject/ernie/cron/Main.java | 5 +- .../cron/RelayDescriptorDatabaseImporter.java | 32 ++++++++++-- .../ernie/cron/RelayDescriptorParser.java | 24 +++++++-- .../ernie/cron/SanitizedBridgesReader.java | 19 ++++++- .../torproject/ernie/cron/TorperfProcessor.java | 32 ++++++++++-- .../ernie/test/SanitizedBridgesReaderTest.java | 12 ++-- src/org/torproject/ernie/web/ConsensusServlet.java | 28 +++++++---- src/org/torproject/ernie/web/Countries.java | 3 +- src/org/torproject/ernie/web/CsvServlet.java | 16 ++++--- .../torproject/ernie/web/DescriptorServlet.java | 41 +++++++++------- .../ernie/web/ErnieGeneratedFileServlet.java | 13 ++++-- .../torproject/ernie/web/ExoneraTorServlet.java | 51 ++++++++++++++------ .../ernie/web/ExtraInfoDescriptorServlet.java | 28 +++++++---- src/org/torproject/ernie/web/GraphDataServlet.java | 24 +++++++--- .../torproject/ernie/web/GraphImageServlet.java | 13 +++-- .../ernie/web/GraphParameterChecker.java | 13 ++++- src/org/torproject/ernie/web/GraphsServlet.java | 9 ++- .../ernie/web/GraphsSubpagesServlet.java | 20 ++++++-- src/org/torproject/ernie/web/IndexServlet.java | 9 ++- .../torproject/ernie/web/NetworkStatusServlet.java | 10 ++-- src/org/torproject/ernie/web/RObjectGenerator.java | 28 ++++++++--- .../torproject/ernie/web/RelaySearchServlet.java | 44 ++++++++++++----- src/org/torproject/ernie/web/RelayServlet.java | 8 ++- .../torproject/ernie/web/ResearchDataServlet.java | 24 +++++++-- .../ernie/web/ResearchFormatsServlet.java | 9 ++- .../ernie/web/ResearchPapersServlet.java | 9 ++- src/org/torproject/ernie/web/ResearchServlet.java | 9 ++- .../torproject/ernie/web/ResearchToolsServlet.java | 9 ++- .../torproject/ernie/web/RouterDetailServlet.java | 10 ++-- .../ernie/web/ServerDescriptorServlet.java | 35 +++++++++---- src/org/torproject/ernie/web/StatusServlet.java | 9 ++- .../ernie/web/TableParameterChecker.java | 11 +++- src/org/torproject/ernie/web/VotesServlet.java | 32 ++++++++---- 43 files changed, 602 insertions(+), 236 deletions(-) diff --git a/src/org/torproject/ernie/cron/ArchiveReader.java b/src/org/torproject/ernie/cron/ArchiveReader.java index 4d4fe64..45449ab 100644 --- a/src/org/torproject/ernie/cron/ArchiveReader.java +++ b/src/org/torproject/ernie/cron/ArchiveReader.java @@ -2,9 +2,23 @@ * See LICENSE for licensing information */ package org.torproject.ernie.cron; -import java.io.*; -import java.util.*; -import java.util.logging.*; +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.SortedMap; +import java.util.Stack; +import java.util.TreeMap; +import java.util.logging.Level; +import java.util.logging.Logger; /** * Read in all files in a given directory and pass buffered readers of diff --git a/src/org/torproject/ernie/cron/BridgeDescriptorParser.java b/src/org/torproject/ernie/cron/BridgeDescriptorParser.java index 4777f58..601b238 100644 --- a/src/org/torproject/ernie/cron/BridgeDescriptorParser.java +++ b/src/org/torproject/ernie/cron/BridgeDescriptorParser.java @@ -2,11 +2,18 @@ * See LICENSE for licensing information */ package org.torproject.ernie.cron; -import java.io.*; -import java.text.*; -import java.util.*; -import java.util.logging.*; -import org.apache.commons.codec.digest.*; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.StringReader; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.HashMap; +import java.util.Map; +import java.util.TimeZone; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.apache.commons.codec.digest.DigestUtils; public class BridgeDescriptorParser { private ConsensusStatsFileHandler csfh; diff --git a/src/org/torproject/ernie/cron/BridgeStatsFileHandler.java b/src/org/torproject/ernie/cron/BridgeStatsFileHandler.java index 58ee3a2..2f6ac8d 100644 --- a/src/org/torproject/ernie/cron/BridgeStatsFileHandler.java +++ b/src/org/torproject/ernie/cron/BridgeStatsFileHandler.java @@ -2,11 +2,28 @@ * See LICENSE for licensing information */ package org.torproject.ernie.cron; -import java.io.*; -import java.sql.*; -import java.text.*; -import java.util.*; -import java.util.logging.*; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.SortedMap; +import java.util.SortedSet; +import java.util.TreeMap; +import java.util.TreeSet; +import java.util.logging.Level; +import java.util.logging.Logger; /** * Determines estimates of bridge users per country and day from the diff --git a/src/org/torproject/ernie/cron/Configuration.java b/src/org/torproject/ernie/cron/Configuration.java index b8f251e..6effd78 100644 --- a/src/org/torproject/ernie/cron/Configuration.java +++ b/src/org/torproject/ernie/cron/Configuration.java @@ -2,10 +2,13 @@ * See LICENSE for licensing information */ package org.torproject.ernie.cron; -import java.io.*; -import java.net.*; -import java.util.*; -import java.util.logging.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.net.MalformedURLException; +import java.util.logging.Level; +import java.util.logging.Logger; /** * Initialize configuration with hard-coded defaults, overwrite with diff --git a/src/org/torproject/ernie/cron/ConsensusStatsFileHandler.java b/src/org/torproject/ernie/cron/ConsensusStatsFileHandler.java index 4ad5300..ebc882b 100644 --- a/src/org/torproject/ernie/cron/ConsensusStatsFileHandler.java +++ b/src/org/torproject/ernie/cron/ConsensusStatsFileHandler.java @@ -2,11 +2,28 @@ * See LICENSE for licensing information */ package org.torproject.ernie.cron; -import java.io.*; -import java.sql.*; -import java.text.*; -import java.util.*; -import java.util.logging.*; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.SortedMap; +import java.util.TimeZone; +import java.util.TreeMap; +import java.util.logging.Level; +import java.util.logging.Logger; /** * Generates statistics on the average number of relays and bridges per diff --git a/src/org/torproject/ernie/cron/ExoneraTorDatabaseImporter.java b/src/org/torproject/ernie/cron/ExoneraTorDatabaseImporter.java index c89097a..8eb5688 100755 --- a/src/org/torproject/ernie/cron/ExoneraTorDatabaseImporter.java +++ b/src/org/torproject/ernie/cron/ExoneraTorDatabaseImporter.java @@ -2,12 +2,35 @@ * See LICENSE for licensing information */ package org.torproject.ernie.cron; -import java.io.*; -import java.sql.*; -import java.text.*; -import java.util.*; -import org.apache.commons.codec.binary.*; -import org.apache.commons.codec.digest.*; +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.StringReader; +import java.io.UnsupportedEncodingException; +import java.sql.CallableStatement; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.sql.Timestamp; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.Stack; +import java.util.TimeZone; + +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.codec.binary.Hex; +import org.apache.commons.codec.digest.DigestUtils; /* Import Tor descriptors into the ExoneraTor database. */ public class ExoneraTorDatabaseImporter { diff --git a/src/org/torproject/ernie/cron/GeoipDatabaseImporter.java b/src/org/torproject/ernie/cron/GeoipDatabaseImporter.java index afe5245..2ad8bf4 100644 --- a/src/org/torproject/ernie/cron/GeoipDatabaseImporter.java +++ b/src/org/torproject/ernie/cron/GeoipDatabaseImporter.java @@ -2,10 +2,18 @@ * See LICENSE for licensing information */ package org.torproject.ernie.cron; -import java.io.*; -import java.sql.*; -import java.util.*; -import java.util.logging.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; +import java.sql.Types; +import java.util.HashMap; +import java.util.Map; /** * Import a Maxmind GeoLite City database to resolve resolve IP addresses diff --git a/src/org/torproject/ernie/cron/GetTorProcessor.java b/src/org/torproject/ernie/cron/GetTorProcessor.java index 65f2dd4..3e32819 100644 --- a/src/org/torproject/ernie/cron/GetTorProcessor.java +++ b/src/org/torproject/ernie/cron/GetTorProcessor.java @@ -2,11 +2,26 @@ * See LICENSE for licensing information */ package org.torproject.ernie.cron; -import java.io.*; -import java.sql.*; -import java.text.*; -import java.util.*; -import java.util.logging.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.HashMap; +import java.util.Map; +import java.util.SortedMap; +import java.util.SortedSet; +import java.util.TreeMap; +import java.util.TreeSet; +import java.util.logging.Level; +import java.util.logging.Logger; public class GetTorProcessor { public GetTorProcessor(File getTorDirectory, String connectionURL) { diff --git a/src/org/torproject/ernie/cron/LockFile.java b/src/org/torproject/ernie/cron/LockFile.java index 7a097f0..94afbab 100644 --- a/src/org/torproject/ernie/cron/LockFile.java +++ b/src/org/torproject/ernie/cron/LockFile.java @@ -2,8 +2,13 @@ * See LICENSE for licensing information */ package org.torproject.ernie.cron; -import java.io.*; -import java.util.logging.*; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.util.logging.Logger; public class LockFile { diff --git a/src/org/torproject/ernie/cron/LoggingConfiguration.java b/src/org/torproject/ernie/cron/LoggingConfiguration.java index f14fc54..b7dd122 100644 --- a/src/org/torproject/ernie/cron/LoggingConfiguration.java +++ b/src/org/torproject/ernie/cron/LoggingConfiguration.java @@ -2,11 +2,17 @@ * See LICENSE for licensing information */ package org.torproject.ernie.cron; -import java.io.*; -import java.text.*; +import java.io.IOException; +import java.text.SimpleDateFormat; import java.util.Date; import java.util.TimeZone; -import java.util.logging.*; +import java.util.logging.ConsoleHandler; +import java.util.logging.FileHandler; +import java.util.logging.Formatter; +import java.util.logging.Handler; +import java.util.logging.Level; +import java.util.logging.LogRecord; +import java.util.logging.Logger; /** * Initialize logging configuration. diff --git a/src/org/torproject/ernie/cron/Main.java b/src/org/torproject/ernie/cron/Main.java index 4889fc2..7cb0091 100644 --- a/src/org/torproject/ernie/cron/Main.java +++ b/src/org/torproject/ernie/cron/Main.java @@ -2,9 +2,8 @@ * See LICENSE for licensing information */ package org.torproject.ernie.cron; -import java.io.*; -import java.util.*; -import java.util.logging.*; +import java.io.File; +import java.util.logging.Logger; /** * Coordinate downloading and parsing of descriptors and extraction of diff --git a/src/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java b/src/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java index deefc10..dbbd168 100644 --- a/src/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java +++ b/src/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java @@ -2,12 +2,32 @@ * See LICENSE for licensing information */ package org.torproject.ernie.cron; -import java.io.*; -import java.sql.*; -import java.text.*; -import java.util.*; -import java.util.logging.*; -import org.postgresql.util.*; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.sql.CallableStatement; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Timestamp; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.SortedSet; +import java.util.TimeZone; +import java.util.TreeSet; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.postgresql.util.PGbytea; /** * Parse directory data. diff --git a/src/org/torproject/ernie/cron/RelayDescriptorParser.java b/src/org/torproject/ernie/cron/RelayDescriptorParser.java index 64b809e..2125352 100644 --- a/src/org/torproject/ernie/cron/RelayDescriptorParser.java +++ b/src/org/torproject/ernie/cron/RelayDescriptorParser.java @@ -2,12 +2,24 @@ * See LICENSE for licensing information */ package org.torproject.ernie.cron; -import java.io.*; -import java.text.*; -import java.util.*; -import java.util.logging.*; -import org.apache.commons.codec.digest.*; -import org.apache.commons.codec.binary.*; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.StringReader; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.SortedSet; +import java.util.TimeZone; +import java.util.TreeSet; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.codec.binary.Hex; +import org.apache.commons.codec.digest.DigestUtils; /** * Parses relay descriptors including network status consensuses and diff --git a/src/org/torproject/ernie/cron/SanitizedBridgesReader.java b/src/org/torproject/ernie/cron/SanitizedBridgesReader.java index b7f1d44..f151152 100644 --- a/src/org/torproject/ernie/cron/SanitizedBridgesReader.java +++ b/src/org/torproject/ernie/cron/SanitizedBridgesReader.java @@ -2,9 +2,22 @@ * See LICENSE for licensing information */ package org.torproject.ernie.cron; -import java.io.*; -import java.util.*; -import java.util.logging.*; +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.SortedSet; +import java.util.Stack; +import java.util.TreeSet; +import java.util.logging.Level; +import java.util.logging.Logger; public class SanitizedBridgesReader { public SanitizedBridgesReader(BridgeDescriptorParser bdp, diff --git a/src/org/torproject/ernie/cron/TorperfProcessor.java b/src/org/torproject/ernie/cron/TorperfProcessor.java index dcd0657..b9086e0 100644 --- a/src/org/torproject/ernie/cron/TorperfProcessor.java +++ b/src/org/torproject/ernie/cron/TorperfProcessor.java @@ -2,11 +2,33 @@ * See LICENSE for licensing information */ package org.torproject.ernie.cron; -import java.io.*; -import java.sql.*; -import java.text.*; -import java.util.*; -import java.util.logging.*; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.SortedMap; +import java.util.Stack; +import java.util.TimeZone; +import java.util.TreeMap; +import java.util.logging.Level; +import java.util.logging.Logger; public class TorperfProcessor { public TorperfProcessor(File torperfDirectory, File statsDirectory, diff --git a/src/org/torproject/ernie/test/SanitizedBridgesReaderTest.java b/src/org/torproject/ernie/test/SanitizedBridgesReaderTest.java index 6dd9132..8eaf346 100644 --- a/src/org/torproject/ernie/test/SanitizedBridgesReaderTest.java +++ b/src/org/torproject/ernie/test/SanitizedBridgesReaderTest.java @@ -2,13 +2,13 @@ * See LICENSE for licensing information */ package org.torproject.ernie.test; -import org.torproject.ernie.cron.*; +import java.io.File; -import java.io.*; - -import org.junit.*; -import org.junit.rules.*; -import static org.junit.Assert.*; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; +import org.torproject.ernie.cron.SanitizedBridgesReader; public class SanitizedBridgesReaderTest { diff --git a/src/org/torproject/ernie/web/ConsensusServlet.java b/src/org/torproject/ernie/web/ConsensusServlet.java index ad3f4a7..f5afc92 100644 --- a/src/org/torproject/ernie/web/ConsensusServlet.java +++ b/src/org/torproject/ernie/web/ConsensusServlet.java @@ -1,15 +1,25 @@ package org.torproject.ernie.web; -import java.io.*; -import java.sql.*; -import java.text.*; -import java.util.*; -import java.util.logging.*; +import java.io.BufferedOutputStream; +import java.io.IOException; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.TimeZone; +import java.util.logging.Level; +import java.util.logging.Logger; -import javax.naming.*; -import javax.servlet.*; -import javax.servlet.http.*; -import javax.sql.*; +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NamingException; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.sql.DataSource; public class ConsensusServlet extends HttpServlet { diff --git a/src/org/torproject/ernie/web/Countries.java b/src/org/torproject/ernie/web/Countries.java index 7b208c7..51a5ec3 100644 --- a/src/org/torproject/ernie/web/Countries.java +++ b/src/org/torproject/ernie/web/Countries.java @@ -1,6 +1,7 @@ package org.torproject.ernie.web; -import java.util.*; +import java.util.ArrayList; +import java.util.List; public class Countries { diff --git a/src/org/torproject/ernie/web/CsvServlet.java b/src/org/torproject/ernie/web/CsvServlet.java index 2e752aa..d896247 100644 --- a/src/org/torproject/ernie/web/CsvServlet.java +++ b/src/org/torproject/ernie/web/CsvServlet.java @@ -1,12 +1,14 @@ package org.torproject.ernie.web; -import java.io.*; -import java.text.*; -import java.util.*; -import java.util.logging.*; - -import javax.servlet.*; -import javax.servlet.http.*; +import java.io.IOException; +import java.util.SortedSet; +import java.util.TreeSet; +import java.util.logging.Logger; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** * Servlet that reads an HTTP request for a comma-separated value file, diff --git a/src/org/torproject/ernie/web/DescriptorServlet.java b/src/org/torproject/ernie/web/DescriptorServlet.java index 7ee454b..56f8a1d 100644 --- a/src/org/torproject/ernie/web/DescriptorServlet.java +++ b/src/org/torproject/ernie/web/DescriptorServlet.java @@ -1,22 +1,29 @@ package org.torproject.ernie.web; -import java.io.*; -import java.math.*; -import java.sql.*; -import java.text.*; -import java.util.*; -import java.util.logging.*; -import java.util.regex.*; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringReader; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.SortedSet; +import java.util.TreeSet; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.regex.Pattern; -import javax.naming.*; -import javax.servlet.*; -import javax.servlet.http.*; -import javax.sql.*; +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NamingException; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.sql.DataSource; -import org.apache.commons.codec.*; -import org.apache.commons.codec.binary.*; - -import org.apache.commons.lang.*; +import org.apache.commons.lang.StringEscapeUtils; public class DescriptorServlet extends HttpServlet { diff --git a/src/org/torproject/ernie/web/ErnieGeneratedFileServlet.java b/src/org/torproject/ernie/web/ErnieGeneratedFileServlet.java index f4bd066..33fb22e 100644 --- a/src/org/torproject/ernie/web/ErnieGeneratedFileServlet.java +++ b/src/org/torproject/ernie/web/ErnieGeneratedFileServlet.java @@ -1,10 +1,15 @@ package org.torproject.ernie.web; -import javax.servlet.*; -import javax.servlet.http.*; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; -import java.io.*; -import java.util.*; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; public class ErnieGeneratedFileServlet extends HttpServlet { diff --git a/src/org/torproject/ernie/web/ExoneraTorServlet.java b/src/org/torproject/ernie/web/ExoneraTorServlet.java index d2d33f4..3a71d10 100644 --- a/src/org/torproject/ernie/web/ExoneraTorServlet.java +++ b/src/org/torproject/ernie/web/ExoneraTorServlet.java @@ -1,20 +1,41 @@ package org.torproject.ernie.web; -import java.io.*; -import java.math.*; -import java.sql.*; -import java.text.*; -import java.util.*; -import java.util.logging.*; -import java.util.regex.*; - -import javax.naming.*; -import javax.servlet.*; -import javax.servlet.http.*; -import javax.sql.*; - -import org.apache.commons.codec.binary.*; -import org.apache.commons.lang.*; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringReader; +import java.sql.CallableStatement; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.SortedMap; +import java.util.SortedSet; +import java.util.TimeZone; +import java.util.TreeMap; +import java.util.TreeSet; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NamingException; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.sql.DataSource; + +import org.apache.commons.codec.binary.Hex; +import org.apache.commons.lang.StringEscapeUtils; public class ExoneraTorServlet extends HttpServlet { diff --git a/src/org/torproject/ernie/web/ExtraInfoDescriptorServlet.java b/src/org/torproject/ernie/web/ExtraInfoDescriptorServlet.java index 0a06865..7d48a12 100644 --- a/src/org/torproject/ernie/web/ExtraInfoDescriptorServlet.java +++ b/src/org/torproject/ernie/web/ExtraInfoDescriptorServlet.java @@ -1,14 +1,24 @@ package org.torproject.ernie.web; -import java.io.*; -import java.sql.*; -import java.util.logging.*; -import java.util.regex.*; +import java.io.BufferedOutputStream; +import java.io.IOException; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.regex.Matcher; +import java.util.regex.Pattern; -import javax.naming.*; -import javax.servlet.*; -import javax.servlet.http.*; -import javax.sql.*; +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NamingException; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.sql.DataSource; public class ExtraInfoDescriptorServlet extends HttpServlet { diff --git a/src/org/torproject/ernie/web/GraphDataServlet.java b/src/org/torproject/ernie/web/GraphDataServlet.java index ec3c93b..590647b 100644 --- a/src/org/torproject/ernie/web/GraphDataServlet.java +++ b/src/org/torproject/ernie/web/GraphDataServlet.java @@ -1,12 +1,22 @@ package org.torproject.ernie.web; -import java.io.*; -import java.text.*; -import java.util.*; -import java.util.logging.*; - -import javax.servlet.*; -import javax.servlet.http.*; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.StringReader; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Map; +import java.util.SortedMap; +import java.util.SortedSet; +import java.util.TimeZone; +import java.util.TreeMap; +import java.util.TreeSet; +import java.util.logging.Logger; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** * Servlet that reads an HTTP request for a JSON-formatted graph data diff --git a/src/org/torproject/ernie/web/GraphImageServlet.java b/src/org/torproject/ernie/web/GraphImageServlet.java index 2eb2efd..7e8e29c 100644 --- a/src/org/torproject/ernie/web/GraphImageServlet.java +++ b/src/org/torproject/ernie/web/GraphImageServlet.java @@ -1,10 +1,13 @@ package org.torproject.ernie.web; -import java.io.*; -import java.text.*; -import java.util.*; -import javax.servlet.*; -import javax.servlet.http.*; +import java.io.BufferedOutputStream; +import java.io.IOException; +import java.util.Map; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** * Servlet that reads an HTTP request for a graph image, asks the diff --git a/src/org/torproject/ernie/web/GraphParameterChecker.java b/src/org/torproject/ernie/web/GraphParameterChecker.java index 09a4f34..701fb23 100644 --- a/src/org/torproject/ernie/web/GraphParameterChecker.java +++ b/src/org/torproject/ernie/web/GraphParameterChecker.java @@ -1,8 +1,15 @@ package org.torproject.ernie.web; -import java.text.*; -import java.util.*; -import java.util.regex.*; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TimeZone; +import java.util.regex.Pattern; /** * Checks request parameters passed to graph-generating servlets. diff --git a/src/org/torproject/ernie/web/GraphsServlet.java b/src/org/torproject/ernie/web/GraphsServlet.java index 121881f..b4658d8 100644 --- a/src/org/torproject/ernie/web/GraphsServlet.java +++ b/src/org/torproject/ernie/web/GraphsServlet.java @@ -1,8 +1,11 @@ package org.torproject.ernie.web; -import javax.servlet.*; -import javax.servlet.http.*; -import java.io.*; +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; public class GraphsServlet extends HttpServlet { public void doGet(HttpServletRequest request, diff --git a/src/org/torproject/ernie/web/GraphsSubpagesServlet.java b/src/org/torproject/ernie/web/GraphsSubpagesServlet.java index c7f3056..4a1056d 100644 --- a/src/org/torproject/ernie/web/GraphsSubpagesServlet.java +++ b/src/org/torproject/ernie/web/GraphsSubpagesServlet.java @@ -1,10 +1,20 @@ package org.torproject.ernie.web; -import javax.servlet.*; -import javax.servlet.http.*; -import java.io.*; -import java.text.*; -import java.util.*; +import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.Arrays; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TimeZone; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; public class GraphsSubpagesServlet extends HttpServlet { diff --git a/src/org/torproject/ernie/web/IndexServlet.java b/src/org/torproject/ernie/web/IndexServlet.java index cbf1e10..fd0f55d 100644 --- a/src/org/torproject/ernie/web/IndexServlet.java +++ b/src/org/torproject/ernie/web/IndexServlet.java @@ -1,8 +1,11 @@ package org.torproject.ernie.web; -import javax.servlet.*; -import javax.servlet.http.*; -import java.io.*; +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; public class IndexServlet extends HttpServlet { public void doGet(HttpServletRequest request, diff --git a/src/org/torproject/ernie/web/NetworkStatusServlet.java b/src/org/torproject/ernie/web/NetworkStatusServlet.java index 63d7895..5c87b39 100644 --- a/src/org/torproject/ernie/web/NetworkStatusServlet.java +++ b/src/org/torproject/ernie/web/NetworkStatusServlet.java @@ -1,11 +1,11 @@ package org.torproject.ernie.web; -import java.io.*; +import java.io.IOException; -import javax.servlet.*; -import javax.servlet.http.*; - -import org.apache.commons.lang.time.*; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; public class NetworkStatusServlet extends HttpServlet { diff --git a/src/org/torproject/ernie/web/RObjectGenerator.java b/src/org/torproject/ernie/web/RObjectGenerator.java index 814d79b..e251974 100644 --- a/src/org/torproject/ernie/web/RObjectGenerator.java +++ b/src/org/torproject/ernie/web/RObjectGenerator.java @@ -1,13 +1,25 @@ package org.torproject.ernie.web; -import java.io.*; -import java.util.*; -import java.util.logging.*; - -import javax.servlet.*; - -import org.rosuda.REngine.Rserve.*; -import org.rosuda.REngine.*; +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileReader; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.logging.Logger; + +import javax.servlet.ServletContext; +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; + +import org.rosuda.REngine.Rserve.RConnection; +import org.rosuda.REngine.Rserve.RserveException; public class RObjectGenerator implements ServletContextListener { diff --git a/src/org/torproject/ernie/web/RelaySearchServlet.java b/src/org/torproject/ernie/web/RelaySearchServlet.java index f93dc14..208a8d2 100644 --- a/src/org/torproject/ernie/web/RelaySearchServlet.java +++ b/src/org/torproject/ernie/web/RelaySearchServlet.java @@ -1,19 +1,39 @@ package org.torproject.ernie.web; -import java.io.*; -import java.math.*; -import java.sql.*; -import java.text.*; -import java.util.*; -import java.util.logging.*; -import java.util.regex.*; - -import javax.naming.*; -import javax.servlet.*; -import javax.servlet.http.*; -import javax.sql.*; - -import org.apache.commons.codec.binary.*; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.math.BigInteger; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.SortedMap; +import java.util.SortedSet; +import java.util.TimeZone; +import java.util.TreeMap; +import java.util.TreeSet; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.regex.Pattern; + +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NamingException; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.sql.DataSource; + +import org.apache.commons.codec.binary.Base64; /** * Web page that allows users to search for relays in the descriptor diff --git a/src/org/torproject/ernie/web/RelayServlet.java b/src/org/torproject/ernie/web/RelayServlet.java index 79afac3..bfbd523 100644 --- a/src/org/torproject/ernie/web/RelayServlet.java +++ b/src/org/torproject/ernie/web/RelayServlet.java @@ -1,9 +1,11 @@ package org.torproject.ernie.web; -import java.io.*; +import java.io.IOException; -import javax.servlet.*; -import javax.servlet.http.*; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; public class RelayServlet extends HttpServlet { diff --git a/src/org/torproject/ernie/web/ResearchDataServlet.java b/src/org/torproject/ernie/web/ResearchDataServlet.java index 0cf1564..deb6b06 100644 --- a/src/org/torproject/ernie/web/ResearchDataServlet.java +++ b/src/org/torproject/ernie/web/ResearchDataServlet.java @@ -1,10 +1,24 @@ package org.torproject.ernie.web; -import javax.servlet.*; -import javax.servlet.http.*; -import java.io.*; -import java.text.*; -import java.util.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.SortedMap; +import java.util.TreeMap; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** * Controller servlet for the Data page. Prepares the various lists of diff --git a/src/org/torproject/ernie/web/ResearchFormatsServlet.java b/src/org/torproject/ernie/web/ResearchFormatsServlet.java index f61b7e5..7ed228c 100644 --- a/src/org/torproject/ernie/web/ResearchFormatsServlet.java +++ b/src/org/torproject/ernie/web/ResearchFormatsServlet.java @@ -1,8 +1,11 @@ package org.torproject.ernie.web; -import javax.servlet.*; -import javax.servlet.http.*; -import java.io.*; +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; public class ResearchFormatsServlet extends HttpServlet { public void doGet(HttpServletRequest request, diff --git a/src/org/torproject/ernie/web/ResearchPapersServlet.java b/src/org/torproject/ernie/web/ResearchPapersServlet.java index c3e8484..8d36225 100644 --- a/src/org/torproject/ernie/web/ResearchPapersServlet.java +++ b/src/org/torproject/ernie/web/ResearchPapersServlet.java @@ -1,8 +1,11 @@ package org.torproject.ernie.web; -import javax.servlet.*; -import javax.servlet.http.*; -import java.io.*; +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; public class ResearchPapersServlet extends HttpServlet { public void doGet(HttpServletRequest request, diff --git a/src/org/torproject/ernie/web/ResearchServlet.java b/src/org/torproject/ernie/web/ResearchServlet.java index 823e78c..8c7c0e6 100644 --- a/src/org/torproject/ernie/web/ResearchServlet.java +++ b/src/org/torproject/ernie/web/ResearchServlet.java @@ -1,8 +1,11 @@ package org.torproject.ernie.web; -import javax.servlet.*; -import javax.servlet.http.*; -import java.io.*; +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; public class ResearchServlet extends HttpServlet { public void doGet(HttpServletRequest request, diff --git a/src/org/torproject/ernie/web/ResearchToolsServlet.java b/src/org/torproject/ernie/web/ResearchToolsServlet.java index ab9d7df..e2f890e 100644 --- a/src/org/torproject/ernie/web/ResearchToolsServlet.java +++ b/src/org/torproject/ernie/web/ResearchToolsServlet.java @@ -1,8 +1,11 @@ package org.torproject.ernie.web; -import javax.servlet.*; -import javax.servlet.http.*; -import java.io.*; +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; public class ResearchToolsServlet extends HttpServlet { public void doGet(HttpServletRequest request, diff --git a/src/org/torproject/ernie/web/RouterDetailServlet.java b/src/org/torproject/ernie/web/RouterDetailServlet.java index 5d71a5a..1012beb 100644 --- a/src/org/torproject/ernie/web/RouterDetailServlet.java +++ b/src/org/torproject/ernie/web/RouterDetailServlet.java @@ -1,11 +1,11 @@ package org.torproject.ernie.web; -import java.io.*; +import java.io.IOException; -import javax.servlet.*; -import javax.servlet.http.*; - -import org.apache.commons.lang.time.*; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; public class RouterDetailServlet extends HttpServlet { diff --git a/src/org/torproject/ernie/web/ServerDescriptorServlet.java b/src/org/torproject/ernie/web/ServerDescriptorServlet.java index a970971..8f549f8 100644 --- a/src/org/torproject/ernie/web/ServerDescriptorServlet.java +++ b/src/org/torproject/ernie/web/ServerDescriptorServlet.java @@ -1,16 +1,29 @@ package org.torproject.ernie.web; -import java.io.*; -import java.sql.*; -import java.text.*; -import java.util.*; -import java.util.logging.*; -import java.util.regex.*; - -import javax.naming.*; -import javax.servlet.*; -import javax.servlet.http.*; -import javax.sql.*; +import java.io.BufferedOutputStream; +import java.io.IOException; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.List; +import java.util.TimeZone; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NamingException; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.sql.DataSource; public class ServerDescriptorServlet extends HttpServlet { diff --git a/src/org/torproject/ernie/web/StatusServlet.java b/src/org/torproject/ernie/web/StatusServlet.java index f75ccba..2418419 100644 --- a/src/org/torproject/ernie/web/StatusServlet.java +++ b/src/org/torproject/ernie/web/StatusServlet.java @@ -1,8 +1,11 @@ package org.torproject.ernie.web; -import javax.servlet.*; -import javax.servlet.http.*; -import java.io.*; +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; public class StatusServlet extends HttpServlet { public void doGet(HttpServletRequest request, diff --git a/src/org/torproject/ernie/web/TableParameterChecker.java b/src/org/torproject/ernie/web/TableParameterChecker.java index 5b6f627..338b3f0 100644 --- a/src/org/torproject/ernie/web/TableParameterChecker.java +++ b/src/org/torproject/ernie/web/TableParameterChecker.java @@ -1,8 +1,13 @@ package org.torproject.ernie.web; -import java.text.*; -import java.util.*; -import java.util.regex.*; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.TimeZone; /** * Checks request parameters passed to generate tables. diff --git a/src/org/torproject/ernie/web/VotesServlet.java b/src/org/torproject/ernie/web/VotesServlet.java index 2f07e5d..13fd455 100644 --- a/src/org/torproject/ernie/web/VotesServlet.java +++ b/src/org/torproject/ernie/web/VotesServlet.java @@ -1,15 +1,27 @@ package org.torproject.ernie.web; -import java.io.*; -import java.sql.*; -import java.text.*; -import java.util.*; -import java.util.logging.*; +import java.io.BufferedOutputStream; +import java.io.IOException; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.List; +import java.util.TimeZone; +import java.util.logging.Level; +import java.util.logging.Logger; -import javax.naming.*; -import javax.servlet.*; -import javax.servlet.http.*; -import javax.sql.*; +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NamingException; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.sql.DataSource; public class VotesServlet extends HttpServlet {
participants (1)
-
karsten＠torproject.org