Organize imports with common layout (bisq-network/style#2)

bisq-network · Mar 14, 2018 · dacb8e2 · dacb8e2
1 parent b38f852
commit dacb8e2
Show file tree

Hide file tree

Showing 12 changed files with 92 additions and 36 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/src/main/java/bisq/network/DnsLookupTor.java b/src/main/java/bisq/network/DnsLookupTor.java
@@ -19,11 +19,11 @@
 
 import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
 
-import java.io.IOException;
-
 import java.net.InetAddress;
 import java.net.Socket;
 
+import java.io.IOException;
+
 import java.util.HashMap;
 import java.util.Map;
 

diff --git a/src/main/java/bisq/network/crypto/EncryptionService.java b/src/main/java/bisq/network/crypto/EncryptionService.java
@@ -35,12 +35,12 @@
 
 import javax.inject.Inject;
 
+import javax.crypto.SecretKey;
+
 import java.security.KeyPair;
 import java.security.PrivateKey;
 import java.security.PublicKey;
 
-import javax.crypto.SecretKey;
-
 import lombok.extern.slf4j.Slf4j;
 
 import static bisq.common.crypto.Encryption.decryptSecretKey;

diff --git a/src/main/java/bisq/network/http/HttpClient.java b/src/main/java/bisq/network/http/HttpClient.java
@@ -36,15 +36,15 @@
 
 import javax.inject.Inject;
 
+import java.net.HttpURLConnection;
+import java.net.InetSocketAddress;
+import java.net.URL;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 
-import java.net.HttpURLConnection;
-import java.net.InetSocketAddress;
-import java.net.URL;
-
 import java.util.UUID;
 
 import lombok.Getter;

diff --git a/src/main/java/bisq/network/http/SocksConnectionSocketFactory.java b/src/main/java/bisq/network/http/SocksConnectionSocketFactory.java
@@ -21,12 +21,12 @@
 import org.apache.http.conn.socket.PlainConnectionSocketFactory;
 import org.apache.http.protocol.HttpContext;
 
-import java.io.IOException;
-
 import java.net.InetSocketAddress;
 import java.net.Proxy;
 import java.net.Socket;
 
+import java.io.IOException;
+
 // This class is adapted from
 //   http://stackoverflow.com/a/25203021/5616248
 //

diff --git a/src/main/java/bisq/network/http/SocksSSLConnectionSocketFactory.java b/src/main/java/bisq/network/http/SocksSSLConnectionSocketFactory.java
@@ -21,14 +21,14 @@
 import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
 import org.apache.http.protocol.HttpContext;
 
-import java.io.IOException;
-
 import javax.net.ssl.SSLContext;
 
 import java.net.InetSocketAddress;
 import java.net.Proxy;
 import java.net.Socket;
 
+import java.io.IOException;
+
 // This class is adapted from
 //   http://stackoverflow.com/a/25203021/5616248
 //

diff --git a/src/main/java/bisq/network/p2p/Utils.java b/src/main/java/bisq/network/p2p/Utils.java
@@ -17,10 +17,10 @@
 
 package bisq.network.p2p;
 
-import java.io.IOException;
-
 import java.net.ServerSocket;
 
+import java.io.IOException;
+
 import java.util.Random;
 
 public class Utils {

diff --git a/src/main/java/bisq/network/p2p/network/Connection.java b/src/main/java/bisq/network/p2p/network/Connection.java
@@ -54,17 +54,17 @@
 import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 
+import java.net.Socket;
+import java.net.SocketException;
+import java.net.SocketTimeoutException;
+
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InvalidClassException;
 import java.io.OptionalDataException;
 import java.io.StreamCorruptedException;
 
-import java.net.Socket;
-import java.net.SocketException;
-import java.net.SocketTimeoutException;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;

diff --git a/src/main/java/bisq/network/p2p/network/LocalhostNetworkNode.java b/src/main/java/bisq/network/p2p/network/LocalhostNetworkNode.java
@@ -23,11 +23,11 @@
 import bisq.common.app.Log;
 import bisq.common.proto.network.NetworkProtoResolver;
 
-import java.io.IOException;
-
 import java.net.ServerSocket;
 import java.net.Socket;
 
+import java.io.IOException;
+
 import java.util.concurrent.TimeUnit;
 
 import org.slf4j.Logger;

diff --git a/src/main/java/bisq/network/p2p/network/NetworkNode.java b/src/main/java/bisq/network/p2p/network/NetworkNode.java
@@ -37,12 +37,12 @@
 import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 
-import java.io.IOException;
-
 import java.net.ConnectException;
 import java.net.ServerSocket;
 import java.net.Socket;
 
+import java.io.IOException;
+
 import java.util.HashSet;
 import java.util.Optional;
 import java.util.Set;

diff --git a/src/main/java/bisq/network/p2p/network/Server.java b/src/main/java/bisq/network/p2p/network/Server.java
@@ -20,12 +20,12 @@
 import bisq.common.app.Log;
 import bisq.common.proto.network.NetworkProtoResolver;
 
-import java.io.IOException;
-
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketException;
 
+import java.io.IOException;
+
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 

diff --git a/src/main/java/bisq/network/p2p/network/TorNetworkNode.java b/src/main/java/bisq/network/p2p/network/TorNetworkNode.java
@@ -46,13 +46,13 @@
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 
+import java.net.Socket;
+
 import java.nio.file.Paths;
 
 import java.io.File;
 import java.io.IOException;
 
-import java.net.Socket;
-
 import java.util.Date;
 import java.util.List;
 import java.util.concurrent.TimeUnit;