Studium_Angewandte_Informatik_Bachelor/verteilte_systeme_lab01_filesharing_peer
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added nullcheck and moved functionality to ReceivedData class.

Browse Source
This commit is contained in:
WickedJack99
2024-04-07 11:57:26 +02:00
parent 7d2a68b439
commit f79527c16b
1 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/main/java/vslab1/src/Request/RequestExecuterThread.java
View File

@@ -45,15 +45,13 @@ public class RequestExecuterThread extends Thread implements Terminatable {
try {
ReceivedData receivedData = receivingQueue.take();
JSONObject receivedDataAsJSONObject = new JSONObject(receivedData.data());
Requestable request = toRequestable(receivedDataAsJSONObject, jobList);
Requestable request = toRequestable(receivedData.interpretAsJSONObject(), jobList);
if (request != null) {
request.execute(sendingQueue);
}
} catch (InterruptedException e) {
System.out.println("Error, receiving queue was interrupted. Terminating (this) request executer thread..");
System.err.println("Error, receiving queue was interrupted. Terminating (this) request executer thread..");
this.terminate();
}
}
@@ -65,37 +63,39 @@ public class RequestExecuterThread extends Thread implements Terminatable {
}
private static Requestable toRequestable(JSONObject receivedData, JobList jobList) {
if (receivedData.has("onlineState")) {
String onlineState = receivedData.getString("onlineState");
switch (onlineState) {
case "": {
return new OnlineStateNotificationRequest(parseIPPortField(receivedData), FileReaderWriter.getThisPeer(EUpdateFlag.DoNotUpdate), jobList);
}
case "online": {
return new OnlineStateRequestRequest(parseIPPortField(receivedData), FileReaderWriter.getThisPeer(EUpdateFlag.DoNotUpdate));
}
default: {
System.err.println("Unknown online state.");
return null;
if (receivedData != null) {
if (receivedData.has("onlineState")) {
String onlineState = receivedData.getString("onlineState");
switch (onlineState) {
case "": {
return new OnlineStateNotificationRequest(parseIPPortField(receivedData), FileReaderWriter.getThisPeer(EUpdateFlag.DoNotUpdate), jobList);
}
case "online": {
return new OnlineStateRequestRequest(parseIPPortField(receivedData), FileReaderWriter.getThisPeer(EUpdateFlag.DoNotUpdate));
}
default: {
System.err.println("Unknown online state.");
return null;
}
}
}
}
if (receivedData.has("pullFileList")) {
return new PullFileListRequestRequest(parseIPPortField(receivedData), FileReaderWriter.getThisPeer(EUpdateFlag.Update));
}
if (receivedData.has("publishFileName")) {
String fileName = receivedData.getString("publishFileName");
return new PublishFileNameNotificationRequest(parseIPPortField(receivedData), FileReaderWriter.getThisPeer(EUpdateFlag.DoNotUpdate), fileName);
}
if (receivedData.has("pullFile")) {
String fileName = receivedData.getString("pullFile");
return new PullFileRequestRequest(parseIPPortField(receivedData), FileReaderWriter.getThisPeer(EUpdateFlag.DoNotUpdate), fileName);
}
if (receivedData.has("sendFile")) {
String fileContent = receivedData.getString("sendFile");
String fileName = receivedData.getString("fileName");
return new SendFileReplyRequest(parseIPPortField(receivedData), FileReaderWriter.getThisPeer(EUpdateFlag.DoNotUpdate), fileName, fileContent);
if (receivedData.has("pullFileList")) {
return new PullFileListRequestRequest(parseIPPortField(receivedData), FileReaderWriter.getThisPeer(EUpdateFlag.Update));
}
if (receivedData.has("publishFileName")) {
String fileName = receivedData.getString("publishFileName");
return new PublishFileNameNotificationRequest(parseIPPortField(receivedData), FileReaderWriter.getThisPeer(EUpdateFlag.DoNotUpdate), fileName);
}
if (receivedData.has("pullFile")) {
String fileName = receivedData.getString("pullFile");
return new PullFileRequestRequest(parseIPPortField(receivedData), FileReaderWriter.getThisPeer(EUpdateFlag.DoNotUpdate), fileName);
}
if (receivedData.has("sendFile")) {
String fileContent = receivedData.getString("sendFile");
String fileName = receivedData.getString("fileName");
return new SendFileReplyRequest(parseIPPortField(receivedData), FileReaderWriter.getThisPeer(EUpdateFlag.DoNotUpdate), fileName, fileContent);
}
}
return null;
}