diff --git a/src/dorkbox/network/Broadcast.java b/src/dorkbox/network/Broadcast.java index 3877bab5..de0c8421 100644 --- a/src/dorkbox/network/Broadcast.java +++ b/src/dorkbox/network/Broadcast.java @@ -15,8 +15,23 @@ */ package dorkbox.network; +import java.net.Inet6Address; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.InterfaceAddress; +import java.net.NetworkInterface; +import java.net.SocketException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Enumeration; +import java.util.List; +import java.util.concurrent.TimeUnit; + +import org.slf4j.Logger; + import dorkbox.network.pipeline.discovery.ClientDiscoverHostHandler; import dorkbox.network.pipeline.discovery.ClientDiscoverHostInitializer; +import dorkbox.util.Version; import io.netty.bootstrap.Bootstrap; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -26,14 +41,6 @@ import io.netty.channel.ChannelOption; import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.DatagramPacket; import io.netty.channel.socket.nio.NioDatagramChannel; -import org.slf4j.Logger; - -import java.net.*; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Enumeration; -import java.util.List; -import java.util.concurrent.TimeUnit; @SuppressWarnings({"unused", "AutoBoxing"}) public final @@ -47,8 +54,8 @@ class Broadcast { * Gets the version number. */ public static - String getVersion() { - return "1.22"; + Version getVersion() { + return new Version("1.22"); } /** diff --git a/src/dorkbox/network/Client.java b/src/dorkbox/network/Client.java index 2494f867..3f0af334 100644 --- a/src/dorkbox/network/Client.java +++ b/src/dorkbox/network/Client.java @@ -15,6 +15,11 @@ */ package dorkbox.network; +import java.io.IOException; +import java.net.InetSocketAddress; + +import org.slf4j.Logger; + import dorkbox.network.connection.BootstrapWrapper; import dorkbox.network.connection.Connection; import dorkbox.network.connection.EndPoint; @@ -30,6 +35,7 @@ import dorkbox.network.rmi.TimeoutException; import dorkbox.network.util.udt.UdtEndpointProxy; import dorkbox.util.NamedThreadFactory; import dorkbox.util.OS; +import dorkbox.util.Version; import dorkbox.util.exceptions.InitializationException; import dorkbox.util.exceptions.SecurityException; import io.netty.bootstrap.Bootstrap; @@ -49,10 +55,6 @@ import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.channel.socket.oio.OioDatagramChannel; import io.netty.channel.socket.oio.OioSocketChannel; import io.netty.util.internal.PlatformDependent; -import org.slf4j.Logger; - -import java.io.IOException; -import java.net.InetSocketAddress; /** * The client is both SYNC and ASYNC. It starts off SYNC (blocks thread until it's done), then once it's connected to the server, it's @@ -65,8 +67,8 @@ class Client extends EndPointClient implements Connecti * Gets the version number. */ public static - String getVersion() { - return "1.22"; + Version getVersion() { + return new Version("1.22"); } /** diff --git a/src/dorkbox/network/DnsClient.java b/src/dorkbox/network/DnsClient.java index 242cd0dd..fcd9ea8c 100644 --- a/src/dorkbox/network/DnsClient.java +++ b/src/dorkbox/network/DnsClient.java @@ -15,6 +15,21 @@ */ package dorkbox.network; +import java.net.IDN; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.security.AccessControlException; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; + +import org.slf4j.Logger; + import dorkbox.network.connection.EndPoint; import dorkbox.network.dns.decoder.DomainDecoder; import dorkbox.network.dns.decoder.MailExchangerDecoder; @@ -28,6 +43,7 @@ import dorkbox.network.dns.record.StartOfAuthorityRecord; import dorkbox.util.NamedThreadFactory; import dorkbox.util.OS; import dorkbox.util.Property; +import dorkbox.util.Version; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufHolder; import io.netty.channel.AddressedEnvelope; @@ -52,20 +68,6 @@ import io.netty.resolver.dns.DnsNameResolverBuilder; import io.netty.resolver.dns.DnsServerAddresses; import io.netty.util.concurrent.Future; import io.netty.util.internal.PlatformDependent; -import org.slf4j.Logger; - -import java.net.IDN; -import java.net.InetAddress; -import java.net.InetSocketAddress; -import java.security.AccessControlException; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.concurrent.TimeUnit; /** * for now, we only support ipv4 @@ -113,8 +115,8 @@ class DnsClient { * Gets the version number. */ public static - String getVersion() { - return "1.22"; + Version getVersion() { + return new Version("1.22"); } /** diff --git a/src/dorkbox/network/Server.java b/src/dorkbox/network/Server.java index b8ff752c..6f0652f0 100644 --- a/src/dorkbox/network/Server.java +++ b/src/dorkbox/network/Server.java @@ -15,6 +15,10 @@ */ package dorkbox.network; +import java.io.IOException; + +import org.slf4j.Logger; + import dorkbox.network.connection.Connection; import dorkbox.network.connection.EndPointServer; import dorkbox.network.connection.registration.local.RegistrationLocalHandlerServer; @@ -25,6 +29,7 @@ import dorkbox.network.util.udt.UdtEndpointProxy; import dorkbox.util.NamedThreadFactory; import dorkbox.util.OS; import dorkbox.util.Property; +import dorkbox.util.Version; import dorkbox.util.exceptions.InitializationException; import dorkbox.util.exceptions.SecurityException; import io.netty.bootstrap.Bootstrap; @@ -46,9 +51,6 @@ import io.netty.channel.socket.nio.NioDatagramChannel; import io.netty.channel.socket.nio.NioServerSocketChannel; import io.netty.channel.socket.oio.OioDatagramChannel; import io.netty.channel.socket.oio.OioServerSocketChannel; -import org.slf4j.Logger; - -import java.io.IOException; /** * The server can only be accessed in an ASYNC manner. This means that the server can only be used in RESPONSE to events. If you access the @@ -62,8 +64,8 @@ class Server extends EndPointServer { * Gets the version number. */ public static - String getVersion() { - return "1.22"; + Version getVersion() { + return new Version("1.22"); } /**