Various code optimisations

Author: Petar Kresoja

build/built-jar.properties

@@ -1,4 +1,4 @@
-#Sat, 11 Apr 2020 21:07:01 +0200
+#Tue, 07 Jul 2020 03:47:28 +0200
 
 
 C\:\\Users\\petar\\Documents\\NetBeansProjects\\JavaRcon=

build/classes/javarcon/CustomRcon.class

@@ -0,0 +1,6 @@
+#JavaRcon configuration file.
+#Created by: Pequla ( https://pequla.github.io/ )
+#Tue Jul 07 03:22:40 CEST 2020
+rcon.password=password
+rcon.port=25575
+rcon.host=localhost

build/classes/javarcon/JavaRcon.class

@@ -2,8 +2,6 @@
 <project-private xmlns="http://www.netbeans.org/ns/project-private/1">
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
-        <group>
-            <file>file:/C:/Users/petar/Documents/NetBeansProjects/JavaRcon/src/javarcon/JavaRcon.java</file>
-        </group>
+        <group/>
     </open-files>
 </project-private>

config.properties

@@ -29,7 +29,7 @@ dist.jar=${dist.dir}/JavaRcon.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.rkon-core-1.1.2.jar=C:\\Users\\petar\\Documents\\Libraries\\rkon-core-1.1.2.jar
+file.reference.rkon-core-1.1.2.jar=lib/rkon-core-1.1.2.jar
 includes=**
 jar.compress=false
 javac.classpath=\

dist/JavaRcon.jar

@@ -0,0 +1,82 @@
+package javarcon;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.util.Properties;
+import net.kronos.rkon.core.Rcon;
+import net.kronos.rkon.core.ex.AuthenticationException;
+
+public class CustomRcon extends Rcon {
+
+    private static CustomRcon instance;
+
+    private CustomRcon(String host, int port, byte[] password) throws IOException, AuthenticationException {
+        super(host, port, password);
+    }
+
+    public static CustomRcon getInstance() throws IOException, AuthenticationException {
+        if (instance == null) {
+
+            //Variable declaration
+            String host;
+            int port;
+            byte[] password;
+
+            //Reading configuration from file
+            File config = new File("config.properties");
+            Properties prop = new Properties();
+            if (!config.exists()) {
+                try (OutputStream output = new FileOutputStream(config)) {
+                    prop.setProperty("rcon.host", "localhost");
+                    prop.setProperty("rcon.port", "25575");
+                    prop.setProperty("rcon.password", "password");
+                    prop.store(output, "JavaRcon configuration file." + System.lineSeparator() + "Created by: Pequla ( https://pequla.github.io/ )");
+                }
+            }
+            try (InputStream input = new FileInputStream(config)) {
+                prop.load(input);
+                host = prop.getProperty("rcon.host", "localhost");
+                port = Integer.valueOf(prop.getProperty("rcon.port", "25575"));
+                password = prop.getProperty("rcon.password", "password").getBytes();
+            }
+
+            //Constructing the instance
+            instance = new CustomRcon(host, port, password);
+        }
+        //Returns the instance
+        return instance;
+    }
+
+    //Short-circuit evaluation
+    private static boolean empty(final String s) {
+        return s == null || s.trim().isEmpty();
+    }
+
+    @Override
+    public String command(String payload) throws IOException {
+        String uc = "Unknown command";
+        if (!empty(payload)) {
+            String response = super.command(payload);
+            if (empty(response)) {
+                return "No command response";
+            }
+            if (response.startsWith(uc)) {
+                return uc;
+            }
+            return response;
+        }
+        return uc;
+    }
+
+    @Override
+    public String toString() {
+        Socket s = getSocket();
+        return s.getInetAddress() + ":" + s.getLocalPort();
+    }
+
+}

lib/rkon-core-1.1.2.jar

@@ -1,58 +1,22 @@
 package javarcon;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Properties;
 import java.util.Scanner;
-import net.kronos.rkon.core.Rcon;
 import net.kronos.rkon.core.ex.AuthenticationException;
 
-/**
- *
- * @author Petar Kresoja
- */
 public class JavaRcon {
 
-    private static Rcon rcon = null;
+    private static CustomRcon rcon;
 
     public static void main(String[] args) {
-        System.out.println("JavaRcon started...");
-        System.out.println("To exit type in logout");
-
         Scanner scn = new Scanner(System.in);
         String clientInput;
-        String response;
-        String host = null;
-        int port = 0;
-        byte[] password = null;
 
         try {
-            File config = new File("config.properties");
-            Properties prop = new Properties();
-            if (!config.exists()) {
-                try (OutputStream output = new FileOutputStream(config)) {
-                    prop.setProperty("rcon.host", "localhost");
-                    prop.setProperty("rcon.port", "25575");
-                    prop.setProperty("rcon.password", "password");
-                    prop.store(output, "JavaRcon configuration file." + System.lineSeparator() + "Created by: Pequla ( https://pequla.github.io/ )");
-                }
-            }
-            try (InputStream input = new FileInputStream(config)) {
-                prop.load(input);
-                host = prop.getProperty("rcon.host");
-                port = Integer.valueOf(prop.getProperty("rcon.port"));
-                password = prop.getProperty("rcon.password").getBytes();
-            }
-        } catch (IOException ex) {
-            ex.printStackTrace(System.out);
-        }
+            rcon = CustomRcon.getInstance();
+            System.out.println("Connected to: " + rcon);
+            System.out.println("To exit type in logout!");
 
-        try {
-            rcon = new Rcon(host, port, password);
             while (true) {
                 System.out.print("> ");
                 clientInput = scn.nextLine().trim();
@@ -61,23 +25,23 @@ public static void main(String[] args) {
                         disconnect();
                         break;
                     case "stop":
-                        System.out.println("Do you really want to stop the server ?");
+                        System.out.println("Do you really want to stop the server?");
                         System.out.print("Answer: (Y/N) > ");
-                        if (scn.nextLine().trim().toUpperCase().equals("Y")) {
+                        String answer = scn.nextLine().trim();
+                        if (answer.equalsIgnoreCase("y") || answer.equalsIgnoreCase("yes")) {
                             rcon.command(clientInput);
                             disconnect();
+                        } else {
+                            System.out.println("Will not stop the server!");
                         }
                         break;
                     default:
-                        response = rcon.command(clientInput);
-                        if (response.length() != 0) {
-                            System.out.println(response);
-                        }
+                        System.out.println(rcon.command(clientInput));
                         break;
                 }
             }
         } catch (IOException ex) {
-            System.err.println("There was a communication error, " + ex.getMessage());
+            System.err.println("There was an I/O error, " + ex.getMessage());
         } catch (AuthenticationException ex) {
             System.err.println("Wrong rcon password, " + ex.getMessage());
         }