Merge pull request #23 from Christian-Schefe/format-all-java

chore: format java code

Author: invaderb

.gitignore

@@ -1,4 +1,6 @@
 playtakdb/
 
 run
-run/**
+run/**
+
+.idea

server/.editorconfig

@@ -0,0 +1,20 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+
+[*.java]
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = tab
+indent_size = 4
+tab_width = 4
+max_line_length = 120
+ij_java_align_multiline_chained_methods = false
+ij_java_method_call_chain_wrap = on_every_item
+ij_java_prefer_parameters_wrap = false
+ij_java_array_initializer_wrap = split_into_lines
+ij_java_array_initializer_new_line_after_left_brace = true
+ij_java_array_initializer_right_brace_on_new_line = true
+ij_java_space_before_array_initializer_left_brace = true

server/Dockerfile

@@ -9,7 +9,7 @@ WORKDIR /app
 # Logged in users (not guests) will reconnected by the UI within ~12s.
 
 # consider removing clean for slightly faster compilation
-ENTRYPOINT amvn clean package exec:java --watch
+ENTRYPOINT exec amvn clean package exec:java --watch
 
 FROM base as production
 VOLUME /tmp

server/src/main/java/tak/ChatRoom.java

@@ -5,67 +5,67 @@
  */
 package tak;
 
-import java.util.concurrent.ConcurrentHashMap;
 import tak.utils.BadWordFilter;
 import tak.utils.ConcurrentHashSet;
-import java.util.concurrent.locks.*;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  *
  * @author chaitu
  */
 public class ChatRoom {
 	static final ConcurrentHashMap<String, ChatRoom> chatRooms = new ConcurrentHashMap<>();
-	static Lock roommaplock=new ReentrantLock();
-	
+	static Lock roommaplock = new ReentrantLock();
+
 	ConcurrentHashSet<Client> members;
-	
+
 	ChatRoom() {
-		members = new ConcurrentHashSet<Client>();
+		members = new ConcurrentHashSet<>();
 	}
-	
-	public static ChatRoom joinRoom(String name, Client client){
+
+	public static ChatRoom joinRoom(String name, Client client) {
 		roommaplock.lock();
-		try{
-			ChatRoom room=chatRooms.get(name);
-			if(room==null){
+		try {
+			ChatRoom room = chatRooms.get(name);
+			if (room == null) {
 				room = new ChatRoom();
 				chatRooms.put(name, room);
 			}
 			room.members.add(client);
 			return room;
-		}
-		finally{
+		} finally {
 			roommaplock.unlock();
 		}
 	}
-	
-	public static void shout(String name, Client client, String msg) {		
-		ChatRoom room=chatRooms.get(name);
-		if(room!=null){
-			String compiledmessage="ShoutRoom "+name+" <"+client.player.getName()+"> "+ BadWordFilter.filterText(msg);
-			if(!client.player.isGagged()) {
+
+	public static void shout(String name, Client client, String msg) {
+		ChatRoom room = chatRooms.get(name);
+		if (room != null) {
+			String compiledmessage = "ShoutRoom " + name + " <" + client.player.getName() + "> " + BadWordFilter.filterText(msg);
+			if (!client.player.isGagged()) {
 				for (Client cc : room.members) {
 					cc.sendWithoutLogging(compiledmessage);
 				}
 			} else {
-				client.sendWithoutLogging("ShoutRoom "+name+" <"+client.player.getName()+"> <Server: You have been muted for inappropriate chat behavior.>");
+				client.sendWithoutLogging("ShoutRoom " + name + " <" + client.player.getName() + "> <Server: You have been muted for inappropriate chat behavior.>");
 			}
 		}
 	}
-	
-	public static void leaveRoom(String name, Client client){
+
+	public static void leaveRoom(String name, Client client) {
 		roommaplock.lock();
-		try{
-			ChatRoom room=chatRooms.get(name);
-			if(room!=null){
+		try {
+			ChatRoom room = chatRooms.get(name);
+			if (room != null) {
 				room.members.remove(client);
-				if(room.members.isEmpty()){
+				if (room.members.isEmpty()) {
 					chatRooms.remove(name);
 				}
 			}
-		}
-		finally{
+		} finally {
 			roommaplock.unlock();
 		}
 	}