Updated versions and started using java 8

Now using lambdas and Optional<> classes. Had to update some versions
for this to work.
Moved Command class to common package, planning on adding client-side
only commands, not interpreted by the server.
Added automatic import of commands into the CommandRegistry, using a
solution I found on stackoverflow.

pom.xml

@@ -38,7 +38,7 @@
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.5.8.201207111220</version>
+				<version>0.7.5.201505241946</version>
 				<executions>
 					<execution>
 						<goals>
@@ -54,6 +54,15 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.1</version>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 

src/main/java/command/Ban.java

@@ -1,7 +1,9 @@
 package command;
 
 import java.util.InputMismatchException;
+import java.util.Optional;
 
+import common.Command;
 import common.Message;
 import common.Message.MessageType;
 import server.Client;
@@ -18,20 +20,21 @@ public class Ban extends Command {
 		int duration = -1;
 		Client victim;
 		
-		try {
-			victim = Server.getUserByName(args[0]);
-		}	catch (NullPointerException e) {
-			caller.send(new Message("No such user!", MessageType.WARNING, false));
+		Optional<Client> maybeVictim = Server.getUserByName(args[0]);
+		
+		if (maybeVictim.isPresent())
+			victim = maybeVictim.get();
+		else {
+			caller.send(new Message("No user called " + args[0] + ".", MessageType.ERROR, false));
 			return;
 		}
 		
+		
 		IP = victim.sock.getInetAddress().toString();
 		
 		BanNote bn = new BanNote(IP);
 		
-		if (args.length == 1)
-			bn = new BanNote(IP);
-		else
+		if (args.length != 1)
 			try {
 				duration = Numbers.CInt(args[1]);
 				
@@ -44,7 +47,6 @@ public class Ban extends Command {
 			}
 		
 		Server.banNotes.add(bn);
-		victim.disconnect(false);
 	}
 
 	@Override

src/main/java/command/CreateChannel.java

@@ -1,7 +1,7 @@
 package command;
 
+import common.Command;
 import common.Message;
-
 import server.Client;
 import server.Server;
 

src/main/java/command/Exit.java

@@ -1,5 +1,7 @@
 package command;
 
+import common.Command;
+
 import server.Client;
 import server.Server;
 

src/main/java/command/Help.java

@@ -4,6 +4,7 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import common.Command;
 import common.Message;
 import common.Message.MessageType;
 import server.Client;

src/main/java/command/JoinChannel.java

@@ -1,7 +1,11 @@
 package command;
 
+import java.util.Optional;
+
+import common.Command;
 import common.Message;
 import common.Message.MessageType;
+import server.Channel;
 import server.Client;
 import server.Server;
 
@@ -14,9 +18,12 @@ public class JoinChannel extends Command {
 			return;
 		}
 		
+		Optional<Channel> maybeChannel = Server.getChannelByName(args[0]);
+		Channel selectedChannel = maybeChannel.isPresent()? maybeChannel.get() : null;
+		
 		try {
-			Server.getChannelByName(args[0]).add(caller);
-			caller.primaryChannel = Server.getChannelByName(args[0]);
+			selectedChannel.add(caller);
+			caller.primaryChannel = selectedChannel;
 			caller.send(new Message("You are now speaking in channel " + args[0] + ".", MessageType.COMMAND, false));
 		} catch (NullPointerException ex) {
 			caller.send(new Message("No such channel!", MessageType.ERROR, false));

src/main/java/command/Kick.java

@@ -1,5 +1,8 @@
 package command;
 
+import java.util.Optional;
+
+import common.Command;
 import common.Message;
 import common.Message.MessageType;
 import server.Client;
@@ -9,8 +12,10 @@ public class Kick extends Command {
 
 	@Override
 	public void execute(String[] args, Client caller) {
+		Optional<Client> maybeVictim = Server.getUserByName(args[0]);
+		
 		try {
-			Server.getUserByName(args[0]).disconnect(false);
+			maybeVictim.orElseThrow(NullPointerException::new).disconnect(false);
 		} catch (NullPointerException ex) {
 			caller.send(new Message("No user called " + args[0] + "!", MessageType.ERROR, false));
 		}

src/main/java/command/LeaveChannel.java

@@ -1,7 +1,11 @@
 package command;
 
+import java.util.Optional;
+
+import common.Command;
 import common.Message;
 import common.Message.MessageType;
+import server.Channel;
 import server.Client;
 import server.Server;
 
@@ -14,9 +18,12 @@ public class LeaveChannel extends Command{
 			return;
 		}
 		
+		Optional<Channel> maybeChannel = Server.getChannelByName(args[0]);
+		Channel selectedChannel = maybeChannel.isPresent()? maybeChannel.get() : null;
+		
 		try {
-			Server.getChannelByName(args[0]).remove(caller);
-			if (caller.primaryChannel.equals(Server.getChannelByName(args[0])))
+			selectedChannel.remove(caller);
+			if (caller.primaryChannel.equals(selectedChannel))
 				caller.primaryChannel = Server.channels.get(0);
 			caller.send(new Message("You left channel " + args[0] + ".", MessageType.COMMAND, false));
 			caller.send(new Message("You are now speaking in channel " + caller.primaryChannel.name + ".", MessageType.COMMAND, false));

src/main/java/command/List.java

@@ -1,7 +1,11 @@
 package command;
 
+import java.util.Optional;
+
+import common.Command;
 import common.Message;
 import common.Message.MessageType;
+import server.Channel;
 import server.Client;
 import server.Server;
 
@@ -12,9 +16,11 @@ public class List extends Command {
 		String arr, channelName = null;
 		
 		if (args.length >= 1) {
-			channelName = args[0];
+			Optional<Channel> maybeChannel = Server.getChannelByName(args[0]);
+			Channel selectedChannel = maybeChannel.isPresent()? maybeChannel.get() : null;
 			try {
-				arr = Server.getChannelByName(channelName).listClients();
+				arr = selectedChannel.listClients();
+				channelName = selectedChannel.name;
 			} catch (NullPointerException ex) {
 				caller.send(new Message("No channel named " + channelName + ".", MessageType.ERROR, false));
 				return;

src/main/java/command/PrivateMessage.java

@@ -1,6 +1,10 @@
 package command;
 
+import java.util.Optional;
+
+import common.Command;
 import common.Message;
+import common.Message.MessageType;
 import server.Client;
 import server.Server;
 import util.StringArrays;
@@ -9,8 +13,15 @@ public class PrivateMessage extends Command {
 
 	@Override
 	public void execute(String[] args, Client caller) {
-		Client reciever = Server.getUserByName(args[0]);
-
+		Client reciever;
+		Optional<Client> maybeVictim = Server.getUserByName(args[0]);
+		
+		if (maybeVictim.isPresent())
+			reciever = maybeVictim.get();
+		else {
+			caller.send(new Message("No user called " + args[0] + ".", MessageType.ERROR, false));
+			return;
+		}
 		if (caller.equals(reciever)) {
 			caller.send("Please don't speak with yourself.");
 			return;

src/main/java/command/Command.java → src/main/java/common/Command.java

@@ -1,4 +1,4 @@
-package command;
+package common;
 
 import server.Client;
 

src/main/java/server/Client.java

@@ -64,27 +64,25 @@ public class Client implements Runnable, ActionListener {
 		}
 		
 		//Not same username as anyone else
-		if (Server.clients.getClientByName(username) != null) {
+		if (Server.clients.getClientByName(username).isPresent()) {
 			send("Username already taken!");
 			return false;
 		}
 			
 		//No connect if banned
-		for (int i = 0; i < Server.banNotes.size(); i++)
-			if (Server.banNotes.get(i).ip.equals(sock.getInetAddress().toString())) {
-				BanNote bn = Server.banNotes.get(i);
-				if (bn.expiry == null) {
-					send(bn.toString());
+		for (BanNote note: Server.banNotes)
+			if (note.ip.equals(sock.getInetAddress().toString())) {
+				if (note.expiry == null) {
+					send(note.toString());
 					return false;
-				} else if (bn.expiry.isBefore(LocalDateTime.now())) {
-					Server.banNotes.remove(i);
+				} else if (note.expiry.isBefore(LocalDateTime.now())) {
+					Server.banNotes.remove(note);
 					return true;
 				} else {
-					send(bn.toString());
+					send(note.toString());
 					return false;
 				}
 			}
-		
 		return true;
 	}
 	
@@ -157,7 +155,8 @@ public class Client implements Runnable, ActionListener {
 			objOut.writeObject(message);
 			objOut.flush();
 		} catch (IOException e) {
-			e.printStackTrace();
+			if (isConnected())
+				disconnect();
 		}
 	}
 	

src/main/java/server/ClientCollection.java

@@ -1,6 +1,7 @@
 package server;
 
 import java.util.ArrayList;
+import java.util.Optional;
 
 import common.Message;
 
@@ -21,12 +22,10 @@ public class ClientCollection extends ArrayList<Client>{
 		maxClients = maxUsers;
 	}
 	
-	public Client getClientByName(String name) throws NullPointerException {
-		for (Client c: this) {
-			if (c.username.equals(name))
-				return c;
-		}
-		return null;
+	public Optional<Client> getClientByName(String name) {
+		return stream()
+				.filter(c -> c.username.equals(name))
+				.findFirst();
 	}
 	
 	void broadcast(Message mess) { //Broadcast to all
@@ -67,7 +66,7 @@ public class ClientCollection extends ArrayList<Client>{
 		return listClients().split("\n");
 	}
 	
-	public void cleanUp() { //Remove unused clients
+	public void cleanUp() { //Remove unused clients, has to be done with number iteration, otherwise unsafe
 		for (int i = 0; i < size(); i++)
 			if (!get(i).isConnected())
 				remove(i);

src/main/java/server/CommandRegistry.java

@@ -1,10 +1,11 @@
 package server;
 
 import java.util.HashMap;
+import java.util.List;
 
+import util.ClassFinder;
 import util.StringArrays;
-
-import command.Command;
+import common.Command;
 
 public class CommandRegistry extends HashMap<String, Command> {
 
@@ -14,19 +15,16 @@ public class CommandRegistry extends HashMap<String, Command> {
 	private static final long serialVersionUID = 1L;
 
 	public CommandRegistry() {
-		Command[] commands = new Command[9];
-		commands[0] = new command.Kick();
-		commands[1] = new command.List();
-		commands[2] = new command.Exit();
-		commands[3] = new command.Help();
-		commands[4] = new command.PrivateMessage();
-		commands[5] = new command.JoinChannel();
-		commands[6] = new command.Ban();
-		commands[7] = new command.LeaveChannel();
-		commands[8] = new command.CreateChannel();
-
-		for (Command comm : commands)
-			put(comm.getName(), comm);
+		List<Class<?>> classes = ClassFinder.find("command");
+		
+		for (Class<?> comm: classes) {
+			try {
+				Command commInstance = (Command) comm.newInstance();
+				put(commInstance.getName(), commInstance);
+			} catch (ClassCastException | InstantiationException | IllegalAccessException ex) {
+				ex.printStackTrace();
+			}
+		}
 	}
 
 	public void executeCommand(String[] command, Client caller) {

src/main/java/server/Server.java

@@ -3,7 +3,7 @@ package server;
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.util.ArrayList;
-import java.util.Set;
+import java.util.Optional;
 
 import common.Message;
 import server.CommandRegistry;
@@ -28,12 +28,14 @@ public class Server {
 	public static void main(String[] arg){
 		System.out.println("Starting ChatServer version " + version + "...");
 		
-		System.out.println("Loadning properties file.");
+		System.out.print("Loadning properties file...");
 		prop.loadProperties();
+		System.out.println("Done");
 		
-		System.out.println("Reading numbers from properties object.");
+		System.out.print("Reading numbers from properties object...");
 		port = prop.getNumberProperty("port");
 		maxUsers = prop.getNumberProperty("maxUsers");
+		System.out.println("Done");
 		
 		System.out.print("Setting up socket...");
 		try {
@@ -95,13 +97,8 @@ public class Server {
 		}
 	}
 	
-	public static Channel getChannelByName(String name) throws NullPointerException {
-		for (int i = 0; i < channels.size(); i++) {
-			if (channels.get(i).name.equals(name)) {
-				return channels.get(i);
-			}
-		}
-		return null;
+	public static Optional<Channel> getChannelByName(String name) throws NullPointerException {
+		return channels.stream().filter(c -> c.name.equals(name)).findFirst();
 	}
 
 	public static void wideBroadcast(Message mess) {
@@ -116,21 +113,19 @@ public class Server {
 		return clients.listClients();
 	}
 
-	public static Client getUserByName(String username) {
+	public static Optional<Client> getUserByName(String username) {
 		return clients.getClientByName(username);
 	}
 	
 	public static void cleanUp() { //Makes sure the client gets removed from all arrays
 		clients.cleanUp();
-		for (Channel c: channels)
-			if (c != null)
-				c.cleanUp();
+		channels.forEach(c -> c.cleanUp());
 	}
 	
 	public static void exit() {
 		wideBroadcast(new Message("Shutting down server!"));
 		
-		for (int i = 0; i < clients.size(); i++)
+		for (int i = 0; i < clients.size(); i++) //Has to be done with number iteration, otherwise unsafe
 			clients.get(i).disconnect();
 		
 		log.close();
@@ -142,9 +137,5 @@ public class Server {
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
-		
-		Set<Thread> threadSet = Thread.getAllStackTraces().keySet();
-		for (Thread th: threadSet)
-			System.out.println(th.toString() + ", " + th.isAlive());
 	}
 }

src/main/java/util/ClassFinder.java

@@ -0,0 +1,50 @@
+package util;
+
+import java.io.File;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+//Class originally developed by 'sp00m' and published on stackoverflow.com
+
+public class ClassFinder {
+	private static final char DOT = '.';
+
+    private static final char SLASH = '/';
+
+    private static final String CLASS_SUFFIX = ".class";
+
+    private static final String BAD_PACKAGE_ERROR = "Unable to get resources from path '%s'. Are you sure the package '%s' exists?";
+
+    public static List<Class<?>> find(String scannedPackage) {
+        String scannedPath = scannedPackage.replace(DOT, SLASH);
+        URL scannedUrl = Thread.currentThread().getContextClassLoader().getResource(scannedPath);
+        if (scannedUrl == null) {
+            throw new IllegalArgumentException(String.format(BAD_PACKAGE_ERROR, scannedPath, scannedPackage));
+        }
+        File scannedDir = new File(scannedUrl.getFile());
+        List<Class<?>> classes = new ArrayList<Class<?>>();
+        for (File file : scannedDir.listFiles()) {
+            classes.addAll(find(file, scannedPackage));
+        }
+        return classes;
+    }
+
+    private static List<Class<?>> find(File file, String scannedPackage) {
+        List<Class<?>> classes = new ArrayList<Class<?>>();
+        String resource = scannedPackage + DOT + file.getName();
+        if (file.isDirectory()) {
+            for (File child : file.listFiles()) {
+                classes.addAll(find(child, resource));
+            }
+        } else if (resource.endsWith(CLASS_SUFFIX)) {
+            int endIndex = resource.length() - CLASS_SUFFIX.length();
+            String className = resource.substring(0, endIndex);
+            try {
+                classes.add(Class.forName(className));
+            } catch (ClassNotFoundException ignore) {
+            }
+        }
+        return classes;
+    }
+}

src/main/java/util/StringArrays.java

@@ -1,14 +1,12 @@
 package util;
 
-import java.util.ArrayList;
-
 public class StringArrays {
 	public static String[] removeFirst(String[] oldArr) {
-		ArrayList<String> newArr = new ArrayList<String>();
+		String[] newArr = new String[oldArr.length -1];
 		for (int i = 1; i < oldArr.length; i++) {
-			newArr.add(oldArr[i]);
+			newArr[i -1] = oldArr[i];
 		}
-		return (String[]) newArr.toArray();
+		return newArr;
 	}
 
 	public static String arrayToString(String[] arr) {