diff --git a/src/zutil/chart/AbstractChart.java b/src/zutil/chart/AbstractChart.java index d3c201c..4c0162d 100755 --- a/src/zutil/chart/AbstractChart.java +++ b/src/zutil/chart/AbstractChart.java @@ -28,7 +28,6 @@ import zutil.log.LogUtil; import javax.swing.*; import java.awt.*; -import java.awt.geom.Line2D; import java.util.logging.Logger; public abstract class AbstractChart extends JPanel{ diff --git a/src/zutil/converter/Converter.java b/src/zutil/converter/Converter.java index 96b5b3a..33df967 100755 --- a/src/zutil/converter/Converter.java +++ b/src/zutil/converter/Converter.java @@ -24,7 +24,6 @@ package zutil.converter; -import zutil.io.DynamicByteArrayStream; import zutil.parser.Base64Decoder; import java.io.*; diff --git a/src/zutil/db/bean/DBBeanCache.java b/src/zutil/db/bean/DBBeanCache.java index 5f15a11..f997f8f 100755 --- a/src/zutil/db/bean/DBBeanCache.java +++ b/src/zutil/db/bean/DBBeanCache.java @@ -5,8 +5,6 @@ import zutil.log.LogUtil; import java.lang.ref.WeakReference; import java.util.Iterator; import java.util.Map; -import java.util.Timer; -import java.util.TimerTask; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; diff --git a/src/zutil/db/bean/DBBeanSQLResultHandler.java b/src/zutil/db/bean/DBBeanSQLResultHandler.java index f0fb754..217343a 100755 --- a/src/zutil/db/bean/DBBeanSQLResultHandler.java +++ b/src/zutil/db/bean/DBBeanSQLResultHandler.java @@ -34,7 +34,8 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import java.util.*; +import java.util.LinkedList; +import java.util.List; import java.util.logging.Logger; diff --git a/src/zutil/net/InetScanner.java b/src/zutil/net/InetScanner.java index f4c9b30..70d2c92 100755 --- a/src/zutil/net/InetScanner.java +++ b/src/zutil/net/InetScanner.java @@ -3,15 +3,8 @@ package zutil.net; import zutil.osal.MultiCommandExecutor; import zutil.osal.OSAbstractionLayer; -import java.io.*; -import java.net.Inet4Address; +import java.io.IOException; import java.net.InetAddress; -import java.net.NetworkInterface; -import java.net.SocketException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Enumeration; -import java.util.List; /** * This class is a IPv4 scanner, it will scan a diff --git a/src/zutil/net/mqtt/packet/MqttPacketConnect.java b/src/zutil/net/mqtt/packet/MqttPacketConnect.java index dbe475d..3083330 100755 --- a/src/zutil/net/mqtt/packet/MqttPacketConnect.java +++ b/src/zutil/net/mqtt/packet/MqttPacketConnect.java @@ -1,7 +1,5 @@ package zutil.net.mqtt.packet; -import zutil.parser.binary.BinaryStruct; - /** * This packet is the first message sent from a Client when it * has established a connection to a Server. A Client can only diff --git a/src/zutil/net/mqtt/packet/MqttPacketConnectAck.java b/src/zutil/net/mqtt/packet/MqttPacketConnectAck.java index f20d8ed..b620097 100755 --- a/src/zutil/net/mqtt/packet/MqttPacketConnectAck.java +++ b/src/zutil/net/mqtt/packet/MqttPacketConnectAck.java @@ -1,7 +1,5 @@ package zutil.net.mqtt.packet; -import zutil.parser.binary.BinaryStruct; - /** * The CONNACK Packet is the packet sent by the Server in response to a * CONNECT Packet received from a Client. diff --git a/src/zutil/net/mqtt/packet/MqttPacketPingReq.java b/src/zutil/net/mqtt/packet/MqttPacketPingReq.java index 3770bb7..232ffa7 100755 --- a/src/zutil/net/mqtt/packet/MqttPacketPingReq.java +++ b/src/zutil/net/mqtt/packet/MqttPacketPingReq.java @@ -1,7 +1,5 @@ package zutil.net.mqtt.packet; -import zutil.parser.binary.BinaryStruct; - /** * The PINGREQ Packet is used in Keep Alive processing * diff --git a/src/zutil/net/nio/NioServer.java b/src/zutil/net/nio/NioServer.java index 256c322..5ded91d 100755 --- a/src/zutil/net/nio/NioServer.java +++ b/src/zutil/net/nio/NioServer.java @@ -31,7 +31,6 @@ import java.nio.channels.SelectionKey; import java.nio.channels.Selector; import java.nio.channels.ServerSocketChannel; import java.nio.channels.spi.SelectorProvider; -import java.util.Iterator; public class NioServer extends NioNetwork{ diff --git a/src/zutil/net/nio/worker/StandardWorker.java b/src/zutil/net/nio/worker/StandardWorker.java index 30a4f15..5d55f22 100755 --- a/src/zutil/net/nio/worker/StandardWorker.java +++ b/src/zutil/net/nio/worker/StandardWorker.java @@ -27,7 +27,6 @@ package zutil.net.nio.worker; import zutil.converter.Converter; import zutil.log.LogUtil; import zutil.net.nio.NioNetwork; -import zutil.net.nio.message.Message; import zutil.net.nio.message.EchoMessage; import zutil.net.nio.response.RequestResponseMessage; import zutil.net.nio.response.ResponseHandler; diff --git a/src/zutil/net/nio/worker/Worker.java b/src/zutil/net/nio/worker/Worker.java index 622b545..3e9f6d2 100755 --- a/src/zutil/net/nio/worker/Worker.java +++ b/src/zutil/net/nio/worker/Worker.java @@ -28,7 +28,6 @@ import zutil.net.nio.NioNetwork; import java.net.SocketAddress; import java.util.LinkedList; -import java.util.List; public abstract class Worker { diff --git a/src/zutil/net/nio/worker/WorkerEventData.java b/src/zutil/net/nio/worker/WorkerEventData.java index 6b52934..8eb5d0b 100755 --- a/src/zutil/net/nio/worker/WorkerEventData.java +++ b/src/zutil/net/nio/worker/WorkerEventData.java @@ -27,7 +27,6 @@ package zutil.net.nio.worker; import zutil.net.nio.NioNetwork; import java.net.SocketAddress; -import java.nio.channels.SocketChannel; public class WorkerEventData { diff --git a/src/zutil/net/torrent/TorrentMetainfo.java b/src/zutil/net/torrent/TorrentMetainfo.java index 3d46960..f21368c 100755 --- a/src/zutil/net/torrent/TorrentMetainfo.java +++ b/src/zutil/net/torrent/TorrentMetainfo.java @@ -24,13 +24,11 @@ package zutil.net.torrent; -import zutil.io.MultiPrintStream; import zutil.io.file.FileUtil; import zutil.parser.BEncodedParser; import zutil.parser.DataNode; import java.io.File; -import java.io.FileNotFoundException; import java.io.IOException; import java.text.ParseException; import java.util.ArrayList; diff --git a/src/zutil/net/ws/WSMethodDef.java b/src/zutil/net/ws/WSMethodDef.java index 996b5d3..ecff792 100755 --- a/src/zutil/net/ws/WSMethodDef.java +++ b/src/zutil/net/ws/WSMethodDef.java @@ -29,14 +29,13 @@ import zutil.net.ws.WSInterface.WSNamespace; import java.lang.annotation.Annotation; import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; /** * This is a web service method definition class - * + * * @author Ziver */ // TODO: Header parameters diff --git a/src/zutil/osal/MultiCommandExecutor.java b/src/zutil/osal/MultiCommandExecutor.java index 5ba7bc2..92ad5b5 100644 --- a/src/zutil/osal/MultiCommandExecutor.java +++ b/src/zutil/osal/MultiCommandExecutor.java @@ -4,7 +4,6 @@ import zutil.parser.Base64Encoder; import java.io.*; import java.security.SecureRandom; -import java.security.Security; /** * This class starts a platform specific shell and runs all commands diff --git a/src/zutil/osal/linux/app/ProcNetArp.java b/src/zutil/osal/linux/app/ProcNetArp.java index 2d1de03..3ba0e7d 100755 --- a/src/zutil/osal/linux/app/ProcNetArp.java +++ b/src/zutil/osal/linux/app/ProcNetArp.java @@ -32,8 +32,6 @@ import java.io.BufferedReader; import java.io.FileReader; import java.io.IOException; import java.net.InetAddress; -import java.net.NetworkInterface; -import java.net.UnknownHostException; import java.util.Collection; import java.util.HashMap; import java.util.logging.Level; diff --git a/src/zutil/osal/macos/OsalMacOSImpl.java b/src/zutil/osal/macos/OsalMacOSImpl.java index fcf975a..c8b571b 100755 --- a/src/zutil/osal/macos/OsalMacOSImpl.java +++ b/src/zutil/osal/macos/OsalMacOSImpl.java @@ -24,7 +24,6 @@ package zutil.osal.macos; -import com.mysql.jdbc.NotImplemented; import zutil.osal.HardwareAbstractionLayer; import zutil.osal.OSAbstractionLayer; diff --git a/src/zutil/parser/BEncodedParser.java b/src/zutil/parser/BEncodedParser.java index 0c46c46..3dea590 100755 --- a/src/zutil/parser/BEncodedParser.java +++ b/src/zutil/parser/BEncodedParser.java @@ -27,7 +27,6 @@ package zutil.parser; import zutil.parser.DataNode.DataType; import zutil.struct.MutableInt; -import java.nio.charset.MalformedInputException; import java.text.ParseException; /** diff --git a/test/zutil/CronTimerTest.java b/test/zutil/CronTimerTest.java index 7fc19fa..caeb2a5 100755 --- a/test/zutil/CronTimerTest.java +++ b/test/zutil/CronTimerTest.java @@ -6,7 +6,8 @@ import java.util.Arrays; import java.util.Collections; import java.util.TimeZone; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; /** * diff --git a/test/zutil/db/bean/DBBeanDeleteTest.java b/test/zutil/db/bean/DBBeanDeleteTest.java index 78202d6..a54ab2b 100755 --- a/test/zutil/db/bean/DBBeanDeleteTest.java +++ b/test/zutil/db/bean/DBBeanDeleteTest.java @@ -11,7 +11,6 @@ import java.util.logging.Level; import static junit.framework.TestCase.assertNull; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; import static zutil.db.bean.DBBeanTestBase.*; /** diff --git a/test/zutil/db/bean/DBBeanSaveTest.java b/test/zutil/db/bean/DBBeanSaveTest.java index 27b2b68..10077ff 100755 --- a/test/zutil/db/bean/DBBeanSaveTest.java +++ b/test/zutil/db/bean/DBBeanSaveTest.java @@ -10,7 +10,7 @@ import zutil.log.LogUtil; import java.sql.SQLException; import java.util.logging.Level; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import static zutil.db.bean.DBBeanTestBase.*; /** diff --git a/test/zutil/log/CounterManagerTest.java b/test/zutil/log/CounterManagerTest.java index 3062973..b51620c 100644 --- a/test/zutil/log/CounterManagerTest.java +++ b/test/zutil/log/CounterManagerTest.java @@ -27,7 +27,8 @@ package zutil.log; import org.junit.Test; import zutil.log.CounterManager.Counter; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; public class CounterManagerTest { diff --git a/test/zutil/math/MatrixTest.java b/test/zutil/math/MatrixTest.java index dd9af15..5f5e9d2 100755 --- a/test/zutil/math/MatrixTest.java +++ b/test/zutil/math/MatrixTest.java @@ -2,7 +2,8 @@ package zutil.math; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; /** * diff --git a/test/zutil/ml/LinearRegressionTest.java b/test/zutil/ml/LinearRegressionTest.java index 110a65d..a96c8d6 100755 --- a/test/zutil/ml/LinearRegressionTest.java +++ b/test/zutil/ml/LinearRegressionTest.java @@ -2,7 +2,8 @@ package zutil.ml; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; /** * Test cases are from the Machine Learning course on coursera. diff --git a/test/zutil/net/http/HttpTestUtil.java b/test/zutil/net/http/HttpTestUtil.java index bd975b1..a67d70a 100755 --- a/test/zutil/net/http/HttpTestUtil.java +++ b/test/zutil/net/http/HttpTestUtil.java @@ -1,7 +1,6 @@ package zutil.net.http; import zutil.io.StringOutputStream; -import zutil.net.http.page.HttpDigestAuthPageTest; import java.io.IOException; import java.util.HashMap; diff --git a/test/zutil/net/http/page/HttpDigestAuthPageTest.java b/test/zutil/net/http/page/HttpDigestAuthPageTest.java index 9911db2..afe1932 100755 --- a/test/zutil/net/http/page/HttpDigestAuthPageTest.java +++ b/test/zutil/net/http/page/HttpDigestAuthPageTest.java @@ -1,9 +1,6 @@ package zutil.net.http.page; -import static org.hamcrest.CoreMatchers.*; - import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import zutil.Hasher; import zutil.io.IOUtil; @@ -13,6 +10,8 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.*; /** diff --git a/test/zutil/net/http/page/HttpJsonPageTest.java b/test/zutil/net/http/page/HttpJsonPageTest.java index f5f7714..0d8cff9 100755 --- a/test/zutil/net/http/page/HttpJsonPageTest.java +++ b/test/zutil/net/http/page/HttpJsonPageTest.java @@ -9,7 +9,7 @@ import zutil.parser.DataNode; import java.io.IOException; import java.util.Map; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; /** * @author Ziver on 2016-11-04. diff --git a/test/zutil/net/mqtt/packet/MqttPacketConnectTest.java b/test/zutil/net/mqtt/packet/MqttPacketConnectTest.java index a18ea6a..15e42f3 100755 --- a/test/zutil/net/mqtt/packet/MqttPacketConnectTest.java +++ b/test/zutil/net/mqtt/packet/MqttPacketConnectTest.java @@ -2,7 +2,6 @@ package zutil.net.mqtt.packet; import org.junit.Test; import zutil.converter.Converter; -import zutil.net.mqtt.packet.MqttPacketConnect; import zutil.parser.binary.BinaryStructInputStream; import zutil.parser.binary.BinaryStructOutputStream; diff --git a/test/zutil/net/nio/NetworkClientTest.java b/test/zutil/net/nio/NetworkClientTest.java index 30578e7..e217a8c 100755 --- a/test/zutil/net/nio/NetworkClientTest.java +++ b/test/zutil/net/nio/NetworkClientTest.java @@ -26,14 +26,13 @@ package zutil.net.nio; import zutil.log.CompactLogFormatter; import zutil.log.LogUtil; -import zutil.net.nio.response.StringResponseMessage; import zutil.net.nio.response.PrintResponseHandler; +import zutil.net.nio.response.StringResponseMessage; import zutil.net.nio.worker.StandardWorker; import java.io.IOException; import java.net.InetAddress; import java.security.NoSuchAlgorithmException; -import java.util.logging.Level; @SuppressWarnings("unused") diff --git a/test/zutil/net/nio/NetworkServerTest.java b/test/zutil/net/nio/NetworkServerTest.java index c2ad4f7..d757377 100755 --- a/test/zutil/net/nio/NetworkServerTest.java +++ b/test/zutil/net/nio/NetworkServerTest.java @@ -30,7 +30,6 @@ import zutil.net.nio.worker.StandardWorker; import java.io.IOException; import java.security.NoSuchAlgorithmException; -import java.util.logging.Level; @SuppressWarnings("unused") diff --git a/test/zutil/net/smtp/EmailTest.java b/test/zutil/net/smtp/EmailTest.java index 6a03d1f..cdc2323 100755 --- a/test/zutil/net/smtp/EmailTest.java +++ b/test/zutil/net/smtp/EmailTest.java @@ -8,7 +8,7 @@ import java.io.OutputStreamWriter; import java.util.Date; import java.util.GregorianCalendar; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import static zutil.net.smtp.SmtpClient.NEWLINE; /** diff --git a/test/zutil/net/torrent/TorrentMetainfoTest.java b/test/zutil/net/torrent/TorrentMetainfoTest.java index edc6c3c..b6c9ab7 100755 --- a/test/zutil/net/torrent/TorrentMetainfoTest.java +++ b/test/zutil/net/torrent/TorrentMetainfoTest.java @@ -4,7 +4,8 @@ import org.junit.Test; import java.text.ParseException; -import static org.junit.Assert.*; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; /** * Created by Ziver on 2016-09-27. diff --git a/test/zutil/net/ws/rest/RestHttpPageTest.java b/test/zutil/net/ws/rest/RestHttpPageTest.java index 124057c..547ee22 100755 --- a/test/zutil/net/ws/rest/RestHttpPageTest.java +++ b/test/zutil/net/ws/rest/RestHttpPageTest.java @@ -5,7 +5,7 @@ import zutil.net.ws.WSInterface; import java.util.HashMap; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; /** * Created by Ziver on 2016-09-27. diff --git a/test/zutil/osal/linux/app/ProcNetArpTest.java b/test/zutil/osal/linux/app/ProcNetArpTest.java index eca23f9..3be707b 100755 --- a/test/zutil/osal/linux/app/ProcNetArpTest.java +++ b/test/zutil/osal/linux/app/ProcNetArpTest.java @@ -4,11 +4,10 @@ import org.junit.Test; import zutil.io.StringInputStream; import java.io.BufferedReader; -import java.io.FileInputStream; import java.io.InputStreamReader; import java.net.InetAddress; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; /** * Created by ezivkoc on 2016-09-30.