Merge branch 'main' of https://git.peerat.dev/Peer-at-Code/peer-at-code-backend to take JeffCheasey88 changes into account

.classpath

@@ -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>

.factorypath

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

.gitignore

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

.settings/org.eclipse.jdt.apt.core.prefs

@@ -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

src/be/jeffcheasey88/peeratcode/Main.java

@@ -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 {

src/be/jeffcheasey88/peeratcode/framework/Client.java

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

src/be/jeffcheasey88/peeratcode/framework/HttpReader.java

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

src/be/jeffcheasey88/peeratcode/framework/HttpUtil.java

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

src/be/jeffcheasey88/peeratcode/framework/HttpWriter.java

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

src/be/jeffcheasey88/peeratcode/framework/Response.java

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

src/be/jeffcheasey88/peeratcode/framework/Route.java

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

src/be/jeffcheasey88/peeratcode/framework/Router.java

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

src/be/jeffcheasey88/peeratcode/framework/User.java

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

src/be/jeffcheasey88/peeratcode/model/Badge.java

@@ -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;
@@ -11,7 +15,7 @@ public class Badge {
 		this.level = level;
 	}
 
-	public String getName() {
+	public String getName(){
 		return name;
 	}
 

src/be/jeffcheasey88/peeratcode/routes/BadgeDetails.java

@@ -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.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;
 
 public class BadgeDetails implements Response {
 

src/be/jeffcheasey88/peeratcode/routes/ChapterElement.java

@@ -5,15 +5,15 @@ 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.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 ChapterElement implements Response {
 

src/be/jeffcheasey88/peeratcode/routes/ChapterList.java

@@ -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 {
 

src/be/jeffcheasey88/peeratcode/routes/Leaderboard.java

@@ -8,16 +8,16 @@ 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.model.Group;
 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 {
 

src/be/jeffcheasey88/peeratcode/routes/Login.java

@@ -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.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 {
 

src/be/jeffcheasey88/peeratcode/routes/PlayerDetails.java

@@ -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 {
 

src/be/jeffcheasey88/peeratcode/routes/PuzzleElement.java

@@ -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.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 {
 

src/be/jeffcheasey88/peeratcode/routes/PuzzleResponse.java

@@ -10,16 +10,16 @@ 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.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 PuzzleResponse implements Response {
 	private final DatabaseRepository databaseRepo;

src/be/jeffcheasey88/peeratcode/routes/Register.java

@@ -7,14 +7,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.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 Register implements Response {
 

src/be/jeffcheasey88/peeratcode/routes/Result.java

@@ -2,13 +2,13 @@ package be.jeffcheasey88.peeratcode.routes;
 
 import java.util.regex.Matcher;
 
+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 {
 

src/be/jeffcheasey88/peeratcode/routes/groups/CreateGroup.java

@@ -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 {
 

src/be/jeffcheasey88/peeratcode/routes/groups/GroupList.java

@@ -4,14 +4,14 @@ import java.util.regex.Matcher;
 
 import org.json.simple.JSONArray;
 
+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 {
 

test/be/jeffcheasey88/peeratcode/webclient/WebClient.java

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