Implementation of Protocol V2

Docker/Dockerfile

@@ -0,0 +1,8 @@
+FROM java:8
+Maintainer Yosra Harbaoui <[email protected]>
+
+COPY QuizRouletteServer-code-1.0-SNAPSHOT-standalone.jar /opt/app/server.jar
+
+EXPOSE 1313
+
+ENTRYPOINT ["java", "-jar", "/opt/app/server.jar"]

Docker/build-image.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Ask maven to build the executable jar file from the source files
+mvn clean install --file ../QuizRouletteServer-build/pom.xml
+
+# Copy the executable jar file in the current directory
+cp ../QuizRouletteServer-build/QuizRouletteServer-code/target/QuizRouletteServer-code-1.0-SNAPSHOT-standalone.jar .
+
+# Build the Docker image locally
+docker build --tag java-server .

Docker/run-container.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker run -it -p 1313:1313 java-server

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

@@ -56,7 +56,7 @@ public void importData(BufferedReader reader) throws IOException {
     LOG.log(Level.INFO, "Importing data from input reader of type {0}", reader.getClass());
     List<Student> studentsToAdd = new ArrayList<>();
     String record;
-    boolean endReached = false;
+    boolean endReached = false;   
     while (!endReached && (record = reader.readLine()) != null) {
       if (record.equalsIgnoreCase(RouletteV1Protocol.CMD_LOAD_ENDOFDATA_MARKER)) {
         LOG.log(Level.INFO, "End of stream reached. New students have been added to the store. How many? We'll tell you when the lab is complete...");
@@ -68,8 +68,7 @@ public void importData(BufferedReader reader) throws IOException {
     }
     synchronized (this) {
       students.addAll(studentsToAdd);
-    }
+    }  
     LOG.log(Level.INFO, "There are now {0} students in the store.", getNumberOfStudents());
   }
-
-}
+}

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

