Get all user

# Conflicts:
#	client/data/src/main/java/res/DataController.java

client/app/build.gradle.kts

@@ -13,7 +13,7 @@ javafx {
 }
 
 application {
-    mainClassName = "client.MainApplication"
+    mainClassName = "main.MainApplication"
 }
 
 repositories {
@@ -27,7 +27,7 @@ dependencies {
 
 val jar by tasks.getting(Jar::class) {
     manifest {
-        attributes["Main-Class"] = "client.Launcher"
+        attributes["Main-Class"] = "main.Launcher"
     }
     from({
         configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) }

client/app/src/main/java/main/CreateEventController.java

@@ -44,7 +44,6 @@ public class CreateEventController {
 
     @FXML
     public void initialize() {
-
         StringConverter<LocalTime> defaultConverter = new LocalTimeStringConverter(FormatStyle.SHORT, Locale.GERMANY);
         timeStart.set24HourView(true);
         timeStart.setConverter(defaultConverter);

client/app/src/main/java/main/EditEventController.java

@@ -2,16 +2,9 @@ package main;
 
 import customUI.Converter;
 import helper.HttpRequestException;
-import javafx.fxml.FXML;
-import javafx.util.StringConverter;
-import javafx.util.converter.LocalTimeStringConverter;
 import res.DataController;
 import res.Event;
 
-import java.time.LocalTime;
-import java.time.format.FormatStyle;
-import java.util.Locale;
-
 public class EditEventController extends CreateEventController{
 
     private Event currentEvent;
@@ -30,13 +23,9 @@ public class EditEventController extends CreateEventController{
         //timeEnd.setValue(currentEvent.getEnd());
     }
 
-
-
-
     @Override
     protected void sendHttpRequest(Event event) throws HttpRequestException {
         DataController dataController = new DataController();
-        dataController.deleteEvent(currentEvent.getOwnerId(), currentEvent.getId(), currentEvent.getDate());
-        dataController.createEvent(event);
+        dataController.editEvent(currentEvent, event);
     }
 }

client/app/src/main/java/main/MainController.java

@@ -126,7 +126,21 @@ public class MainController {
     }
 
     protected void onSettingBtnClick(){
-
+        try{
+            FXMLLoader fxmlLoader = new FXMLLoader(
+                    MainApplication.class.getResource("option-view.fxml"));
+            Scene scene = new Scene(fxmlLoader.load(), 650, 650);
+            scene.getStylesheets().add(Objects.requireNonNull(
+                    MainApplication.class.getResource("option-view.css")).toExternalForm());
+            Stage stage = new Stage();
+            stage.setTitle("Einstellungen");
+            stage.setScene(scene);
+            stage.initModality(Modality.APPLICATION_MODAL);
+            stage.setResizable(false);
+            stage.showAndWait();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
     }
 
     protected void onLogoutBtnClick(ActionEvent event){

client/app/src/main/java/main/OptionController.java

@@ -0,0 +1,89 @@
+package main;
+
+import com.jfoenix.controls.*;
+import helper.HttpRequestException;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Node;
+import javafx.scene.Scene;
+import javafx.scene.control.Label;
+import javafx.scene.layout.GridPane;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
+import res.DataController;
+import res.User;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+public class OptionController {
+
+    @FXML
+    public JFXButton updateUserBtn;
+    @FXML
+    public JFXButton deleteUserBtn;
+    @FXML
+    public JFXButton createUserBtn;
+    @FXML
+    public JFXToggleButton saveLoginTBtn;
+    @FXML
+    public Label labelError;
+    @FXML
+    public GridPane mainGrid;
+
+    @FXML
+    public void initialize(){
+        DataController dataController = new DataController();
+        List<User> users;
+        try{
+           users = dataController.getAllUser();
+        } catch (HttpRequestException e){
+           users = new ArrayList<>();
+        }
+
+        ObservableList<String> observableUserList = FXCollections.observableArrayList();
+        for (User user: users) {
+            observableUserList.add(user.getLogin());
+        }
+        JFXComboBox<String> comboBox = new JFXComboBox<>(observableUserList);
+        comboBox.getStyleClass().add("comboBox");
+        mainGrid.add(comboBox, 2,2);
+
+    }
+
+    public void onBackBtnClick(ActionEvent actionEvent) {
+        Stage stage = (Stage) ((Node) actionEvent.getSource()).getScene().getWindow();
+        stage.close();
+    }
+
+    public void onCreateBtnClick(ActionEvent actionEvent) {
+        try{
+            FXMLLoader fxmlLoader = new FXMLLoader(
+                    MainApplication.class.getResource("../users/create-user.fxml"));
+            Scene scene = new Scene(fxmlLoader.load(), 800, 650);
+            scene.getStylesheets().add(Objects.requireNonNull(
+                    MainApplication.class.getResource("../users/create-user.css")).toExternalForm());
+            Stage stage = new Stage();
+            stage.setTitle("User erstellen");
+            stage.setScene(scene);
+            stage.initModality(Modality.APPLICATION_MODAL);
+            stage.setResizable(false);
+            stage.showAndWait();
+            Stage stageOld = (Stage) ((Node) actionEvent.getSource()).getScene().getWindow();
+            stageOld.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void onUpdateBtnClick(ActionEvent actionEvent) {
+    }
+
+    public void onDeleteBtnClick(ActionEvent actionEvent) {
+    }
+}

client/app/src/main/resources/main/option-view.css

@@ -0,0 +1,58 @@
+GridPane{
+    -fx-background-color: #3E415F;
+    -fx-padding: 20px;
+    -fx-font-size: 20px;
+    -fx-font-family: Segoe UI;
+
+    -fx-border-insets: 1;
+    -fx-border-color: #B0B0B0;
+    -fx-border-style: solid;
+    -fx-border-width: 2;
+    -fx-effect: dropshadow(three-pass-box, rgba(100, 100, 100, 1), 24, 0.5, 0, 0);
+}
+
+Label{
+    -fx-text-fill: white;
+    -fx-max-width: 200px;
+    -fx-min-width: 200px;
+}
+
+.mainLabel{
+    -fx-background-color: #8D99AE;
+    -fx-padding: 10px;
+    -fx-max-width: 200px;
+    -fx-min-width: 200px;
+    -fx-font-weight: bold;
+    -fx-alignment: center;
+}
+
+.mainButton{
+    -fx-font-weight: bold;
+    -fx-background-color: white;
+}
+
+JFXButton{
+    -fx-background-color: white;
+}
+
+#labelError{
+    -fx-font-weight: bold;
+    -fx-max-width: 1000px;
+    -fx-text-fill: #ff5555;
+    -fx-padding: 16px;
+    -fx-min-height: 140px;
+    -fx-max-height: 400px;
+    -fx-wrap-text: true;
+    -fx-font-size: 16px;
+}
+
+.comboBox{
+    -fx-background-color: white;
+    -fx-max-width: 200px;
+    -fx-min-width: 200px;
+}
+
+.userBtn{
+    -fx-max-width: 200px;
+    -fx-min-width: 200px;
+}

client/app/src/main/resources/main/option-view.fxml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import com.jfoenix.controls.*?>
+
+<GridPane xmlns="http://javafx.com/javafx"
+          xmlns:fx="http://javafx.com/fxml"
+          fx:controller="main.OptionController"
+          prefHeight="400.0" prefWidth="600.0"
+fx:id="mainGrid">
+
+    <columnConstraints>
+        <ColumnConstraints minWidth="100"/>
+        <ColumnConstraints minWidth="100"/>
+        <ColumnConstraints minWidth="200"/>
+        <ColumnConstraints minWidth="100"/>
+        <ColumnConstraints minWidth="100"/>
+    </columnConstraints>
+    <rowConstraints>
+        <RowConstraints vgrow="ALWAYS" />
+        <RowConstraints vgrow="ALWAYS" />
+        <RowConstraints vgrow="ALWAYS" />
+        <RowConstraints vgrow="ALWAYS" />
+        <RowConstraints vgrow="ALWAYS" />
+        <RowConstraints vgrow="ALWAYS" />
+        <RowConstraints vgrow="ALWAYS" />
+        <RowConstraints vgrow="ALWAYS" />
+        <RowConstraints vgrow="ALWAYS" />
+        <RowConstraints vgrow="ALWAYS" />
+    </rowConstraints>
+
+    <Label styleClass="mainLabel" GridPane.columnIndex="2" GridPane.halignment="CENTER" >Einstellungen</Label>
+
+    <Label GridPane.columnIndex="1" GridPane.rowIndex="2" GridPane.halignment="CENTER">User:</Label>
+
+    <JFXButton styleClass="userBtn" fx:id="updateUserBtn" GridPane.columnIndex="1" GridPane.columnSpan="3"
+               GridPane.rowIndex="4" GridPane.halignment="CENTER" onAction="#onUpdateBtnClick">User bearbeiten</JFXButton>
+    <JFXButton styleClass="userBtn" fx:id="deleteUserBtn" GridPane.columnIndex="1" GridPane.columnSpan="3"
+               GridPane.rowIndex="5" GridPane.halignment="CENTER" onAction="#onDeleteBtnClick">User löschen</JFXButton>
+    <JFXButton styleClass="userBtn" fx:id="createUserBtn" GridPane.columnIndex="1" GridPane.columnSpan="3"
+               GridPane.rowIndex="7" GridPane.halignment="CENTER" onAction="#onCreateBtnClick">User anlegen</JFXButton>
+
+    <Label styleClass="loginLbl" GridPane.columnIndex="1" GridPane.rowIndex="8"
+           GridPane.halignment="CENTER">Angemeldet bleiben:</Label>
+    <JFXToggleButton fx:id="saveLoginTBtn" GridPane.columnIndex="3" GridPane.rowIndex="8"/>
+
+    <Label fx:id="labelError" styleClass="errorMessage" GridPane.columnIndex="1" GridPane.rowIndex="9"/>
+    <JFXButton GridPane.columnIndex="4" GridPane.rowIndex="9" onAction="#onBackBtnClick">Zurück</JFXButton>
+
+</GridPane>

client/data/src/main/java/config/ConfigLoader.java

@@ -1,7 +1,6 @@
 package config;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import res.DataController;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -17,7 +16,7 @@ public class ConfigLoader {
             objectMapper.findAndRegisterModules();
             return objectMapper.readValue(jsonString, Config.class);
         } catch (IOException e) {
-            e.printStackTrace();
+            System.out.println("config.json missing");
         }
         return null;
     }

client/data/src/main/java/res/DataController.java

@@ -6,13 +6,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import helper.HttpRequestException;
 import helper.Tuple;
 
-import java.io.BufferedReader;
-import java.io.DataOutputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
 import java.util.*;
 
@@ -23,10 +16,15 @@ public class DataController {
     private static final String ALL_EVENTS_ENDPOINT = "http://localhost:8080/event/all";
     private static final String ADD_EVENT_ENDPOINT = "http://localhost:8080/event/add";
     private static final String DELETE_EVENT_ENDPOINT = "http://localhost:8080/event/del";
+    private static final String EDIT_EVENT_ENDPOINT = "http://localhost:8080/event/edit";
+
+    private static final String ALL_USER_ENDPOINT = "http://localhost:8080/user/all";
+    private static final String ADD_USER_ENDPOINT = "http://localhost:8080/user/add";
+    private static final String DELETE_USER_ENDPOINT = "http://localhost:8080/user/del";
+    private static final String EDIT_USER_ENDPOINT = "http://localhost:8080/user/edit";
 
     private static final String LOGIN_ENDPOINT = "http://localhost:8080/user/login";
     private static final String LOGIN_WITH_TOKEN_ENDPOINT = "http://localhost:8080/user/login-with-token";
-    private static final String ALL_USERS_ENDPOINT = "http://localhost:8080/user/all";
     private static final String HEADER_TEST_ENDPOINT = "http://localhost:8080/vpr/header-test";
 
     private final HttpRequest httpRequest;
@@ -47,13 +45,6 @@ public class DataController {
 
             USER_ID = Long.parseLong(data[1]);
             HttpRequest.TOKEN = data[0];
-
-            Tuple<Integer, String> auth = httpRequest.sendPostRequest(
-                    HEADER_TEST_ENDPOINT,
-                    "",
-                    true
-            );
-            System.out.println("auth " + auth);
         } catch (Exception e) {
             e.printStackTrace();
             return false;
@@ -73,7 +64,7 @@ public class DataController {
 
             System.out.println(response.getKey() + " " + response.getValue());
 
-            if(response.getKey() != 200) return false;
+            if (response.getKey() != 200) return false;
         } catch (Exception e) {
             e.printStackTrace();
             return false;
@@ -83,46 +74,50 @@ public class DataController {
         return USER_ID >= 0;
     }
 
+    /*********
+     * Event *
+     *********/
     public void createEvent(Event event) throws HttpRequestException {
-        try {
-            Tuple<Integer, String> response = httpRequest.sendPostRequest(ADD_EVENT_ENDPOINT, event.getAsUrlParam(), true);
-            if(response.getKey() != 200){
-                throw new HttpRequestException(response);
-            }
-        }catch (HttpRequestException e){
-            throw e;
-        }catch (Exception e) {
-            throw new HttpRequestException("Es konnte keine Verbindung mit dem Server hergestellt werden.", 600);
-        }
+        sendBasicHttpRequest(
+                ADD_EVENT_ENDPOINT,
+                event.getAsUrlParam(),
+                true
+        );
     }
 
     public void deleteEvent(int userId, int eventId, LocalDateTime date) throws HttpRequestException {
-        try {
-            System.out.println("DELETE: userId=" + userId + "&eventId=" + eventId + "&date=" + date.toLocalDate());
-            Tuple<Integer, String> response = httpRequest.sendPostRequest(
-                    DELETE_EVENT_ENDPOINT,
-                    "userId=" + userId + "&eventId=" + eventId + "&date=" + date.toLocalDate(),
-                    true
-            );
-            if(response.getKey() != 200){
-                throw new HttpRequestException(response);
-            }
-        }catch (HttpRequestException e){
-            throw e;
-        }catch (Exception e) {
-            throw new HttpRequestException("Es konnte keine Verbindung mit dem Server hergestellt werden.", 600);
-        }
+        sendBasicHttpRequest(
+                DELETE_EVENT_ENDPOINT,
+                "userId=" + userId + "&eventId=" + eventId + "&date=" + date.toLocalDate(),
+                true
+        );
+    }
+
+    public void editEvent(Event oldEvent, Event event) throws HttpRequestException {
+        sendBasicHttpRequest(
+                EDIT_EVENT_ENDPOINT,
+                "eventId=" + oldEvent.getId() +
+                        "&userId=" + oldEvent.getOwnerId() +
+                        "&date=" + oldEvent.getDate().toLocalDate() +
+                        "&newDate=" + event.getDate().toLocalDate() +
+                        "&newName=" + event.getName() +
+                        "&newStart=" + event.getStart() +
+                        "&newEnd=" + event.getEnd() +
+                        "&newPriority=" + event.getPriority() +
+                        "&newIsFullDay=" + event.isFullDay() +
+                        "&newIsPrivate=" + event.isPrivate(),
+                true
+        );
     }
 
     public ArrayList<Event> getAllVisibleEvents(LocalDateTime startDate, LocalDateTime endDate) throws HttpRequestException {
-        ArrayList<Event> eventList = new ArrayList<>();
         try {
             Tuple<Integer, String> response = httpRequest.sendPostRequest(
                     ALL_EVENTS_ENDPOINT,
                     "userId=" + USER_ID + "&startDate=" + startDate.toLocalDate() + "&endDate=" + endDate.toLocalDate(),
                     true
             );
-            if(response.getKey() != 200){
+            if (response.getKey() != 200) {
                 throw new HttpRequestException(response);
             }
             String jsonResponse = response.getValue();
@@ -130,17 +125,80 @@ public class DataController {
 
             ObjectMapper objectMapper = new ObjectMapper();
             objectMapper.findAndRegisterModules();
-            eventList = (ArrayList<Event>) objectMapper.readValue(jsonResponse, new TypeReference<List<Event>>(){});
+            return (ArrayList<Event>) objectMapper.readValue(jsonResponse, new TypeReference<List<Event>>() {});
 
-
-        }catch (HttpRequestException e){
+        } catch (HttpRequestException e) {
             throw e;
-        }catch (Exception e) {
+        } catch (Exception e) {
             throw new HttpRequestException("Es konnte keine Verbindung mit dem Server hergestellt werden.", 600);
         }
-
-        return eventList;
     }
 
+    /********
+     * User *
+     ********/
 
+    public List<User> getAllUser() throws HttpRequestException {
+        String userJSON = sendBasicHttpRequest(
+                ALL_USER_ENDPOINT,
+                "",
+                true
+        );
+
+        ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.findAndRegisterModules();
+        try {
+            return (List<User>)objectMapper.readValue(userJSON, new TypeReference<List<User>>() {});
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+        return new ArrayList<>();
+    }
+
+    public void createUser(User user) throws HttpRequestException {
+        sendBasicHttpRequest(
+                ADD_USER_ENDPOINT,
+                "name=" + user.getName() +
+                        "&forename=" + user.getForename() +
+                        "&login=" + user.getLogin() +
+                        "&password=" + user.getPassword() +
+                        "&isAdmin=" + user.isAdmin(),
+                true
+        );
+    }
+
+    public void deleteUser(User user) throws HttpRequestException {
+        sendBasicHttpRequest(
+                DELETE_USER_ENDPOINT,
+                "userId=" + user.getUserId(),
+                true
+        );
+    }
+
+    public void editUser(User oldUser, User user) throws HttpRequestException {
+        sendBasicHttpRequest(
+                EDIT_USER_ENDPOINT,
+                "",
+                true
+        );
+    }
+
+    private String sendBasicHttpRequest(String urlString, String urlParameters, boolean sendAuth) throws HttpRequestException {
+        try {
+            Tuple<Integer, String> response = httpRequest.sendPostRequest(
+                    urlString,
+                    urlParameters,
+                    sendAuth
+            );
+            if (response.getKey() != 200) {
+                throw new HttpRequestException(response);
+            }
+
+            return response.getValue();
+        } catch (HttpRequestException e) {
+            throw e;
+        } catch (Exception e) {
+            throw new HttpRequestException("Es konnte keine Verbindung mit dem Server hergestellt werden.", 600);
+        }
+    }
 }

client/data/src/main/java/res/Event.java

@@ -30,68 +30,7 @@ public class Event {
     private int ownerId;
     private String ownerName;
 
-    /*
-    Constructor for SELECT:
-    e.id AS eid,
-    e.name AS ename,
-    e.start,
-    e.end,
-    e.priority,
-    e.is_full_day,
-
-    ue.date,
-
-    u.id AS uid,
-    u.forename,
-    u.name AS uname
-     */
-
-    public Event() {
-
-    }
-
-    public Event(ArrayList<Object> arr) {
-        id = (int) arr.get(0);
-        name = (String) arr.get(1);
-        start = (String) arr.get(2);
-        end = (String) arr.get(3);
-        priority = (int) arr.get(4);
-        isFullDay = (Boolean) arr.get(5); //((String)arr.get(5)).equals("true");
-
-
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
-        date = LocalDateTime.parse(arr.get(6) + " 00:00", formatter);
-
-        ownerId = (int) arr.get(7);
-        ownerName = arr.get(8) + " " + arr.get(9);
-    }
-
-    public Event(
-            int id,
-            String name,
-            int priority,
-            boolean isFullDay,
-            boolean isPrivate,
-            String start,
-            String end,
-            String date,
-            int ownerId,
-            String ownerName
-    ) {
-        this.ownerId = ownerId;
-        this.ownerName = ownerName;
-        this.id = id;
-        this.name = name;
-        this.start = start;
-        this.end = end;
-        this.priority = priority;
-        this.isFullDay = isFullDay;
-
-
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
-        this.date = LocalDateTime.parse(date + " 00:00", formatter);
-
-    }
+    public Event() {}
 
     public Event(String name,
                  int priority,

client/data/src/main/java/res/HttpRequest.java

@@ -4,6 +4,7 @@ import helper.Tuple;
 
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
+import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -17,48 +18,52 @@ public class HttpRequest {
         byte[] postData = urlParameters.getBytes(StandardCharsets.UTF_8);
         int postDataLength = postData.length;
 
-        /*
-        URL url = new URL("http://test.de:8080/event/add");
-        HttpURLConnection http = (HttpURLConnection)url.openConnection();
-        http.setRequestMethod("POST");
-        http.setDoOutput(true);
-        http.setRequestProperty("Accept", "application/json");
-        http.setRequestProperty("Authorization", "Bearer {token}");
-        http.setRequestProperty("Content-Type", "");
-        http.setRequestProperty("Content-Length", "0");
-
-        System.out.println(http.getResponseCode() + " " + http.getResponseMessage());
-        http.disconnect();
-         */
         URL url = new URL(urlString);
-        HttpURLConnection con = (HttpURLConnection) url.openConnection();
+        HttpURLConnection connection = (HttpURLConnection) url.openConnection();
 
-        con.setDoOutput(true);
-        con.setInstanceFollowRedirects(false);
-        con.setRequestMethod("POST");
-        con.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
-        con.setRequestProperty("charset", "utf-8");
-        con.setRequestProperty("Content-Length", Integer.toString(postDataLength));
-        con.setUseCaches(false);
+        connection.setDoOutput(true);
+        connection.setInstanceFollowRedirects(false);
+        connection.setRequestMethod("POST");
+        connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+        connection.setRequestProperty("charset", "utf-8");
+        connection.setRequestProperty("Content-Length", Integer.toString(postDataLength));
+        connection.setUseCaches(false);
 
         if(sendAuth){
-            con.setRequestProperty("Accept", "application/json");
-            con.setRequestProperty("Authorization", "Bearer " + TOKEN);
+            connection.setRequestProperty("Accept", "application/json");
+            connection.setRequestProperty("Authorization", "Bearer " + TOKEN);
         }
 
-        try (DataOutputStream wr = new DataOutputStream(con.getOutputStream())) {
-            wr.write(postData);
+        try (DataOutputStream writer = new DataOutputStream(connection.getOutputStream())) {
+            writer.write(postData);
         }
 
-        int status = con.getResponseCode();
+        return getHttpTuple(connection);
+    }
+
+    public Tuple<Integer, String> sendGetRequest(String urlString) throws Exception {
+        URL url = new URL(urlString);
+        HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+        connection.setRequestMethod("GET");
+
+        connection.setConnectTimeout(5000);
+        connection.setReadTimeout(5000);
+
+        int status = connection.getResponseCode();
+
+        return getHttpTuple(connection);
+    }
+
+    private Tuple<Integer, String> getHttpTuple(HttpURLConnection connection) throws IOException {
+        int status = connection.getResponseCode();
         String inputLine;
         StringBuilder content = new StringBuilder();
         BufferedReader in;
 
         if (status == 200) {
-             in = new BufferedReader(new InputStreamReader(con.getInputStream()));
+            in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
         } else {
-             in = new BufferedReader(new InputStreamReader(con.getErrorStream()));
+            in = new BufferedReader(new InputStreamReader(connection.getErrorStream()));
         }
 
         while ((inputLine = in.readLine()) != null) {
@@ -66,36 +71,8 @@ public class HttpRequest {
         }
         in.close();
 
-        con.disconnect();
+        connection.disconnect();
 
         return new Tuple<>(status, content.toString());
     }
-
-    public String sendGetRequest(String urlString) throws Exception {
-        URL url = new URL(urlString);
-        HttpURLConnection con = (HttpURLConnection) url.openConnection();
-        con.setRequestMethod("GET");
-
-        con.setConnectTimeout(5000);
-        con.setReadTimeout(5000);
-
-        int status = con.getResponseCode();
-        if (status == 200) {
-            BufferedReader in = new BufferedReader(
-                    new InputStreamReader(con.getInputStream()));
-            String inputLine;
-            StringBuilder content = new StringBuilder();
-            while ((inputLine = in.readLine()) != null) {
-                content.append(inputLine);
-            }
-            in.close();
-
-            con.disconnect();
-            return content.toString();
-
-        } else {
-            con.disconnect();
-            throw new Exception("Status: " + status);
-        }
-    }
 }

client/data/src/main/java/res/User.java

@@ -0,0 +1,61 @@
+package res;
+
+public class User {
+
+    private int userId;
+    private String login;
+    private String forename;
+    private String name;
+    private String password;
+    private boolean isAdmin;
+
+    public User(){}
+
+    public int getUserId() {
+        return userId;
+    }
+
+    public void setUserId(int userId) {
+        this.userId = userId;
+    }
+
+    public String getLogin() {
+        return login;
+    }
+
+    public void setLogin(String login) {
+        this.login = login;
+    }
+
+    public String getForename() {
+        return forename;
+    }
+
+    public void setForename(String forename) {
+        this.forename = forename;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public boolean isAdmin() {
+        return isAdmin;
+    }
+
+    public void setAdmin(boolean admin) {
+        isAdmin = admin;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+}