From 3e5d2da36649862f894bf8253e45b6102ba41174 Mon Sep 17 00:00:00 2001
From: CodeSteak <codesteak@shellf.art>
Date: Mon, 3 Jun 2019 18:40:37 +0200
Subject: [PATCH] change Connection API Option to Nullable, to match Kotlin's
 style

---
 .../controller/net/Connection.kt              | 29 ++++++++-----------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/client/src/main/kotlin/org/hso/texturesyncclient/controller/net/Connection.kt b/client/src/main/kotlin/org/hso/texturesyncclient/controller/net/Connection.kt
index e53ebab..1838b99 100644
--- a/client/src/main/kotlin/org/hso/texturesyncclient/controller/net/Connection.kt
+++ b/client/src/main/kotlin/org/hso/texturesyncclient/controller/net/Connection.kt
@@ -5,9 +5,8 @@ import javafx.scene.image.Image
 import org.hso.texturesyncclient.model.Sha256
 import org.hso.texturesyncclient.model.Texture
 import java.io.*
-import java.lang.IllegalArgumentException
-import java.lang.RuntimeException
-import java.net.*
+import java.net.InetAddress
+import java.net.Socket
 import java.util.*
 
 @Suppress("MemberVisibilityCanBePrivate")
@@ -96,7 +95,7 @@ class Connection(val address: InetAddress, val port: Int = 10796) : Closeable {
 
     @Throws(IOException::class, ConnectionException::class)
     @Synchronized
-    fun getTextureById(id: UUID): Optional<Texture> {
+    fun getTextureById(id: UUID): Texture? {
         val io = getStreams()
 
         val obj = JsonObject()
@@ -111,14 +110,12 @@ class Connection(val address: InetAddress, val port: Int = 10796) : Closeable {
         when (val pkg = Package.read(io.first)) {
             is JsonPackage -> {
                 return if (pkg.content.isJsonNull) {
-                    Optional.empty()
+                    null
                 } else {
                     try {
-                        Optional.of(
-                            Gson()
-                                .fromJson<InternalTexture>(pkg.content, InternalTexture::class.java)
-                                .toTexture()
-                        )
+                        Gson()
+                            .fromJson<InternalTexture>(pkg.content, InternalTexture::class.java)
+                            .toTexture()
                     } catch (e: JsonSyntaxException) {
                         throw ConnectionInvalidJsonException()
                     }
@@ -133,7 +130,7 @@ class Connection(val address: InetAddress, val port: Int = 10796) : Closeable {
 
     @Throws(IOException::class, ConnectionException::class)
     @Synchronized
-    fun getTextureByName(name: String): Optional<Texture> {
+    fun getTextureByName(name: String): Texture? {
         val io = getStreams()
 
         val obj = JsonObject()
@@ -148,14 +145,12 @@ class Connection(val address: InetAddress, val port: Int = 10796) : Closeable {
         when (val pkg = Package.read(io.first)) {
             is JsonPackage -> {
                 return if (pkg.content.isJsonNull) {
-                    Optional.empty()
+                    null
                 } else {
                     try {
-                        Optional.of(
-                            Gson()
-                                .fromJson<InternalTexture>(pkg.content, InternalTexture::class.java)
-                                .toTexture()
-                        )
+                        Gson()
+                            .fromJson<InternalTexture>(pkg.content, InternalTexture::class.java)
+                            .toTexture()
                     } catch (e: JsonSyntaxException) {
                         throw ConnectionInvalidJsonException()
                     }