@@ -7,6 +7,7 @@
 /**
  *
  * @author Olivier Liechti
+ * @author Yosra Harbaoui
  */
 public interface IRouletteV2Client extends IRouletteV1Client {
 
@@ -27,5 +28,25 @@ public interface IRouletteV2Client extends IRouletteV1Client {
    * @throws IOException 
    */
   public List<Student> listStudents() throws IOException;
-
+
+  /**
+   * Get the number of commands sent to the server
+   * @return the number of commands sent to the server
+   * @throw IOException 
+   */
+  public int getNumberOfCommands() throws IOException;
+
+  /**
+   * Get the number of students stored in the server. 
+   * @return the number of students stored in the server
+   * @throws IOException 
+   */
+  public int getNumberOfStudentAdded() throws IOException;
+
+  /**
+   * Check if the command was successfully done
+   * @return a boolean the success of the command 
+   * @throws IOException
+   */
+  public boolean checkSuccessOfCommand() throws IOException;
 }

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

@@ -13,58 +13,166 @@
 import java.io.PrintWriter;
 import java.net.Socket;
 import java.util.List;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
- * This class implements the client side of the protocol specification (version 1).
- * 
+ * This class implements the client side of the protocol specification (version
+ * 1).
+ *
  * @author Olivier Liechti
+ * @author Yosra Harbaoui
  */
 public class RouletteV1ClientImpl implements IRouletteV1Client {
 
-  private static final Logger LOG = Logger.getLogger(RouletteV1ClientImpl.class.getName());
+    private static final Logger LOG = Logger.getLogger(RouletteV1ClientImpl.class.getName());
 
-  @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.
-  }
+    /**
+     * protected : to be used by subclasses outside the package 
+     */
+    protected Socket socket = null;
+    protected BufferedReader reader = null;
+    protected PrintWriter writer = null;
 
-  @Override
-  public void disconnect() throws IOException {
-    throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-  }
+    @Override
+    public void connect(String server, int port) throws IOException {
+        /**
+         * 1. connection to the server
+         */
+        socket = new Socket(server, port);
 
-  @Override
-  public boolean isConnected() {
-    throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-  }
+        /**
+         * 2.creation of reader and writer to communicate with the server
+         */
+        reader = new BufferedReader(new InputStreamReader(socket.getInputStream()));
+        // writer = new PrintWriter(new OutputStreamWriter(socket.getOutputStream()), true);
+        writer = new PrintWriter(new OutputStreamWriter(socket.getOutputStream()), true);
 
-  @Override
-  public void loadStudent(String fullname) throws IOException {
-    throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-  }
 
-  @Override
-  public void loadStudents(List<Student> students) throws IOException {
-    throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-  }
+        /**
+         * 3.read the 1st line
+         */
+        reader.readLine();
+    }
 
-  @Override
-  public Student pickRandomStudent() throws EmptyStoreException, IOException {
-    throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-  }
+    @Override
+    public void disconnect() throws IOException {
+        /**
+         * 1. send the BYE command throw the writer to close the connection
+         */
+        writer.println(RouletteV1Protocol.CMD_BYE);         
+        writer.flush();
+
+        reader.readLine();
+        /**
+         * 2.close the objects used to communicate with the server
+         */
+        writer.close();
+        reader.close();
+        socket.close();
+    }
 
-  @Override
-  public int getNumberOfStudents() throws IOException {
-    throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-  }
+    @Override
+    public boolean isConnected() {
+        return socket != null && socket.isConnected();
+    }
 
-  @Override
-  public String getProtocolVersion() throws IOException {
-    throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-  }
+    @Override
+    public void loadStudent(String fullname) throws IOException {
+        /**
+         * 1. send the LOAD command throw the writer to load information from
+         * the server
+         */
+        writer.println(RouletteV1Protocol.CMD_LOAD);
+        writer.flush();
 
+        /**
+         * 2.read the information sent from the server
+         */
+        reader.readLine();
 
+        /**
+         * 3. send the full name of the student throw the writer
+         */
+        writer.println(fullname);
+
+        /**
+         * 4. send the ENDOFDATA_MARKER
+         */
+        writer.println(RouletteV1Protocol.CMD_LOAD_ENDOFDATA_MARKER);
+        writer.flush();
+
+        /**
+         * 4. read the information sent from the server
+         */
+        reader.readLine();
+    }
+
+    @Override
+    public void loadStudents(List<Student> students) throws IOException {
+
+        writer.println(RouletteV1Protocol.CMD_LOAD);
+        reader.readLine();
+        for (Student s : students) {
+          writer.println(s.getFullname());
+        }
+        writer.println(RouletteV1Protocol.CMD_LOAD_ENDOFDATA_MARKER);
+        reader.readLine();
+
+    }
+
+    @Override
+    public Student pickRandomStudent() throws EmptyStoreException, IOException {
+        /**
+         * 1. send the RANDOM command throw the writer
+         */ 
+        writer.println(RouletteV1Protocol.CMD_RANDOM);
+        writer.flush();
+
+        /**
+         * 2. load information to read the random name sent from the server
+         */ 
+        RandomCommandResponse randomResponse = JsonObjectMapper.parseJson(reader.readLine(), RandomCommandResponse.class);
+
+        /** 
+         * if information sent from the server is an error
+         */ 
+        if (randomResponse.getError() != null) {
+            throw new EmptyStoreException();
+        }
+
+        return new Student(randomResponse.getFullname());
+    }
+
+    @Override
+    public int getNumberOfStudents() throws IOException {
+        /**
+         * 1. send the INFO command throw the writer
+         */ 
+        writer.println(RouletteV1Protocol.CMD_INFO);
+        writer.flush();
+
+        /**
+         * 2. return the number of Students using information sent from the server
+         */ 
+
+        InfoCommandResponse res = JsonObjectMapper.parseJson(reader.readLine(), InfoCommandResponse.class);
+
+        return res.getNumberOfStudents();
+    }
+
+    @Override
+    public String getProtocolVersion() throws IOException {
+        /**
+         * 1. send the INFO command throw the writer
+         */ 
+        writer.println(RouletteV1Protocol.CMD_INFO);
+        writer.flush();
+
+        /**
+         * 2. return the protocol version  using information sent from the server
+         */ 
+        return JsonObjectMapper.parseJson(reader.readLine(),
+                InfoCommandResponse.class).getProtocolVersion();       
+    }
 
 }