Merge branch 'merge' into Comments
# Conflicts: # client/app/src/main/java/customUI/Button.java # client/app/src/main/java/customUI/Converter.java # client/app/src/main/java/customUI/Label.java # client/app/src/main/java/customUI/Tooltip.java # client/app/src/main/java/events/EditEventController.java # client/app/src/main/java/helper/SvgBtnCreator.java # client/app/src/main/java/main/MainController.java # client/data/src/main/java/container/Event.java # client/data/src/main/java/res/DataController.java # client/data/src/main/java/res/HttpRequest.java
This commit is contained in:
@@ -2,6 +2,10 @@ plugins {
|
||||
java
|
||||
}
|
||||
|
||||
tasks.withType<JavaCompile> {
|
||||
options.encoding = "UTF-8"
|
||||
}
|
||||
|
||||
dependencies {
|
||||
val jacksonVersion = "2.13.0"
|
||||
implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
|
||||
|
||||
@@ -5,15 +5,26 @@ public class Config {
|
||||
private boolean saveLogin;
|
||||
private long id;
|
||||
private String token;
|
||||
private String connectionMethod;
|
||||
private String hostAddress;
|
||||
private int port;
|
||||
|
||||
public Config(){
|
||||
|
||||
saveLogin = false;
|
||||
id = -1;
|
||||
token = "";
|
||||
connectionMethod = "http";
|
||||
hostAddress = "localhost";
|
||||
port = 8080;
|
||||
}
|
||||
|
||||
public Config(boolean saveLogin, long id, String token) {
|
||||
this.saveLogin = saveLogin;
|
||||
this.id = id;
|
||||
this.token = token;
|
||||
connectionMethod = "http";
|
||||
hostAddress = "localhost";
|
||||
port = 8080;
|
||||
}
|
||||
|
||||
public boolean isSaveLogin() {
|
||||
@@ -39,4 +50,32 @@ public class Config {
|
||||
public void setToken(String token) {
|
||||
this.token = token;
|
||||
}
|
||||
|
||||
public String getConnectionMethod() {
|
||||
return connectionMethod;
|
||||
}
|
||||
|
||||
public void setConnectionMethod(String connectionMethod) {
|
||||
this.connectionMethod = connectionMethod;
|
||||
}
|
||||
|
||||
public String getHostAddress() {
|
||||
return hostAddress;
|
||||
}
|
||||
|
||||
public void setHostAddress(String hostAddress) {
|
||||
this.hostAddress = hostAddress;
|
||||
}
|
||||
|
||||
public int getPort() {
|
||||
return port;
|
||||
}
|
||||
|
||||
public void setPort(int port) {
|
||||
this.port = port;
|
||||
}
|
||||
|
||||
public String toServerUrl(){
|
||||
return getConnectionMethod() + "://" + getHostAddress() + ":" + getPort();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
package config;
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import res.DataController;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
@@ -18,9 +17,11 @@ public class ConfigLoader {
|
||||
objectMapper.findAndRegisterModules();
|
||||
return objectMapper.readValue(jsonString, Config.class);
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
System.out.println("config.json missing");
|
||||
Config config = new Config(false, -1, "");
|
||||
save(config);
|
||||
return config;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public static void save(Config config){
|
||||
@@ -28,9 +29,12 @@ public class ConfigLoader {
|
||||
objectMapper.findAndRegisterModules();
|
||||
|
||||
try {
|
||||
Files.writeString(Paths.get(
|
||||
"config.json"),
|
||||
Files.writeString(
|
||||
Paths.get("config.json"),
|
||||
objectMapper.writeValueAsString(config)
|
||||
.replace(",", ",\n\t")
|
||||
.replace("{", "{\n\t")
|
||||
.replace("}", "\n}")
|
||||
);
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
|
||||
220
client/data/src/main/java/container/DataController.java
Normal file
220
client/data/src/main/java/container/DataController.java
Normal file
@@ -0,0 +1,220 @@
|
||||
package container;
|
||||
|
||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
import com.fasterxml.jackson.core.type.TypeReference;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import helper.HttpRequestException;
|
||||
import helper.Tuple;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.*;
|
||||
|
||||
public class DataController {
|
||||
|
||||
public static long USER_ID = -1;
|
||||
public static String SERVER_URL = "http://localhost:8080";
|
||||
|
||||
private static final String ALL_EVENTS_ENDPOINT = "/event/all";
|
||||
private static final String ADD_EVENT_ENDPOINT = "/event/add";
|
||||
private static final String DELETE_EVENT_ENDPOINT = "/event/del";
|
||||
private static final String EDIT_EVENT_ENDPOINT = "/event/edit";
|
||||
|
||||
private static final String ALL_USER_ENDPOINT = "/user/all";
|
||||
private static final String ADD_USER_ENDPOINT = "/user/add";
|
||||
private static final String DELETE_USER_ENDPOINT = "/user/del";
|
||||
private static final String EDIT_USER_ENDPOINT = "/user/edit";
|
||||
|
||||
private static final String LOGIN_ENDPOINT = "/user/login";
|
||||
private static final String LOGIN_WITH_TOKEN_ENDPOINT = "/user/login-with-token";
|
||||
private static final String HEADER_TEST_ENDPOINT = "/vpr/header-test";
|
||||
|
||||
private final HttpRequest httpRequest;
|
||||
|
||||
public DataController() {
|
||||
httpRequest = new HttpRequest();
|
||||
}
|
||||
|
||||
public boolean login(String username, String password) {
|
||||
try {
|
||||
Tuple<Integer, String> response = httpRequest.sendPostRequest(
|
||||
SERVER_URL + LOGIN_ENDPOINT,
|
||||
"login=" + username
|
||||
+ "&password=" + password,
|
||||
false
|
||||
);
|
||||
String[] data = response.getValue().split("\\s+");
|
||||
|
||||
USER_ID = Long.parseLong(data[1]);
|
||||
HttpRequest.TOKEN = data[0];
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return false;
|
||||
}
|
||||
|
||||
return USER_ID >= 0;
|
||||
}
|
||||
|
||||
public boolean loginWithToken(long userId, String token) {
|
||||
try {
|
||||
HttpRequest.TOKEN = token;
|
||||
Tuple<Integer, String> response = httpRequest.sendPostRequest(
|
||||
SERVER_URL + LOGIN_WITH_TOKEN_ENDPOINT,
|
||||
"userId=" + userId,
|
||||
true
|
||||
);
|
||||
|
||||
System.out.println(response.getKey() + " " + response.getValue());
|
||||
|
||||
if (response.getKey() != 200) return false;
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return false;
|
||||
}
|
||||
USER_ID = userId;
|
||||
HttpRequest.TOKEN = token;
|
||||
return USER_ID >= 0;
|
||||
}
|
||||
|
||||
/*********
|
||||
* Event *
|
||||
*********/
|
||||
public void createEvent(Event event) throws HttpRequestException {
|
||||
sendBasicHttpRequest(
|
||||
SERVER_URL + ADD_EVENT_ENDPOINT,
|
||||
event.getAsUrlParam(),
|
||||
true
|
||||
);
|
||||
}
|
||||
|
||||
public void deleteEvent(int userId, int eventId, LocalDateTime date) throws HttpRequestException {
|
||||
sendBasicHttpRequest(
|
||||
SERVER_URL + DELETE_EVENT_ENDPOINT,
|
||||
"userId=" + userId + "&eventId=" + eventId + "&date=" + date.toLocalDate(),
|
||||
true
|
||||
);
|
||||
}
|
||||
|
||||
public void editEvent(Event oldEvent, Event event) throws HttpRequestException {
|
||||
sendBasicHttpRequest(
|
||||
SERVER_URL + 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 {
|
||||
try {
|
||||
Tuple<Integer, String> response = httpRequest.sendPostRequest(
|
||||
SERVER_URL + ALL_EVENTS_ENDPOINT,
|
||||
"userId=" + USER_ID + "&startDate=" + startDate.toLocalDate() + "&endDate=" + endDate.toLocalDate(),
|
||||
true
|
||||
);
|
||||
if (response.getKey() != 200) {
|
||||
throw new HttpRequestException(response);
|
||||
}
|
||||
String jsonResponse = response.getValue();
|
||||
System.out.println(jsonResponse);
|
||||
|
||||
ObjectMapper objectMapper = new ObjectMapper();
|
||||
objectMapper.findAndRegisterModules();
|
||||
return (ArrayList<Event>) objectMapper.readValue(jsonResponse, new TypeReference<List<Event>>() {
|
||||
});
|
||||
|
||||
} catch (HttpRequestException e) {
|
||||
throw e;
|
||||
} catch (Exception e) {
|
||||
throw new HttpRequestException("Es konnte keine Verbindung mit dem Server hergestellt werden.", 600);
|
||||
}
|
||||
}
|
||||
|
||||
/********
|
||||
* User *
|
||||
********/
|
||||
|
||||
public List<User> getAllUser() throws HttpRequestException {
|
||||
String userJSON = sendBasicHttpRequest(
|
||||
SERVER_URL + ALL_USER_ENDPOINT,
|
||||
"",
|
||||
true
|
||||
);
|
||||
|
||||
ObjectMapper objectMapper = new ObjectMapper();
|
||||
objectMapper.findAndRegisterModules();
|
||||
try {
|
||||
List<User> list = objectMapper.readValue(userJSON, new TypeReference<>() {
|
||||
});
|
||||
|
||||
for(User u : list){
|
||||
System.out.println(u);
|
||||
}
|
||||
return list;
|
||||
} catch (JsonProcessingException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
return new ArrayList<>();
|
||||
}
|
||||
|
||||
public void createUser(User user) throws HttpRequestException {
|
||||
sendBasicHttpRequest(
|
||||
SERVER_URL + 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(
|
||||
SERVER_URL + DELETE_USER_ENDPOINT,
|
||||
"userId=" + user.getUserId(),
|
||||
true
|
||||
);
|
||||
}
|
||||
|
||||
public void editUser(User user) throws HttpRequestException {
|
||||
String urlParam = "userId=" + user.getUserId() +
|
||||
"&name=" + user.getName() +
|
||||
"&forename=" + user.getForename() +
|
||||
"&login=" + user.getLogin() +
|
||||
"&isAdmin=" + user.isAdmin() +
|
||||
(user.getPassword() == null ? "" : "&password=" + user.getPassword());
|
||||
|
||||
System.out.println(urlParam);
|
||||
sendBasicHttpRequest(
|
||||
SERVER_URL + EDIT_USER_ENDPOINT,
|
||||
urlParam,
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,20 +1,11 @@
|
||||
//Marc Beyer//
|
||||
package res;
|
||||
package container;
|
||||
|
||||
import com.sun.jdi.event.StepEvent;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.sql.SQLOutput;
|
||||
import java.time.Duration;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.LocalTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.ArrayList;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
import java.util.regex.PatternSyntaxException;
|
||||
|
||||
public class Event {
|
||||
|
||||
@@ -31,68 +22,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,
|
||||
@@ -106,15 +36,15 @@ public class Event {
|
||||
|
||||
System.out.println("Create Event");
|
||||
if (name.length() < 3) {
|
||||
throw new IllegalArgumentException("Der Name muss eine L\u00e4nge von 3 haben.");
|
||||
throw new IllegalArgumentException("Der Name muss eine Länge von 3 haben.");
|
||||
}
|
||||
Pattern pattern = Pattern.compile("[A-Za-z\u00e4\u00f6\u00fc\u00c4\u00d6\u00dc\u00df0-9 =!?+*/$.:,;_<>()-]*");
|
||||
Pattern pattern = Pattern.compile("[A-Za-zäöüÄÖÜß0-9 =!?+*/$.:,;_<>()-]*");
|
||||
Matcher matcher = pattern.matcher(name);
|
||||
if (!matcher.matches()) {
|
||||
throw new IllegalArgumentException("Der Name darf nur aus Zahlen, Buchstaben und folgenden Sonderzeichen bestehen: \u00e4\u00f6\u00fc \u00c4\u00d6\u00dc \u00df =!?+*/$.:,;_ <>()-");
|
||||
throw new IllegalArgumentException("Der Name darf nur aus Zahlen, Buchstaben und folgenden Sonderzeichen bestehen: äöü ÄÖÜ ß =!?+*/$.:,;_ <>()-");
|
||||
}
|
||||
if (priority < 0) {
|
||||
throw new IllegalArgumentException("Bitte eine Priorit\u00e4t w\u00e4hlen.");
|
||||
throw new IllegalArgumentException("Bitte eine Priorität wählen.");
|
||||
}
|
||||
LocalDateTime today = LocalDateTime.now().toLocalDate().atStartOfDay();
|
||||
if (Duration.between(today, date).isNegative()) {
|
||||
@@ -126,7 +56,7 @@ public class Event {
|
||||
this.isFullDay = isFullDay;
|
||||
this.isPrivate = isPrivate;
|
||||
if (start != null) this.start = start.toString();
|
||||
if (start != null) this.end = end.toString();
|
||||
if (end != null) this.end = end.toString();
|
||||
this.date = date;
|
||||
this.ownerId = ownerId;
|
||||
}
|
||||
@@ -144,9 +74,7 @@ public class Event {
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
System.out.println(name);
|
||||
this.name = name;
|
||||
System.out.println(this.name);
|
||||
}
|
||||
|
||||
public int getPriority() {
|
||||
77
client/data/src/main/java/container/HttpRequest.java
Normal file
77
client/data/src/main/java/container/HttpRequest.java
Normal file
@@ -0,0 +1,77 @@
|
||||
package container;
|
||||
|
||||
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;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
|
||||
public class HttpRequest {
|
||||
public static String TOKEN = "";
|
||||
|
||||
public Tuple<Integer, String> sendPostRequest(String urlString, String urlParameters, boolean sendAuth) throws Exception {
|
||||
byte[] postData = urlParameters.getBytes(StandardCharsets.UTF_8);
|
||||
int postDataLength = postData.length;
|
||||
|
||||
URL url = new URL(urlString);
|
||||
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
|
||||
|
||||
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){
|
||||
connection.setRequestProperty("Accept", "application/json");
|
||||
connection.setRequestProperty("Authorization", "Bearer " + TOKEN);
|
||||
}
|
||||
|
||||
try (DataOutputStream writer = new DataOutputStream(connection.getOutputStream())) {
|
||||
writer.write(postData);
|
||||
}
|
||||
|
||||
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(connection.getInputStream(), StandardCharsets.UTF_8));
|
||||
} else {
|
||||
in = new BufferedReader(new InputStreamReader(connection.getErrorStream(), StandardCharsets.UTF_8));
|
||||
}
|
||||
|
||||
while ((inputLine = in.readLine()) != null) {
|
||||
content.append(inputLine);
|
||||
}
|
||||
in.close();
|
||||
|
||||
connection.disconnect();
|
||||
|
||||
return new Tuple<>(status, content.toString());
|
||||
}
|
||||
}
|
||||
75
client/data/src/main/java/container/User.java
Normal file
75
client/data/src/main/java/container/User.java
Normal file
@@ -0,0 +1,75 @@
|
||||
package container;
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "User{" +
|
||||
"userId=" + userId +
|
||||
", login='" + login + '\'' +
|
||||
", forename='" + forename + '\'' +
|
||||
", name='" + name + '\'' +
|
||||
", password='" + password + '\'' +
|
||||
", isAdmin=" + isAdmin +
|
||||
'}';
|
||||
}
|
||||
}
|
||||
@@ -1,147 +0,0 @@
|
||||
//Marc Beyer//
|
||||
package res;
|
||||
|
||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
import com.fasterxml.jackson.core.type.TypeReference;
|
||||
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.*;
|
||||
|
||||
public class DataController {
|
||||
|
||||
public static long USER_ID = -1;
|
||||
|
||||
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 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;
|
||||
|
||||
public DataController() {
|
||||
httpRequest = new HttpRequest();
|
||||
}
|
||||
|
||||
public boolean login(String username, String password) {
|
||||
try {
|
||||
Tuple<Integer, String> response = httpRequest.sendPostRequest(
|
||||
LOGIN_ENDPOINT,
|
||||
"login=" + username
|
||||
+ "&password=" + password,
|
||||
false
|
||||
);
|
||||
String[] data = response.getValue().split("\\s+");
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
return USER_ID >= 0;
|
||||
}
|
||||
|
||||
public boolean loginWithToken(long userId, String token) {
|
||||
try {
|
||||
HttpRequest.TOKEN = token;
|
||||
Tuple<Integer, String> response = httpRequest.sendPostRequest(
|
||||
LOGIN_WITH_TOKEN_ENDPOINT,
|
||||
"userId=" + userId,
|
||||
true
|
||||
);
|
||||
|
||||
System.out.println(response.getKey() + " " + response.getValue());
|
||||
|
||||
if(response.getKey() != 200) return false;
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return false;
|
||||
}
|
||||
USER_ID = userId;
|
||||
HttpRequest.TOKEN = token;
|
||||
return USER_ID >= 0;
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
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){
|
||||
throw new HttpRequestException(response);
|
||||
}
|
||||
String jsonResponse = response.getValue();
|
||||
System.out.println(jsonResponse);
|
||||
|
||||
ObjectMapper objectMapper = new ObjectMapper();
|
||||
objectMapper.findAndRegisterModules();
|
||||
eventList = (ArrayList<Event>) objectMapper.readValue(jsonResponse, new TypeReference<List<Event>>(){});
|
||||
|
||||
|
||||
}catch (HttpRequestException e){
|
||||
throw e;
|
||||
}catch (Exception e) {
|
||||
throw new HttpRequestException("Es konnte keine Verbindung mit dem Server hergestellt werden.", 600);
|
||||
}
|
||||
|
||||
return eventList;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -1,102 +0,0 @@
|
||||
//Marc Beyer//
|
||||
package res;
|
||||
|
||||
import helper.Tuple;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.DataOutputStream;
|
||||
import java.io.InputStreamReader;
|
||||
import java.net.HttpURLConnection;
|
||||
import java.net.URL;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.Arrays;
|
||||
|
||||
public class HttpRequest {
|
||||
public static String TOKEN = "";
|
||||
|
||||
public Tuple<Integer, String> sendPostRequest(String urlString, String urlParameters, boolean sendAuth) throws Exception {
|
||||
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();
|
||||
|
||||
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);
|
||||
|
||||
if(sendAuth){
|
||||
con.setRequestProperty("Accept", "application/json");
|
||||
con.setRequestProperty("Authorization", "Bearer " + TOKEN);
|
||||
}
|
||||
|
||||
try (DataOutputStream wr = new DataOutputStream(con.getOutputStream())) {
|
||||
wr.write(postData);
|
||||
}
|
||||
|
||||
int status = con.getResponseCode();
|
||||
String inputLine;
|
||||
StringBuilder content = new StringBuilder();
|
||||
BufferedReader in;
|
||||
|
||||
if (status == 200) {
|
||||
in = new BufferedReader(new InputStreamReader(con.getInputStream()));
|
||||
} else {
|
||||
in = new BufferedReader(new InputStreamReader(con.getErrorStream()));
|
||||
}
|
||||
|
||||
while ((inputLine = in.readLine()) != null) {
|
||||
content.append(inputLine);
|
||||
}
|
||||
in.close();
|
||||
|
||||
con.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);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user