Change requested implementations in RCON service.

Only pass true to start if start and login are succesful
But than always start Impl
Also quit if port is no valid number

Author: strifel

src/main/scala/org/codeoverflow/chatoverflow/requirement/service/rcon/RconConnector.scala

@@ -1,6 +1,6 @@
 package org.codeoverflow.chatoverflow.requirement.service.rcon
 
-import java.io.{DataInputStream, InputStream, OutputStream}
+import java.io.{DataInputStream, IOException, InputStream, OutputStream}
 import java.net.{Socket, SocketException}
 import java.nio.{ByteBuffer, ByteOrder}
 import java.util.Random
@@ -16,13 +16,8 @@ class RconConnector(override val sourceIdentifier: String) extends Connector(sou
   private var outputStream: OutputStream = _
   private var inputStream: InputStream = _
   private var requestId: Int = 0
-  private var loggedIn = false
 
   def sendCommand(command: String): String = {
-    if (!loggedIn) {
-      logger error "Could not execute RCON Command due to wrong password or no connection"
-      return null
-    }
     logger debug s"Sending $command to RCON"
     requestId += 1
     if (write(2, command.getBytes("ASCII"))) {
@@ -39,32 +34,50 @@ class RconConnector(override val sourceIdentifier: String) extends Connector(sou
     logger info s"Starting rcon connection to ${credentials.get.getValue("address").get}"
     var port: Int = 25575
     if (credentials.get.exists("port")) {
-      port = credentials.get.getValue("port").get.toInt
+      try{
+        port = credentials.get.getValue("port").get.toInt
+      } catch {
+        case e: NumberFormatException => {
+          logger error "Please enter a valid port"
+          return false
+        }
+      }
       if (port < 1 || port > 65535) {
+        logger error "Please enter a valid port"
+        return false
+      }
+    }
+    try {
+      socket = new Socket(credentials.get.getValue("address").get, port)
+      socket.setKeepAlive(true)
+      outputStream = socket.getOutputStream
+      inputStream = socket.getInputStream
+    } catch {
+      case e: IOException => {
+        logger error "No Connection to RCON Server. Is it up?"
         return false
       }
     }
-    socket = new Socket(credentials.get.getValue("address").get, port)
-    socket.setKeepAlive(true)
-    outputStream = socket.getOutputStream
-    inputStream = socket.getInputStream
-    login()
+    val loggedIn = login()
+    // Sleeping here to allow the (minecraft) server to start its own rcon procedure. Otherwise it caused errors in my tests.
     Thread.sleep(5000)
-    true
+    loggedIn
   }
 
-  private def login(): Unit = {
+  private def login(): Boolean = {
     requestId = new Random().nextInt(Integer.MAX_VALUE)
     logger info "Logging RCON in..."
     val password = credentials.get.getValue("password").get
     if (write(3, password.getBytes("ASCII"))) {
       if (read() == null) {
         logger error "Could not log in to RCON Server. Password is Wrong!"
+        return false
       } else {
         logger debug "Login to RCON was successful"
-        loggedIn = true
+        return true
       }
     }
+    false
   }
 
   private def write(packageType: Int, payload: Array[Byte]): Boolean = {
@@ -83,10 +96,6 @@ class RconConnector(override val sourceIdentifier: String) extends Connector(sou
       outputStream.write(byteBuffer.array())
       outputStream.flush()
     } catch {
-      case e: NullPointerException => {
-        logger error "There was and is no Connection to the RCON Server, please try restarting."
-        return false
-      }
       case e: SocketException => {
         logger error "Connection Error to RCON Server. This request will not be sended!"
         return false
@@ -116,13 +125,11 @@ class RconConnector(override val sourceIdentifier: String) extends Connector(sou
     }
   }
 
-  private[rcon] def isLoggedIn: Boolean = loggedIn
-
   /**
     * This stops the activity of the connector, e.g. by closing the platform connection.
     */
   override def stop(): Boolean = {
-    logger info s"Stopped RCON connector to ${credentials.get.getValue("address")}!"
+    logger info s"Stopped RCON connector to ${credentials.get.getValue("address").get}!"
     socket.close()
     true
   }

src/main/scala/org/codeoverflow/chatoverflow/requirement/service/rcon/impl/RconInputImpl.scala

@@ -15,7 +15,7 @@ class RconInputImpl extends InputImpl[RconConnector] with RconInput with WithLog
     *
     * @return true if starting the input was successful, false if some problems occurred
     */
-  override def start(): Boolean = sourceConnector.get.isLoggedIn
+  override def start(): Boolean = true
 
   override def stop(): Boolean = true
 }

src/main/scala/org/codeoverflow/chatoverflow/requirement/service/rcon/impl/RconOutputImpl.scala

@@ -17,7 +17,7 @@ class RconOutputImpl extends OutputImpl[RconConnector] with RconOutput with With
     *
     * @return true if starting the input was successful, false if some problems occurred
     */
-  override def start(): Boolean = sourceConnector.get.isLoggedIn
+  override def start(): Boolean = true
 
   /**
     * Stops the output, called before source connector will shutdown