Pull request pour le deuxième laboratoire

QuizRouletteServer-build/QuizRouletteServer-code/src/main/java/ch/heigvd/res/labs/roulette/QuizRouletteServer.java

@@ -25,7 +25,7 @@ public class QuizRouletteServer {
    */
   public static void main(String[] args) throws IOException {
     System.setProperty("java.util.logging.SimpleFormatter.format", "%5$s %n");
-    RouletteServer server = new RouletteServer(RouletteV1Protocol.DEFAULT_PORT, RouletteV1Protocol.VERSION);
+    RouletteServer server = new RouletteServer(RouletteV2Protocol.DEFAULT_PORT, RouletteV2Protocol.VERSION);
     try {
       server.startServer();
     } catch (IOException ex) {

QuizRouletteServer-build/QuizRouletteServer-code/src/main/java/ch/heigvd/res/labs/roulette/net/client/IRouletteV2Client.java

@@ -28,4 +28,24 @@ public interface IRouletteV2Client extends IRouletteV1Client {
    */
   public List<Student> listStudents() throws IOException;
 
+  /**
+   * The last LOAD command has stored the number of students entered in the store
+   * @return number of students added
+   * @throws IOException
+   */
+  public int getNumberOfStudentAdded() throws IOException;
+
+  /**
+   * the client keeps track for the number of used commands
+   * @return number of commands used in this session
+   * @throws IOException
+   */
+  public int getNumberOfCommands() throws IOException;
+
+  /**
+   * the variable successCommand is updated each time the server ansewers wis a success
+   * @return value of the successCommand variable
+   * @throws IOException
+   */
+  public boolean checkSuccessOfCommand() throws IOException;
 }

QuizRouletteServer-build/QuizRouletteServer-code/src/main/java/ch/heigvd/res/labs/roulette/net/client/RouletteV1ClientImpl.java

@@ -6,13 +6,18 @@
 import ch.heigvd.res.labs.roulette.data.Student;
 import ch.heigvd.res.labs.roulette.net.protocol.InfoCommandResponse;
 import ch.heigvd.res.labs.roulette.net.protocol.RandomCommandResponse;
+import ch.heigvd.res.labs.roulette.net.protocol.RouletteV2Protocol;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.net.Socket;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.ResourceBundle;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -23,48 +28,110 @@
  */
 public class RouletteV1ClientImpl implements IRouletteV1Client {
 
-  private static final Logger LOG = Logger.getLogger(RouletteV1ClientImpl.class.getName());
+  static final Logger LOG = Logger.getLogger(RouletteV1ClientImpl.class.getName());
+
+  private Socket socket;
+  BufferedReader in;
+  PrintWriter out;
 
   @Override
   public void connect(String server, int port) throws IOException {
-    throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    socket = new Socket(server, port);
+    in = new BufferedReader(new InputStreamReader(socket.getInputStream()));
+    out = new PrintWriter(socket.getOutputStream());
+
+    LOG.info(in.readLine());
   }
 
   @Override
   public void disconnect() throws IOException {
-    throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    LOG.info("Client disconnect");
+
+    if(in != null)
+      in.close();
+
+    if(out != null)
+      out.close();
+
+    if(socket != null)
+      socket.close();
   }
 
   @Override
   public boolean isConnected() {
-    throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    if(socket == null){
+      return false;
+    }
+    else if(socket.isClosed()) {
+      return false;
+    }
+    else {
+      return socket.isConnected();
+    }
   }
 
   @Override
   public void loadStudent(String fullname) throws IOException {
-    throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    List<Student> students = new ArrayList<>();
+    students.add(new Student(fullname));
+    this.loadStudents(students);
+
+    LOG.info("load student : " + fullname);
   }
 
   @Override
   public void loadStudents(List<Student> students) throws IOException {
-    throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    out.println(RouletteV1Protocol.CMD_LOAD);
+    out.flush();
+
+    LOG.info(in.readLine());
+
+    for(Student student : students)
+      out.println(student.getFullname());
+
+    out.println(RouletteV1Protocol.CMD_LOAD_ENDOFDATA_MARKER);
+    out.flush();
+
+    LOG.info(in.readLine());
   }
 
   @Override
   public Student pickRandomStudent() throws EmptyStoreException, IOException {
-    throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    out.println(RouletteV1Protocol.CMD_RANDOM);
+    out.flush();
+
+    String response = in.readLine();
+    LOG.info(response);
+    RandomCommandResponse randomResponse = JsonObjectMapper.parseJson(response, RandomCommandResponse.class);
+
+    if(randomResponse.getError() != null){
+      LOG.info(randomResponse.getError());
+      throw new EmptyStoreException();
+    }
+
+    return new Student(randomResponse.getFullname());
   }
 
   @Override
   public int getNumberOfStudents() throws IOException {
-    throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+
+    // ask server for info
+    out.println(RouletteV1Protocol.CMD_INFO);
+    out.flush();
+
+    // process answer
+    String response = in.readLine();
+    LOG.info(response);
+    InfoCommandResponse infoResponse = JsonObjectMapper.parseJson(response, InfoCommandResponse.class);
+
+    // extract value
+    return infoResponse.getNumberOfStudents();
+
   }
 
   @Override
   public String getProtocolVersion() throws IOException {
-    throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    return RouletteV1Protocol.VERSION;
   }
 
-
-
 }

QuizRouletteServer-build/QuizRouletteServer-code/src/main/java/ch/heigvd/res/labs/roulette/net/client/RouletteV2ClientImpl.java

@@ -1,27 +1,129 @@
 package ch.heigvd.res.labs.roulette.net.client;
 
+import ch.heigvd.res.labs.roulette.data.EmptyStoreException;
 import ch.heigvd.res.labs.roulette.data.JsonObjectMapper;
 import ch.heigvd.res.labs.roulette.data.Student;
-import ch.heigvd.res.labs.roulette.data.StudentsList;
-import ch.heigvd.res.labs.roulette.net.protocol.RouletteV2Protocol;
+import ch.heigvd.res.labs.roulette.net.protocol.*;
+
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
  * This class implements the client side of the protocol specification (version 2).
  *
  * @author Olivier Liechti
+ * @author edited by Joel Schar and Yann Lederrey
  */
 public class RouletteV2ClientImpl extends RouletteV1ClientImpl implements IRouletteV2Client {
 
+  private int nbCommandsUsed = 0;
+  private int nbStudentsLoaded = 0;
+  private Boolean successCommand = true;
+
+
   @Override
   public void clearDataStore() throws IOException {
-    throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    nbCommandsUsed++;
+    out.println(RouletteV2Protocol.CMD_CLEAR);
+    out.flush();
+    LOG.info(in.readLine());
   }
 
   @Override
   public List<Student> listStudents() throws IOException {
-    throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    nbCommandsUsed++;
+    out.println(RouletteV2Protocol.CMD_LIST);
+    out.flush();
+
+    String response = in.readLine();
+    LOG.info(response);
+
+    ListCommandResponse lsResponse = JsonObjectMapper.parseJson(response, ListCommandResponse.class);
+    return lsResponse.getStudents();
+  }
+
+  @Override
+  public int getNumberOfStudentAdded() throws IOException{
+    nbCommandsUsed++;
+    return nbStudentsLoaded;
+  }
+
+  @Override
+  public int getNumberOfCommands() throws IOException{
+    return nbCommandsUsed;
+  }
+
+  @Override
+  public String getProtocolVersion() throws IOException {
+    nbCommandsUsed++;
+    return RouletteV2Protocol.VERSION;
+  }
+
+  public boolean checkSuccessOfCommand() throws IOException{
+    return successCommand;
+  }
+
+  public void disconnect() throws IOException{
+    nbCommandsUsed++;
+    super.disconnect();
+  }
+
+  @Override
+  public void loadStudent(String fullname) throws IOException {
+    List<Student> students = new ArrayList<>();
+    students.add(new Student(fullname));
+    this.loadStudents(students);
+
+    LOG.info("load student : " + fullname);
+  }
+
+  @Override
+  public void loadStudents(List<Student> students) throws IOException{
+    nbCommandsUsed++;
+    out.println(RouletteV2Protocol.CMD_LOAD);
+    out.flush();
+
+    LOG.info(in.readLine());
+
+    for(Student student : students)
+      out.println(student.getFullname());
+
+    out.println(RouletteV2Protocol.CMD_LOAD_ENDOFDATA_MARKER);
+    out.flush();
+
+    String response = in.readLine();
+
+    LOG.info(response);
+
+    LoadCommandResponse ldResponse = JsonObjectMapper.parseJson(response, LoadCommandResponse.class);
+    successCommand = ldResponse.getStatus().equals("success");
+
+    nbStudentsLoaded = ldResponse.getNumberOfNewStudents();
+  }
+
+  @Override
+  public Student pickRandomStudent() throws EmptyStoreException, IOException{
+    nbCommandsUsed++;
+
+      out.println(RouletteV1Protocol.CMD_RANDOM);
+      out.flush();
+
+      String response = in.readLine();
+      LOG.info(response);
+      RandomCommandResponse randomResponse = JsonObjectMapper.parseJson(response, RandomCommandResponse.class);
+
+      if(randomResponse.getError() != null){
+        LOG.info(randomResponse.getError());
+        successCommand = false;
+        throw new EmptyStoreException();
+      }
+
+      return new Student(randomResponse.getFullname());
+    }
+
+  public int getNumberOfStudents() throws IOException{
+    nbCommandsUsed++;
+    return super.getNumberOfStudents();
   }
-
 }