ZHAW-IT21b_WIN/Uebung-hk1-Schrom01-Fassband-Brandleo
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Shrink code in the ConnectionHandlers

Browse Source
This commit is contained in:
Andrin Fassbind
2022-04-16 06:36:04 +02:00
committed by Leonardo Brandenberger
parent 46b0e4386a
commit 5022974427
3 changed files with 105 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/src/main/java/ch/zhaw/pm2/multichat/server/ServerConnectionHandler.java
+20 -62
View File
@@ -8,7 +8,6 @@ import ch.zhaw.pm2.multichat.protocol.NetworkHandler;
import java.io.EOFException;
import java.io.IOException;
import java.net.SocketException;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import java.util.Scanner;
@@ -91,43 +90,25 @@ public class ServerConnectionHandler extends ConnectionHandler implements Runnab
getConnection().close();
System.out.println("Stopped receiving data.");
} catch (IOException e) {
System.err.println("Failed to close connection." + e);
System.err.println("Failed to close connection." + e.getMessage());
}
System.out.println("Closed Connection Handler for " + userName);
}
private void processData(String data) {
try {
// parse data content
Scanner scanner = new Scanner(data);
String sender = null;
String reciever = null;
String type = null;
String payload = null;
if (scanner.hasNextLine()) {
sender = scanner.nextLine();
} else {
throw new ChatProtocolException("No Sender found");
}
if (scanner.hasNextLine()) {
reciever = scanner.nextLine();
} else {
throw new ChatProtocolException("No Reciever found");
}
if (scanner.hasNextLine()) {
type = scanner.nextLine();
} else {
throw new ChatProtocolException("No Type found");
}
if (scanner.hasNextLine()) {
payload = scanner.nextLine();
}
StringBuilder sender = new StringBuilder();
StringBuilder reciever = new StringBuilder();
StringBuilder type = new StringBuilder();
StringBuilder payload = new StringBuilder();
super.processData(scanner,sender,reciever,type,payload);
// dispatch operation based on type parameter
if (type.equals(getDataTypeConnect())) {
if (type.toString().equals(getDataTypeConnect())) {
if (this.state != NEW) throw new ChatProtocolException("Illegal state for connect request: " + state);
if (sender == null || sender.isBlank()) sender = this.userName;
if (connectionRegistry.containsKey(sender)) {
if (sender.toString().isBlank()) sender.append(this.userName);
if (connectionRegistry.containsKey(sender.toString())) {
mutex.lock();
try {
state = ERROR;
@@ -140,7 +121,7 @@ public class ServerConnectionHandler extends ConnectionHandler implements Runnab
}
mutex.lock();
try {
this.userName = sender;
this.userName = sender.toString();
nameComplete.signal();
}
finally {
@@ -149,9 +130,9 @@ public class ServerConnectionHandler extends ConnectionHandler implements Runnab
connectionRegistry.put(userName, this);
sendData(USER_NONE, userName, getDataTypeConfirm(), "Registration successfull for " + userName);
this.state = CONNECTED;
} else if (type.equals(getDataTypeConfirm())) {
} else if (type.toString().equals(getDataTypeConfirm())) {
System.out.println("Not expecting to receive a CONFIRM request from client");
} else if (type.equals(getDataTypeDisconnect())) {
} else if (type.toString().equals(getDataTypeDisconnect())) {
if (state == DISCONNECTED)
throw new ChatProtocolException("Illegal state for disconnect request: " + state);
if (state == CONNECTED) {
@@ -160,24 +141,24 @@ public class ServerConnectionHandler extends ConnectionHandler implements Runnab
sendData(USER_NONE, userName, getDataTypeConfirm(), "Confirm disconnect of " + userName);
this.state = DISCONNECTED;
this.stopReceiving();
} else if (type.equals(getDataTypeMessage())) {
} else if (type.toString().equals(getDataTypeMessage())) {
if (state != CONNECTED) throw new ChatProtocolException("Illegal state for message request: " + state);
if (USER_ALL.equals(reciever)) {
if (USER_ALL.equals(reciever.toString())) {
for (ServerConnectionHandler handler : connectionRegistry.values()) {
handler.sendData(sender, reciever, type, payload);
handler.sendData(sender.toString(), reciever.toString(), type.toString(), payload.toString());
}
} else {
ServerConnectionHandler handler = connectionRegistry.get(reciever);
ServerConnectionHandler handler = connectionRegistry.get(reciever.toString());
if (handler != null) {
handler.sendData(sender, reciever, type, payload);
if(!reciever.equals(sender)){
sendData(sender, reciever, type, payload); //send message to sender if it's a direct message and sender is not receiver.
handler.sendData(sender.toString(), reciever.toString(), type.toString(), payload.toString());
if(!reciever.toString().equals(sender.toString())){
sendData(sender.toString(), reciever.toString(), type.toString(), payload.toString()); //send message to sender if it's a direct message and sender is not receiver.
}
} else {
this.sendData(USER_NONE, userName, getDataTypeError(), "Unknown User: " + reciever);
}
}
} else if (type.equals(getDataTypeError())) {
} else if (type.toString().equals(getDataTypeError())) {
System.err.println("Received error from client (" + sender + "): " + payload);
} else {
System.err.println("Unknown data type received: " + type);
@@ -188,27 +169,4 @@ public class ServerConnectionHandler extends ConnectionHandler implements Runnab
sendData(USER_NONE, userName, getDataTypeError(), e.getMessage());
}
}
private void sendData(String sender, String receiver, String type, String payload) {
if (getConnection().isAvailable()) {
new StringBuilder();
String data = new StringBuilder()
.append(sender+"\n")
.append(receiver+"\n")
.append(type+"\n")
.append(payload+"\n")
.toString();
try {
getConnection().send(data);
} catch (SocketException e) {
System.out.println("Connection closed: " + e.getMessage());
} catch (EOFException e) {
System.out.println("Connection terminated by remote");
} catch(IOException e) {
System.out.println("Communication error: " + e.getMessage());
}
}
}
}