diff --git a/src/zutil/StringUtil.java b/src/zutil/StringUtil.java index 6cc454a8..3b975d51 100755 --- a/src/zutil/StringUtil.java +++ b/src/zutil/StringUtil.java @@ -24,8 +24,6 @@ package zutil; -import zutil.converter.Converter; - import java.util.ArrayList; import java.util.Iterator; import java.util.List; diff --git a/src/zutil/converter/Converter.java b/src/zutil/converter/Converter.java index 20db2424..3aaacee1 100755 --- a/src/zutil/converter/Converter.java +++ b/src/zutil/converter/Converter.java @@ -24,7 +24,6 @@ package zutil.converter; -import zutil.ByteUtil; import zutil.io.DynamicByteArrayStream; import zutil.parser.Base64Decoder; diff --git a/src/zutil/log/LogUtil.java b/src/zutil/log/LogUtil.java index 5e787c5c..4f5a70c4 100755 --- a/src/zutil/log/LogUtil.java +++ b/src/zutil/log/LogUtil.java @@ -30,8 +30,6 @@ import java.io.File; import java.io.FileInputStream; import java.util.logging.*; -import static java.lang.System.in; - /** * Utility functions for the standard Java Logger * diff --git a/src/zutil/net/dns/DNSPacket.java b/src/zutil/net/dns/DNSPacket.java index dc7dd997..c8de49d7 100755 --- a/src/zutil/net/dns/DNSPacket.java +++ b/src/zutil/net/dns/DNSPacket.java @@ -4,8 +4,6 @@ import zutil.parser.binary.BinaryStructInputStream; import zutil.parser.binary.BinaryStructOutputStream; import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/src/zutil/net/dns/MulticastDNSClient.java b/src/zutil/net/dns/MulticastDNSClient.java index 0564c446..462628d2 100755 --- a/src/zutil/net/dns/MulticastDNSClient.java +++ b/src/zutil/net/dns/MulticastDNSClient.java @@ -25,7 +25,6 @@ package zutil.net.dns; import zutil.ByteUtil; -import zutil.converter.Converter; import zutil.io.MultiPrintStream; import zutil.log.LogUtil; import zutil.net.threaded.ThreadedUDPNetwork; diff --git a/src/zutil/net/http/HttpClient.java b/src/zutil/net/http/HttpClient.java index 92163fb6..6b266d3a 100755 --- a/src/zutil/net/http/HttpClient.java +++ b/src/zutil/net/http/HttpClient.java @@ -26,7 +26,9 @@ package zutil.net.http; import zutil.net.http.HttpPrintStream.HttpMessageType; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.IOException; +import java.io.InputStream; import java.net.Socket; import java.net.URL; import java.util.HashMap; diff --git a/src/zutil/net/http/HttpHeader.java b/src/zutil/net/http/HttpHeader.java index a0af5ae6..fe59e96b 100755 --- a/src/zutil/net/http/HttpHeader.java +++ b/src/zutil/net/http/HttpHeader.java @@ -26,7 +26,6 @@ package zutil.net.http; import zutil.converter.Converter; -import java.io.BufferedReader; import java.io.InputStream; import java.util.HashMap; import java.util.Iterator; diff --git a/src/zutil/net/http/HttpHeaderParser.java b/src/zutil/net/http/HttpHeaderParser.java index 2aa5821e..0772d713 100755 --- a/src/zutil/net/http/HttpHeaderParser.java +++ b/src/zutil/net/http/HttpHeaderParser.java @@ -24,13 +24,13 @@ package zutil.net.http; -import com.mysql.jdbc.Buffer; import zutil.StringUtil; import zutil.io.IOUtil; import zutil.io.StringInputStream; import zutil.parser.URLDecoder; -import java.io.*; +import java.io.IOException; +import java.io.InputStream; import java.util.Map; import java.util.regex.Pattern; diff --git a/src/zutil/net/http/HttpServer.java b/src/zutil/net/http/HttpServer.java index 7f935118..be0fac56 100755 --- a/src/zutil/net/http/HttpServer.java +++ b/src/zutil/net/http/HttpServer.java @@ -29,7 +29,9 @@ import zutil.log.LogUtil; import zutil.net.threaded.ThreadedTCPNetworkServer; import zutil.net.threaded.ThreadedTCPNetworkServerThread; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.File; +import java.io.IOException; import java.net.Socket; import java.util.*; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/zutil/net/http/multipart/MultipartField.java b/src/zutil/net/http/multipart/MultipartField.java index 4dd03791..9dae5a43 100755 --- a/src/zutil/net/http/multipart/MultipartField.java +++ b/src/zutil/net/http/multipart/MultipartField.java @@ -25,8 +25,6 @@ package zutil.net.http.multipart; -import java.io.InputStream; - /** * A interface representing a single field in a multipart message. * diff --git a/src/zutil/net/http/multipart/MultipartParser.java b/src/zutil/net/http/multipart/MultipartParser.java index 6520e39e..5b438fa5 100755 --- a/src/zutil/net/http/multipart/MultipartParser.java +++ b/src/zutil/net/http/multipart/MultipartParser.java @@ -26,13 +26,12 @@ package zutil.net.http.multipart; import zutil.io.BufferedBoundaryInputStream; import zutil.io.IOUtil; -import zutil.io.NullWriter; import zutil.log.LogUtil; import zutil.net.http.HttpHeader; import zutil.net.http.HttpHeaderParser; -import javax.servlet.http.HttpServletRequest; -import java.io.*; +import java.io.IOException; +import java.io.InputStream; import java.util.HashMap; import java.util.Iterator; import java.util.logging.Level; diff --git a/src/zutil/net/http/multipart/MultipartStringField.java b/src/zutil/net/http/multipart/MultipartStringField.java index bb36940e..90b5a0e8 100755 --- a/src/zutil/net/http/multipart/MultipartStringField.java +++ b/src/zutil/net/http/multipart/MultipartStringField.java @@ -2,9 +2,7 @@ package zutil.net.http.multipart; import zutil.io.IOUtil; -import zutil.io.InputStreamCloser; -import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.util.Map; diff --git a/src/zutil/net/ssdp/SSDPServer.java b/src/zutil/net/ssdp/SSDPServer.java index b3924075..baece43c 100755 --- a/src/zutil/net/ssdp/SSDPServer.java +++ b/src/zutil/net/ssdp/SSDPServer.java @@ -25,7 +25,6 @@ package zutil.net.ssdp; import zutil.StringUtil; -import zutil.io.StringOutputStream; import zutil.log.LogUtil; import zutil.net.http.HttpHeader; import zutil.net.http.HttpHeaderParser; diff --git a/src/zutil/osal/app/linux/NutUPSClient.java b/src/zutil/osal/app/linux/NutUPSClient.java index 1fa708a5..4ce0df28 100755 --- a/src/zutil/osal/app/linux/NutUPSClient.java +++ b/src/zutil/osal/app/linux/NutUPSClient.java @@ -1,6 +1,5 @@ package zutil.osal.app.linux; -import zutil.StringUtil; import zutil.Timer; import zutil.log.LogUtil; @@ -8,7 +7,6 @@ import java.io.*; import java.net.Socket; import java.util.ArrayList; import java.util.HashMap; -import java.util.Objects; import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Matcher; diff --git a/src/zutil/parser/binary/BinaryFieldData.java b/src/zutil/parser/binary/BinaryFieldData.java index e3634188..fe383636 100755 --- a/src/zutil/parser/binary/BinaryFieldData.java +++ b/src/zutil/parser/binary/BinaryFieldData.java @@ -1,14 +1,16 @@ package zutil.parser.binary; -import java.lang.reflect.Field; -import java.nio.charset.StandardCharsets; -import java.util.*; - import zutil.ByteUtil; import zutil.ClassUtil; import zutil.converter.Converter; -import zutil.parser.binary.BinaryStruct.*; +import zutil.parser.binary.BinaryStruct.BinaryField; +import zutil.parser.binary.BinaryStruct.CustomBinaryField; +import zutil.parser.binary.BinaryStruct.VariableLengthBinaryField; + +import java.lang.reflect.Field; +import java.nio.charset.StandardCharsets; +import java.util.*; /** * A class representing each field in a BinaryStruct. diff --git a/test/zutil/algo/sort/MergeSortTest.java b/test/zutil/algo/sort/MergeSortTest.java index 11a18464..cd4bb6c9 100755 --- a/test/zutil/algo/sort/MergeSortTest.java +++ b/test/zutil/algo/sort/MergeSortTest.java @@ -24,7 +24,6 @@ package zutil.algo.sort; -import zutil.algo.sort.MergeSort; import zutil.algo.sort.sortable.SortableIntArray; // TODO: Convert to JUnit diff --git a/test/zutil/benchmark/LoopBenchmark.java b/test/zutil/benchmark/LoopBenchmark.java index 8e5300b7..486fa4e5 100755 --- a/test/zutil/benchmark/LoopBenchmark.java +++ b/test/zutil/benchmark/LoopBenchmark.java @@ -3,7 +3,6 @@ package zutil.benchmark; import com.carrotsearch.junitbenchmarks.BenchmarkRule; import org.junit.Rule; import org.junit.Test; -import zutil.StringUtil; public class LoopBenchmark { public static final int TEST_EXECUTIONS = 500; diff --git a/test/zutil/benchmark/StringSplitBenchmark.java b/test/zutil/benchmark/StringSplitBenchmark.java index 648f4bed..b3e0b731 100755 --- a/test/zutil/benchmark/StringSplitBenchmark.java +++ b/test/zutil/benchmark/StringSplitBenchmark.java @@ -1,12 +1,10 @@ package zutil.benchmark; -import com.carrotsearch.junitbenchmarks.BenchmarkOptions; import com.carrotsearch.junitbenchmarks.BenchmarkRule; import org.junit.Rule; import org.junit.Test; import zutil.StringUtil; -import java.util.ArrayList; import java.util.List; import java.util.regex.Pattern; diff --git a/test/zutil/converter/ConverterTest.java b/test/zutil/converter/ConverterTest.java index c5a4c7b0..0b8042cc 100755 --- a/test/zutil/converter/ConverterTest.java +++ b/test/zutil/converter/ConverterTest.java @@ -25,7 +25,6 @@ package zutil.converter; import org.junit.Test; -import zutil.converter.Converter; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/test/zutil/converter/NumberToWordsConverterTest.java b/test/zutil/converter/NumberToWordsConverterTest.java index 10c41ab2..8765d600 100755 --- a/test/zutil/converter/NumberToWordsConverterTest.java +++ b/test/zutil/converter/NumberToWordsConverterTest.java @@ -28,7 +28,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -import zutil.converter.NumberToWordsConverter; import java.util.Arrays; import java.util.Collection; diff --git a/test/zutil/net/ServerFindClientTest.java b/test/zutil/net/ServerFindClientTest.java index ff04d09d..c0c0a24d 100755 --- a/test/zutil/net/ServerFindClientTest.java +++ b/test/zutil/net/ServerFindClientTest.java @@ -24,8 +24,6 @@ package zutil.net; -import zutil.net.ServerFindClient; - import java.io.IOException; diff --git a/test/zutil/net/dns/DNSPacketTest.java b/test/zutil/net/dns/DNSPacketTest.java index 9b4393cb..e884bb7c 100755 --- a/test/zutil/net/dns/DNSPacketTest.java +++ b/test/zutil/net/dns/DNSPacketTest.java @@ -29,16 +29,15 @@ import zutil.converter.Converter; import zutil.parser.binary.BinaryStructInputStream; import zutil.parser.binary.BinaryStructOutputStream; -import static org.junit.Assert.assertTrue; -import static zutil.net.dns.DNSPacketQuestion.*; -import static zutil.net.dns.DNSPacketResource.*; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.*; +import static zutil.net.dns.DNSPacketQuestion.QCLASS_IN; +import static zutil.net.dns.DNSPacketQuestion.QTYPE_A; +import static zutil.net.dns.DNSPacketResource.CLASS_IN; +import static zutil.net.dns.DNSPacketResource.TYPE_A; /** * Created by Ziver diff --git a/test/zutil/net/http/multipart/MultipartParserTest.java b/test/zutil/net/http/multipart/MultipartParserTest.java index f5e9d252..7a648780 100755 --- a/test/zutil/net/http/multipart/MultipartParserTest.java +++ b/test/zutil/net/http/multipart/MultipartParserTest.java @@ -1,7 +1,6 @@ package zutil.net.http.multipart; import org.junit.Test; -import zutil.io.IOUtil; import zutil.io.StringInputStream; import java.io.IOException; diff --git a/test/zutil/net/ssdp/SSDPClientTest.java b/test/zutil/net/ssdp/SSDPClientTest.java index 7bef2459..f166421e 100755 --- a/test/zutil/net/ssdp/SSDPClientTest.java +++ b/test/zutil/net/ssdp/SSDPClientTest.java @@ -25,7 +25,6 @@ package zutil.net.ssdp; import zutil.log.LogUtil; -import zutil.net.ssdp.SSDPClient; import java.io.IOException; import java.util.logging.Level; diff --git a/test/zutil/net/ws/soap/SOAPTest.java b/test/zutil/net/ws/soap/SOAPTest.java index 7a815c55..29882368 100755 --- a/test/zutil/net/ws/soap/SOAPTest.java +++ b/test/zutil/net/ws/soap/SOAPTest.java @@ -27,7 +27,6 @@ package zutil.net.ws.soap; import org.dom4j.Document; import org.dom4j.io.OutputFormat; import org.dom4j.io.XMLWriter; - import zutil.net.ws.WSInterface; import zutil.net.ws.WSInterface.WSNamespace; import zutil.net.ws.WSReturnObject; diff --git a/test/zutil/parser/URLDecoderTest.java b/test/zutil/parser/URLDecoderTest.java index 5a419c21..52456b60 100755 --- a/test/zutil/parser/URLDecoderTest.java +++ b/test/zutil/parser/URLDecoderTest.java @@ -25,7 +25,6 @@ package zutil.parser; import org.junit.Test; -import zutil.parser.URLDecoder; import java.io.UnsupportedEncodingException; diff --git a/test/zutil/parser/binary/BinaryStructOutputStreamTest.java b/test/zutil/parser/binary/BinaryStructOutputStreamTest.java index 97c53f29..c267bacd 100755 --- a/test/zutil/parser/binary/BinaryStructOutputStreamTest.java +++ b/test/zutil/parser/binary/BinaryStructOutputStreamTest.java @@ -25,14 +25,11 @@ package zutil.parser.binary; import org.junit.Test; -import zutil.converter.Converter; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.nio.charset.StandardCharsets; -import static junit.framework.TestCase.assertEquals; import static org.junit.Assert.assertArrayEquals; diff --git a/test/zutil/parser/json/JSONParserTest.java b/test/zutil/parser/json/JSONParserTest.java index eb357322..0608f7c1 100755 --- a/test/zutil/parser/json/JSONParserTest.java +++ b/test/zutil/parser/json/JSONParserTest.java @@ -27,7 +27,6 @@ package zutil.parser.json; import org.junit.Test; import zutil.parser.DataNode; import zutil.parser.DataNode.DataType; -import zutil.parser.json.JSONParser; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/test/zutil/parser/json/JSONSerializerBenchmark.java b/test/zutil/parser/json/JSONSerializerBenchmark.java index 61845f40..22996155 100755 --- a/test/zutil/parser/json/JSONSerializerBenchmark.java +++ b/test/zutil/parser/json/JSONSerializerBenchmark.java @@ -31,8 +31,6 @@ import zutil.parser.json.JSONSerializerTest.TestClass; import java.io.*; -import static org.junit.Assert.assertEquals; - public class JSONSerializerBenchmark { private static final int TEST_EXECUTIONS = 2000;