Peer-at-Code/peer-at-code-backend
5
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Refractor webserver to framework & starting of the ORM (will be continuing later)

Browse source
This commit is contained in:
jeffcheasey88 2023-04-09 17:54:38 +02:00
parent 9c98ca573a
commit 22a0026939
29 changed files with 115 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.classpath
View file

@ -9,5 +9,11 @@
<classpathentry exported="true" kind="lib" path="slf4j-api-2.0.6.jar"/>
<classpathentry exported="true" kind="lib" path="jose4j-0.9.3.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
<classpathentry kind="src" path=".apt_generated">
<attributes>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="Treasure.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

4
.factorypath Normal file
View file

@ -0,0 +1,4 @@
<factorypath>
<factorypathentry kind="PLUGIN" id="org.eclipse.jst.ws.annotations.core" enabled="false" runInBatchMode="false"/>
<factorypathentry kind="EXTJAR" id="Treasure.jar" enabled="true" runInBatchMode="false"/>
</factorypath>

3
.gitignore vendored
View file

@ -1,6 +1,7 @@
.settings/
.settings/org.eclipse.jdt.core.prefs
bin/
.project
config.txt
dist/
testApi/
.apt_generated/*

6
.settings/org.eclipse.jdt.apt.core.prefs Normal file
View file

@ -0,0 +1,6 @@
eclipse.preferences.version=1
org.eclipse.jdt.apt.aptEnabled=true
org.eclipse.jdt.apt.genSrcDir=.apt_generated
org.eclipse.jdt.apt.genTestSrcDir=.apt_generated_tests
org.eclipse.jdt.apt.processorOptions/treasure.source=%sourcepath%
org.eclipse.jdt.apt.reconcileEnabled=true

BIN
Treasure.jar Normal file
View file

Binary file not shown.

16
src/be/jeffcheasey88/peeratcode/Main.java
View file

@ -11,6 +11,14 @@ import javax.net.ssl.SSLServerSocketFactory;
import org.jose4j.jwk.RsaJsonWebKey;
import org.jose4j.jwk.RsaJwkGenerator;
import be.jeffcheasey88.peeratcode.framework.Client;
import be.jeffcheasey88.peeratcode.framework.HttpReader;
import be.jeffcheasey88.peeratcode.framework.HttpUtil;
import be.jeffcheasey88.peeratcode.framework.HttpWriter;
import be.jeffcheasey88.peeratcode.framework.Response;
import be.jeffcheasey88.peeratcode.framework.Route;
import be.jeffcheasey88.peeratcode.framework.Router;
import be.jeffcheasey88.peeratcode.framework.User;
import be.jeffcheasey88.peeratcode.repository.DatabaseRepository;
import be.jeffcheasey88.peeratcode.routes.BadgeDetails;
import be.jeffcheasey88.peeratcode.routes.ChapterElement;
@ -24,14 +32,6 @@ import be.jeffcheasey88.peeratcode.routes.Register;
import be.jeffcheasey88.peeratcode.routes.Result;
import be.jeffcheasey88.peeratcode.routes.groups.CreateGroup;
import be.jeffcheasey88.peeratcode.routes.groups.GroupList;
import be.jeffcheasey88.peeratcode.webserver.Client;
import be.jeffcheasey88.peeratcode.webserver.HttpReader;
import be.jeffcheasey88.peeratcode.webserver.HttpUtil;
import be.jeffcheasey88.peeratcode.webserver.HttpWriter;
import be.jeffcheasey88.peeratcode.webserver.Response;
import be.jeffcheasey88.peeratcode.webserver.Route;
import be.jeffcheasey88.peeratcode.webserver.Router;
import be.jeffcheasey88.peeratcode.webserver.User;
public class Main {
public static void main(String[] args) throws Exception {

2
src/be/jeffcheasey88/peeratcode/webserver/Client.java → src/be/jeffcheasey88/peeratcode/framework/Client.java
View file

@ -1,4 +1,4 @@
package be.jeffcheasey88.peeratcode.webserver;
package be.jeffcheasey88.peeratcode.framework;
import java.net.Socket;
import java.util.Arrays;

2
src/be/jeffcheasey88/peeratcode/webserver/HttpReader.java → src/be/jeffcheasey88/peeratcode/framework/HttpReader.java
View file

@ -1,4 +1,4 @@
package be.jeffcheasey88.peeratcode.webserver;
package be.jeffcheasey88.peeratcode.framework;
import java.io.BufferedReader;
import java.io.IOException;

2
src/be/jeffcheasey88/peeratcode/webserver/HttpUtil.java → src/be/jeffcheasey88/peeratcode/framework/HttpUtil.java
View file

@ -1,4 +1,4 @@
package be.jeffcheasey88.peeratcode.webserver;
package be.jeffcheasey88.peeratcode.framework;
import java.security.MessageDigest;
import java.util.ArrayList;

2
src/be/jeffcheasey88/peeratcode/webserver/HttpWriter.java → src/be/jeffcheasey88/peeratcode/framework/HttpWriter.java
View file

@ -1,4 +1,4 @@
package be.jeffcheasey88.peeratcode.webserver;
package be.jeffcheasey88.peeratcode.framework;
import java.io.BufferedWriter;
import java.io.IOException;

2
src/be/jeffcheasey88/peeratcode/webserver/Response.java → src/be/jeffcheasey88/peeratcode/framework/Response.java
View file

@ -1,4 +1,4 @@
package be.jeffcheasey88.peeratcode.webserver;
package be.jeffcheasey88.peeratcode.framework;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

2
src/be/jeffcheasey88/peeratcode/webserver/Route.java → src/be/jeffcheasey88/peeratcode/framework/Route.java
View file

@ -1,4 +1,4 @@
package be.jeffcheasey88.peeratcode.webserver;
package be.jeffcheasey88.peeratcode.framework;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

2
src/be/jeffcheasey88/peeratcode/webserver/Router.java → src/be/jeffcheasey88/peeratcode/framework/Router.java
View file

@ -1,4 +1,4 @@
package be.jeffcheasey88.peeratcode.webserver;
package be.jeffcheasey88.peeratcode.framework;
import java.lang.reflect.Method;
import java.util.HashMap;

2
src/be/jeffcheasey88/peeratcode/webserver/User.java → src/be/jeffcheasey88/peeratcode/framework/User.java
View file

@ -1,4 +1,4 @@
package be.jeffcheasey88.peeratcode.webserver;
package be.jeffcheasey88.peeratcode.framework;
import org.jose4j.jwt.JwtClaims;

6
src/be/jeffcheasey88/peeratcode/model/Badge.java
View file

@ -1,6 +1,10 @@
package be.jeffcheasey88.peeratcode.model;
import be.jeffcheasey88.peeratcode.mapping.Treasure;
@Treasure
public class Badge {
private String name;
private byte[] logo;
private int level;
@ -15,7 +19,7 @@ public class Badge {
this.level = level;
}
public String getName() {
public String getName(){
return name;
}

7
src/be/jeffcheasey88/peeratcode/model/Player.java
View file

@ -1,16 +1,9 @@
package be.jeffcheasey88.peeratcode.model;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Base64;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.SortedSet;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;

12
src/be/jeffcheasey88/peeratcode/routes/BadgeDetails.java
View file

@ -1,13 +1,13 @@
package be.jeffcheasey88.peeratcode.routes;
import be.jeffcheasey88.peeratcode.framework.HttpReader;
import be.jeffcheasey88.peeratcode.framework.HttpUtil;
import be.jeffcheasey88.peeratcode.framework.HttpWriter;
import be.jeffcheasey88.peeratcode.framework.Response;
import be.jeffcheasey88.peeratcode.framework.Route;
import be.jeffcheasey88.peeratcode.framework.User;
import be.jeffcheasey88.peeratcode.model.Badge;
import be.jeffcheasey88.peeratcode.repository.DatabaseRepository;
import be.jeffcheasey88.peeratcode.webserver.HttpReader;
import be.jeffcheasey88.peeratcode.webserver.HttpUtil;
import be.jeffcheasey88.peeratcode.webserver.HttpWriter;
import be.jeffcheasey88.peeratcode.webserver.Response;
import be.jeffcheasey88.peeratcode.webserver.Route;
import be.jeffcheasey88.peeratcode.webserver.User;
import org.json.simple.JSONObject;

12
src/be/jeffcheasey88/peeratcode/routes/ChapterElement.java
View file

@ -1,14 +1,14 @@
package be.jeffcheasey88.peeratcode.routes;
import be.jeffcheasey88.peeratcode.framework.HttpReader;
import be.jeffcheasey88.peeratcode.framework.HttpUtil;
import be.jeffcheasey88.peeratcode.framework.HttpWriter;
import be.jeffcheasey88.peeratcode.framework.Response;
import be.jeffcheasey88.peeratcode.framework.Route;
import be.jeffcheasey88.peeratcode.framework.User;
import be.jeffcheasey88.peeratcode.model.Chapter;
import be.jeffcheasey88.peeratcode.model.Puzzle;
import be.jeffcheasey88.peeratcode.repository.DatabaseRepository;
import be.jeffcheasey88.peeratcode.webserver.HttpReader;
import be.jeffcheasey88.peeratcode.webserver.HttpUtil;
import be.jeffcheasey88.peeratcode.webserver.HttpWriter;
import be.jeffcheasey88.peeratcode.webserver.Response;
import be.jeffcheasey88.peeratcode.webserver.Route;
import be.jeffcheasey88.peeratcode.webserver.User;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;

12
src/be/jeffcheasey88/peeratcode/routes/ChapterList.java
View file

@ -6,14 +6,14 @@ import java.util.regex.Matcher;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import be.jeffcheasey88.peeratcode.framework.HttpReader;
import be.jeffcheasey88.peeratcode.framework.HttpUtil;
import be.jeffcheasey88.peeratcode.framework.HttpWriter;
import be.jeffcheasey88.peeratcode.framework.Response;
import be.jeffcheasey88.peeratcode.framework.Route;
import be.jeffcheasey88.peeratcode.framework.User;
import be.jeffcheasey88.peeratcode.model.Chapter;
import be.jeffcheasey88.peeratcode.repository.DatabaseRepository;
import be.jeffcheasey88.peeratcode.webserver.HttpReader;
import be.jeffcheasey88.peeratcode.webserver.HttpUtil;
import be.jeffcheasey88.peeratcode.webserver.HttpWriter;
import be.jeffcheasey88.peeratcode.webserver.Response;
import be.jeffcheasey88.peeratcode.webserver.Route;
import be.jeffcheasey88.peeratcode.webserver.User;
public class ChapterList implements Response {

12
src/be/jeffcheasey88/peeratcode/routes/Leaderboard.java
View file

@ -7,14 +7,14 @@ import java.util.regex.Matcher;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import be.jeffcheasey88.peeratcode.framework.HttpReader;
import be.jeffcheasey88.peeratcode.framework.HttpUtil;
import be.jeffcheasey88.peeratcode.framework.HttpWriter;
import be.jeffcheasey88.peeratcode.framework.Response;
import be.jeffcheasey88.peeratcode.framework.Route;
import be.jeffcheasey88.peeratcode.framework.User;
import be.jeffcheasey88.peeratcode.model.Player;
import be.jeffcheasey88.peeratcode.repository.DatabaseRepository;
import be.jeffcheasey88.peeratcode.webserver.HttpReader;
import be.jeffcheasey88.peeratcode.webserver.HttpUtil;
import be.jeffcheasey88.peeratcode.webserver.HttpWriter;
import be.jeffcheasey88.peeratcode.webserver.Response;
import be.jeffcheasey88.peeratcode.webserver.Route;
import be.jeffcheasey88.peeratcode.webserver.User;
public class Leaderboard implements Response {

14
src/be/jeffcheasey88/peeratcode/routes/Login.java
View file

@ -9,14 +9,14 @@ import org.jose4j.jws.JsonWebSignature;
import org.jose4j.jwt.JwtClaims;
import org.json.simple.JSONObject;
import be.jeffcheasey88.peeratcode.framework.HttpReader;
import be.jeffcheasey88.peeratcode.framework.HttpUtil;
import be.jeffcheasey88.peeratcode.framework.HttpWriter;
import be.jeffcheasey88.peeratcode.framework.Response;
import be.jeffcheasey88.peeratcode.framework.Route;
import be.jeffcheasey88.peeratcode.framework.Router;
import be.jeffcheasey88.peeratcode.framework.User;
import be.jeffcheasey88.peeratcode.repository.DatabaseRepository;
import be.jeffcheasey88.peeratcode.webserver.HttpReader;
import be.jeffcheasey88.peeratcode.webserver.HttpUtil;
import be.jeffcheasey88.peeratcode.webserver.HttpWriter;
import be.jeffcheasey88.peeratcode.webserver.Response;
import be.jeffcheasey88.peeratcode.webserver.Route;
import be.jeffcheasey88.peeratcode.webserver.Router;
import be.jeffcheasey88.peeratcode.webserver.User;
public class Login implements Response {

12
src/be/jeffcheasey88/peeratcode/routes/PlayerDetails.java
View file

@ -5,14 +5,14 @@ import java.util.regex.Matcher;
import org.json.simple.JSONObject;
import be.jeffcheasey88.peeratcode.framework.HttpReader;
import be.jeffcheasey88.peeratcode.framework.HttpUtil;
import be.jeffcheasey88.peeratcode.framework.HttpWriter;
import be.jeffcheasey88.peeratcode.framework.Response;
import be.jeffcheasey88.peeratcode.framework.Route;
import be.jeffcheasey88.peeratcode.framework.User;
import be.jeffcheasey88.peeratcode.model.Player;
import be.jeffcheasey88.peeratcode.repository.DatabaseRepository;
import be.jeffcheasey88.peeratcode.webserver.HttpReader;
import be.jeffcheasey88.peeratcode.webserver.HttpUtil;
import be.jeffcheasey88.peeratcode.webserver.HttpWriter;
import be.jeffcheasey88.peeratcode.webserver.Response;
import be.jeffcheasey88.peeratcode.webserver.Route;
import be.jeffcheasey88.peeratcode.webserver.User;
public class PlayerDetails implements Response {

12
src/be/jeffcheasey88/peeratcode/routes/PuzzleElement.java
View file

@ -8,14 +8,14 @@ import java.util.regex.Pattern;
import org.jose4j.json.internal.json_simple.JSONArray;
import org.json.simple.JSONObject;
import be.jeffcheasey88.peeratcode.framework.HttpReader;
import be.jeffcheasey88.peeratcode.framework.HttpUtil;
import be.jeffcheasey88.peeratcode.framework.HttpWriter;
import be.jeffcheasey88.peeratcode.framework.Response;
import be.jeffcheasey88.peeratcode.framework.Route;
import be.jeffcheasey88.peeratcode.framework.User;
import be.jeffcheasey88.peeratcode.model.Puzzle;
import be.jeffcheasey88.peeratcode.repository.DatabaseRepository;
import be.jeffcheasey88.peeratcode.webserver.HttpReader;
import be.jeffcheasey88.peeratcode.webserver.HttpUtil;
import be.jeffcheasey88.peeratcode.webserver.HttpWriter;
import be.jeffcheasey88.peeratcode.webserver.Response;
import be.jeffcheasey88.peeratcode.webserver.Route;
import be.jeffcheasey88.peeratcode.webserver.User;
public class PuzzleElement implements Response {

12
src/be/jeffcheasey88/peeratcode/routes/PuzzleResponse.java
View file

@ -10,15 +10,15 @@ import java.util.regex.Matcher;
import org.json.simple.JSONObject;
import be.jeffcheasey88.peeratcode.framework.HttpReader;
import be.jeffcheasey88.peeratcode.framework.HttpUtil;
import be.jeffcheasey88.peeratcode.framework.HttpWriter;
import be.jeffcheasey88.peeratcode.framework.Response;
import be.jeffcheasey88.peeratcode.framework.Route;
import be.jeffcheasey88.peeratcode.framework.User;
import be.jeffcheasey88.peeratcode.model.Completion;
import be.jeffcheasey88.peeratcode.model.Player;
import be.jeffcheasey88.peeratcode.repository.DatabaseRepository;
import be.jeffcheasey88.peeratcode.webserver.HttpReader;
import be.jeffcheasey88.peeratcode.webserver.HttpUtil;
import be.jeffcheasey88.peeratcode.webserver.HttpWriter;
import be.jeffcheasey88.peeratcode.webserver.Response;
import be.jeffcheasey88.peeratcode.webserver.Route;
import be.jeffcheasey88.peeratcode.webserver.User;
public class PuzzleResponse implements Response {
private final DatabaseRepository databaseRepo;

14
src/be/jeffcheasey88/peeratcode/routes/Register.java
View file

@ -8,15 +8,15 @@ import java.util.regex.Pattern;
import org.json.simple.JSONObject;
import be.jeffcheasey88.peeratcode.framework.HttpReader;
import be.jeffcheasey88.peeratcode.framework.HttpUtil;
import be.jeffcheasey88.peeratcode.framework.HttpWriter;
import be.jeffcheasey88.peeratcode.framework.Response;
import be.jeffcheasey88.peeratcode.framework.Route;
import be.jeffcheasey88.peeratcode.framework.Router;
import be.jeffcheasey88.peeratcode.framework.User;
import be.jeffcheasey88.peeratcode.model.Player;
import be.jeffcheasey88.peeratcode.repository.DatabaseRepository;
import be.jeffcheasey88.peeratcode.webserver.HttpReader;
import be.jeffcheasey88.peeratcode.webserver.HttpUtil;
import be.jeffcheasey88.peeratcode.webserver.HttpWriter;
import be.jeffcheasey88.peeratcode.webserver.Response;
import be.jeffcheasey88.peeratcode.webserver.Route;
import be.jeffcheasey88.peeratcode.webserver.Router;
import be.jeffcheasey88.peeratcode.webserver.User;
public class Register implements Response {

13
src/be/jeffcheasey88/peeratcode/routes/Result.java
View file

@ -1,15 +1,14 @@
package be.jeffcheasey88.peeratcode.routes;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import be.jeffcheasey88.peeratcode.framework.HttpReader;
import be.jeffcheasey88.peeratcode.framework.HttpUtil;
import be.jeffcheasey88.peeratcode.framework.HttpWriter;
import be.jeffcheasey88.peeratcode.framework.Response;
import be.jeffcheasey88.peeratcode.framework.Route;
import be.jeffcheasey88.peeratcode.framework.User;
import be.jeffcheasey88.peeratcode.repository.DatabaseRepository;
import be.jeffcheasey88.peeratcode.webserver.HttpReader;
import be.jeffcheasey88.peeratcode.webserver.HttpUtil;
import be.jeffcheasey88.peeratcode.webserver.HttpWriter;
import be.jeffcheasey88.peeratcode.webserver.Response;
import be.jeffcheasey88.peeratcode.webserver.Route;
import be.jeffcheasey88.peeratcode.webserver.User;
public class Result implements Response{

12
src/be/jeffcheasey88/peeratcode/routes/groups/CreateGroup.java
View file

@ -4,14 +4,14 @@ import java.util.regex.Matcher;
import org.json.simple.JSONObject;
import be.jeffcheasey88.peeratcode.framework.HttpReader;
import be.jeffcheasey88.peeratcode.framework.HttpUtil;
import be.jeffcheasey88.peeratcode.framework.HttpWriter;
import be.jeffcheasey88.peeratcode.framework.Response;
import be.jeffcheasey88.peeratcode.framework.Route;
import be.jeffcheasey88.peeratcode.framework.User;
import be.jeffcheasey88.peeratcode.model.Group;
import be.jeffcheasey88.peeratcode.repository.DatabaseRepository;
import be.jeffcheasey88.peeratcode.webserver.HttpReader;
import be.jeffcheasey88.peeratcode.webserver.HttpUtil;
import be.jeffcheasey88.peeratcode.webserver.HttpWriter;
import be.jeffcheasey88.peeratcode.webserver.Response;
import be.jeffcheasey88.peeratcode.webserver.Route;
import be.jeffcheasey88.peeratcode.webserver.User;
public class CreateGroup implements Response{

13
src/be/jeffcheasey88/peeratcode/routes/groups/GroupList.java
View file

@ -3,16 +3,15 @@ package be.jeffcheasey88.peeratcode.routes.groups;
import java.util.regex.Matcher;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import be.jeffcheasey88.peeratcode.framework.HttpReader;
import be.jeffcheasey88.peeratcode.framework.HttpUtil;
import be.jeffcheasey88.peeratcode.framework.HttpWriter;
import be.jeffcheasey88.peeratcode.framework.Response;
import be.jeffcheasey88.peeratcode.framework.Route;
import be.jeffcheasey88.peeratcode.framework.User;
import be.jeffcheasey88.peeratcode.model.Group;
import be.jeffcheasey88.peeratcode.repository.DatabaseRepository;
import be.jeffcheasey88.peeratcode.webserver.HttpReader;
import be.jeffcheasey88.peeratcode.webserver.HttpUtil;
import be.jeffcheasey88.peeratcode.webserver.HttpWriter;
import be.jeffcheasey88.peeratcode.webserver.Response;
import be.jeffcheasey88.peeratcode.webserver.Route;
import be.jeffcheasey88.peeratcode.webserver.User;
public class GroupList implements Response{

4
test/be/jeffcheasey88/peeratcode/webclient/WebClient.java
View file

@ -10,8 +10,8 @@ import java.util.regex.Pattern;
import org.json.simple.JSONObject;
import be.jeffcheasey88.peeratcode.webserver.HttpReader;
import be.jeffcheasey88.peeratcode.webserver.HttpWriter;
import be.jeffcheasey88.peeratcode.framework.HttpReader;
import be.jeffcheasey88.peeratcode.framework.HttpWriter;
public class WebClient {