From ac955c250f7bc27056107a3d9f9fcca41bb574b8 Mon Sep 17 00:00:00 2001
From: nathan <nathan@dorkbox.com>
Date: Fri, 15 Sep 2017 00:47:16 +0200
Subject: [PATCH] Reverted change to use Version (now uses string again).

---
 README.md                                     |  2 +-
 src/dorkbox/network/Broadcast.java            |  5 ++-
 src/dorkbox/network/Client.java               |  5 ++-
 src/dorkbox/network/DnsClient.java            |  5 ++-
 src/dorkbox/network/Server.java               |  5 ++-
 .../KryoCryptoSerializationManager.java       | 32 ++++++++++---------
 .../kryo/pool/KryoPoolBenchmarkTest.java      |  4 +--
 7 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/README.md b/README.md
index e308a499..676793c2 100644
--- a/README.md
+++ b/README.md
@@ -98,7 +98,7 @@ Maven Info
     <dependency>
       <groupId>com.dorkbox</groupId>
       <artifactId>Network</artifactId>
-      <version>1.27</version>
+      <version>1.28</version>
     </dependency>
 </dependencies>
 ```
diff --git a/src/dorkbox/network/Broadcast.java b/src/dorkbox/network/Broadcast.java
index dfdb08be..254d9286 100644
--- a/src/dorkbox/network/Broadcast.java
+++ b/src/dorkbox/network/Broadcast.java
@@ -31,7 +31,6 @@ 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;
@@ -54,8 +53,8 @@ class Broadcast {
      * Gets the version number.
      */
     public static
-    Version getVersion() {
-        return new Version("1.27");
+    String getVersion() {
+        return "1.28";
     }
 
     /**
diff --git a/src/dorkbox/network/Client.java b/src/dorkbox/network/Client.java
index c49af98f..ad3c61d4 100644
--- a/src/dorkbox/network/Client.java
+++ b/src/dorkbox/network/Client.java
@@ -35,7 +35,6 @@ 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;
@@ -67,8 +66,8 @@ class Client<C extends Connection> extends EndPointClient<C> implements Connecti
      * Gets the version number.
      */
     public static
-    Version getVersion() {
-        return new Version("1.27");
+    String getVersion() {
+        return "1.28";
     }
 
     /**
diff --git a/src/dorkbox/network/DnsClient.java b/src/dorkbox/network/DnsClient.java
index 7f882c1a..2785527c 100644
--- a/src/dorkbox/network/DnsClient.java
+++ b/src/dorkbox/network/DnsClient.java
@@ -44,7 +44,6 @@ 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.channel.AddressedEnvelope;
 import io.netty.channel.EventLoopGroup;
@@ -126,8 +125,8 @@ class DnsClient {
      * Gets the version number.
      */
     public static
-    Version getVersion() {
-        return new Version("1.27");
+    String getVersion() {
+        return "1.28";
     }
 
     /**
diff --git a/src/dorkbox/network/Server.java b/src/dorkbox/network/Server.java
index 4861c9df..55cf6f6e 100644
--- a/src/dorkbox/network/Server.java
+++ b/src/dorkbox/network/Server.java
@@ -29,7 +29,6 @@ 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;
@@ -64,8 +63,8 @@ class Server<C extends Connection> extends EndPointServer<C> {
      * Gets the version number.
      */
     public static
-    Version getVersion() {
-        return new Version("1.27");
+    String getVersion() {
+        return "1.28";
     }
 
     /**
diff --git a/src/dorkbox/network/connection/KryoCryptoSerializationManager.java b/src/dorkbox/network/connection/KryoCryptoSerializationManager.java
index e3535384..f94c6125 100644
--- a/src/dorkbox/network/connection/KryoCryptoSerializationManager.java
+++ b/src/dorkbox/network/connection/KryoCryptoSerializationManager.java
@@ -15,6 +15,20 @@
  */
 package dorkbox.network.connection;
 
+import java.io.IOException;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationHandler;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
+import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
+import org.bouncycastle.crypto.params.ECPublicKeyParameters;
+import org.bouncycastle.crypto.params.IESParameters;
+import org.bouncycastle.crypto.params.IESWithCipherParameters;
+import org.slf4j.Logger;
+
 import com.esotericsoftware.kryo.Kryo;
 import com.esotericsoftware.kryo.KryoException;
 import com.esotericsoftware.kryo.Serializer;
@@ -25,6 +39,7 @@ import com.esotericsoftware.kryo.io.Output;
 import com.esotericsoftware.kryo.serializers.CollectionSerializer;
 import com.esotericsoftware.kryo.serializers.FieldSerializer;
 import com.esotericsoftware.kryo.util.MapReferenceResolver;
+
 import dorkbox.network.connection.ping.PingMessage;
 import dorkbox.network.rmi.CachedMethod;
 import dorkbox.network.rmi.InvocationHandlerSerializer;
@@ -35,8 +50,8 @@ import dorkbox.network.rmi.InvokeMethodSerializer;
 import dorkbox.network.rmi.RemoteObjectSerializer;
 import dorkbox.network.rmi.RmiRegistration;
 import dorkbox.network.util.CryptoSerializationManager;
-import dorkbox.objectPool.ObjectPool;
-import dorkbox.objectPool.PoolableObject;
+import dorkbox.objectpool.ObjectPool;
+import dorkbox.objectpool.PoolableObject;
 import dorkbox.util.Property;
 import dorkbox.util.serialization.ArraysAsListSerializer;
 import dorkbox.util.serialization.EccPrivateKeySerializer;
@@ -47,19 +62,6 @@ import dorkbox.util.serialization.IesWithCipherParametersSerializer;
 import dorkbox.util.serialization.IgnoreSerialization;
 import dorkbox.util.serialization.UnmodifiableCollectionsSerializer;
 import io.netty.buffer.ByteBuf;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.crypto.params.IESParameters;
-import org.bouncycastle.crypto.params.IESWithCipherParameters;
-import org.slf4j.Logger;
-
-import java.io.IOException;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.InvocationHandler;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
 
 /**
  * Threads reading/writing, it messes up a single instance. it is possible to use a single kryo with the use of synchronize, however - that
diff --git a/test/dorkbox/network/kryo/pool/KryoPoolBenchmarkTest.java b/test/dorkbox/network/kryo/pool/KryoPoolBenchmarkTest.java
index a68ab0b1..5bd705c5 100644
--- a/test/dorkbox/network/kryo/pool/KryoPoolBenchmarkTest.java
+++ b/test/dorkbox/network/kryo/pool/KryoPoolBenchmarkTest.java
@@ -27,8 +27,8 @@ import org.junit.Test;
 import com.esotericsoftware.kryo.Kryo;
 
 import dorkbox.network.kryo.FieldSerializerTest;
-import dorkbox.objectPool.ObjectPool;
-import dorkbox.objectPool.PoolableObject;
+import dorkbox.objectpool.ObjectPool;
+import dorkbox.objectpool.PoolableObject;
 
 public
 class KryoPoolBenchmarkTest {