lightcontainer/FileFrontEnd
2
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Optimization of server startup, deletion of my benjamin's balls space. Some bug fixes

Browse Source
This commit is contained in:
Jérémi N ‘EndMove’ 2022-02-26 18:28:27 +01:00
parent c38743383f
commit 06fb0086fb
Signed by: EndMove
GPG Key ID: 65C4A02E1F5371A4
7 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/lightcontainer/App.java
View File

@ -30,15 +30,13 @@ public class App {
protocolRep.addReader(new HelloRule());
new UnicastServerListener(clientRep, UNICAST_PORT);
MulticastServerListener multiCast = new MulticastServerListener(storeRep, protocolRep, MULTICAST_IP, MULTICAST_PORT);
multiCast.run();
new MulticastServerListener(storeRep, protocolRep, MULTICAST_IP, MULTICAST_PORT);
FileFrontEnd ffe = new FileFrontEnd(clientRep, storeRep);
// close repo et client et server.
Thread.sleep(60000);
multiCast.stop();
clientRep.close();
storeRep.close();
}

1
app/src/main/java/lightcontainer/domains/client/ClientHandler.java
View File

@ -5,6 +5,7 @@ import lightcontainer.interfaces.ClientHandlerFFE;
import java.io.*;
import java.net.Socket;
import java.nio.charset.StandardCharsets;
import java.util.Objects;
/**
* ClientHandler

8
app/src/main/java/lightcontainer/domains/client/StoreProcessor.java
View File

@ -22,10 +22,10 @@ import java.util.Objects;
* @author Jérémi NIHART <j.nihart@student.helmo.be>
*/
public class StoreProcessor implements Runnable, AutoCloseable {
private String domain;
// Variables
private final StoreProcessorFFE fileFrontEnd;
private final Socket store;
private final String domain;
private boolean client_run;
private BufferedReader reader;
@ -96,6 +96,9 @@ public class StoreProcessor implements Runnable, AutoCloseable {
}
}
/**
* Compare two StoreProcessor object to check if equals.
*/
@Override
public boolean equals(Object o) {
if (this == o) return true;
@ -104,6 +107,9 @@ public class StoreProcessor implements Runnable, AutoCloseable {
return Objects.equals(domain, that.domain);
}
/**
* Get hash code
*/
@Override
public int hashCode() {
return Objects.hash(domain);

9
app/src/main/java/lightcontainer/protocol/ProtocolReader.java
View File

@ -4,14 +4,14 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
public abstract class ProtocolReader {
// Variables
private final Pattern rulePattern;
// Constructor
protected ProtocolReader(String pattern) {
this.rulePattern = Pattern.compile(pattern);
}
public abstract class ProtocolResult {}
/**
@ -27,17 +27,14 @@ public abstract class ProtocolReader {
for (int i = 1; i <= groups.length; ++i)
groups[i - 1] = ruleMatcher.group(i);
return onExecuted(groups);
}
return null;
}
/**
* Cette méthode est appelée lors de l'exécution de la règle
* @param data
* @param data Paramètres pour créer la commande.
*/
protected abstract <T> T onExecuted(String... data);
}

18
app/src/main/java/lightcontainer/protocol/ProtocolWriter.java
View File

@ -5,19 +5,19 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
public abstract class ProtocolWriter {
// Variables
private final Pattern rulePattern;
private final String cmdName;
// Constructor
protected ProtocolWriter(String cmdName, String pattern) {
this.rulePattern = Pattern.compile(pattern);
this.cmdName = cmdName;
}
/**
* Permet de récupérer le nom du protocol
* @return
* Permet de récupérer le nom de la commande.
* @return Nom de la commande.
*/
public String getCmdName() {
return cmdName;
@ -25,16 +25,16 @@ public abstract class ProtocolWriter {
/**
* Permet de contruire une commande selon une règle établie.
* @param datas Les données à ajouter dans la commande; L'ordre défini leur position dans la commande
* @param data Les données à ajouter dans la commande; L'ordre défini leur position dans la commande
* @return La commande construite
*/
public String execute(String... datas) {
public String execute(String... data) {
// Concatatène le nom de la commande avec les données (trim), avec un espace entre chaque
String command = null;
String command;
StringJoiner builder = new StringJoiner(" ", this.cmdName, "\r\n");
for (String data : datas)
builder.add(data);
for (String param : data)
builder.add(param);
command = builder.toString();

4
app/src/main/java/lightcontainer/repository/ProtocolRepositoryImpl.java
View File

@ -23,9 +23,9 @@ public class ProtocolRepositoryImpl implements ProtocolRepository {
}
@Override
public String executeWriter(String... datas) {
public String executeWriter(String... data) {
for (ProtocolWriter writer : writers) {
String command = writer.execute(datas);
String command = writer.execute(data);
if (command != null) {
return command;
}

2
app/src/main/java/lightcontainer/repository/StoreProcessorRepository.java
View File

@ -4,9 +4,7 @@ import lightcontainer.domains.client.StoreProcessor;
import lightcontainer.domains.server.MulticastServerListener;
import lightcontainer.interfaces.MulticastSPR;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
// TODO : C'est genre un ClientHandlerManager quoi hein, normal qu'il fasse blinder de chose ;)
/**