From 22a0026939acaef53ce689354a039299f06b2fb2 Mon Sep 17 00:00:00 2001 From: jeffcheasey88 <66554203+jeffcheasey88@users.noreply.github.com> Date: Sun, 9 Apr 2023 17:54:38 +0200 Subject: [PATCH] Refractor webserver to framework & starting of the ORM (will be continuing later) --- .classpath | 6 ++++++ .factorypath | 4 ++++ .gitignore | 3 ++- .settings/org.eclipse.jdt.apt.core.prefs | 6 ++++++ Treasure.jar | Bin 0 -> 4526 bytes src/be/jeffcheasey88/peeratcode/Main.java | 16 ++++++++-------- .../{webserver => framework}/Client.java | 2 +- .../{webserver => framework}/HttpReader.java | 2 +- .../{webserver => framework}/HttpUtil.java | 2 +- .../{webserver => framework}/HttpWriter.java | 2 +- .../{webserver => framework}/Response.java | 2 +- .../{webserver => framework}/Route.java | 2 +- .../{webserver => framework}/Router.java | 2 +- .../{webserver => framework}/User.java | 2 +- .../jeffcheasey88/peeratcode/model/Badge.java | 6 +++++- .../jeffcheasey88/peeratcode/model/Player.java | 7 ------- .../peeratcode/routes/BadgeDetails.java | 12 ++++++------ .../peeratcode/routes/ChapterElement.java | 12 ++++++------ .../peeratcode/routes/ChapterList.java | 12 ++++++------ .../peeratcode/routes/Leaderboard.java | 12 ++++++------ .../jeffcheasey88/peeratcode/routes/Login.java | 14 +++++++------- .../peeratcode/routes/PlayerDetails.java | 12 ++++++------ .../peeratcode/routes/PuzzleElement.java | 12 ++++++------ .../peeratcode/routes/PuzzleResponse.java | 12 ++++++------ .../peeratcode/routes/Register.java | 14 +++++++------- .../jeffcheasey88/peeratcode/routes/Result.java | 13 ++++++------- .../peeratcode/routes/groups/CreateGroup.java | 12 ++++++------ .../peeratcode/routes/groups/GroupList.java | 13 ++++++------- .../peeratcode/webclient/WebClient.java | 4 ++-- 29 files changed, 115 insertions(+), 103 deletions(-) create mode 100644 .factorypath create mode 100644 .settings/org.eclipse.jdt.apt.core.prefs create mode 100644 Treasure.jar rename src/be/jeffcheasey88/peeratcode/{webserver => framework}/Client.java (97%) rename src/be/jeffcheasey88/peeratcode/{webserver => framework}/HttpReader.java (95%) rename src/be/jeffcheasey88/peeratcode/{webserver => framework}/HttpUtil.java (99%) rename src/be/jeffcheasey88/peeratcode/{webserver => framework}/HttpWriter.java (94%) rename src/be/jeffcheasey88/peeratcode/{webserver => framework}/Response.java (80%) rename src/be/jeffcheasey88/peeratcode/{webserver => framework}/Route.java (88%) rename src/be/jeffcheasey88/peeratcode/{webserver => framework}/Router.java (98%) rename src/be/jeffcheasey88/peeratcode/{webserver => framework}/User.java (82%) diff --git a/.classpath b/.classpath index 85d371e..dd99747 100644 --- a/.classpath +++ b/.classpath @@ -9,5 +9,11 @@ + + + + + + diff --git a/.factorypath b/.factorypath new file mode 100644 index 0000000..b9a5ccc --- /dev/null +++ b/.factorypath @@ -0,0 +1,4 @@ + + + + diff --git a/.gitignore b/.gitignore index b3043cf..c5a661b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ -.settings/ +.settings/org.eclipse.jdt.core.prefs bin/ .project config.txt dist/ testApi/ +.apt_generated/* diff --git a/.settings/org.eclipse.jdt.apt.core.prefs b/.settings/org.eclipse.jdt.apt.core.prefs new file mode 100644 index 0000000..4dfc072 --- /dev/null +++ b/.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 diff --git a/Treasure.jar b/Treasure.jar new file mode 100644 index 0000000000000000000000000000000000000000..594c3ee436d24e7855af5ed6b77c4e4d82d95613 GIT binary patch literal 4526 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 literal 0 HcmV?d00001 diff --git a/src/be/jeffcheasey88/peeratcode/Main.java b/src/be/jeffcheasey88/peeratcode/Main.java index 2ec0190..ea8c919 100644 --- a/src/be/jeffcheasey88/peeratcode/Main.java +++ b/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 { diff --git a/src/be/jeffcheasey88/peeratcode/webserver/Client.java b/src/be/jeffcheasey88/peeratcode/framework/Client.java similarity index 97% rename from src/be/jeffcheasey88/peeratcode/webserver/Client.java rename to src/be/jeffcheasey88/peeratcode/framework/Client.java index 692fa58..31e9e39 100644 --- a/src/be/jeffcheasey88/peeratcode/webserver/Client.java +++ b/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; diff --git a/src/be/jeffcheasey88/peeratcode/webserver/HttpReader.java b/src/be/jeffcheasey88/peeratcode/framework/HttpReader.java similarity index 95% rename from src/be/jeffcheasey88/peeratcode/webserver/HttpReader.java rename to src/be/jeffcheasey88/peeratcode/framework/HttpReader.java index 031b9ee..8fe5a23 100644 --- a/src/be/jeffcheasey88/peeratcode/webserver/HttpReader.java +++ b/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; diff --git a/src/be/jeffcheasey88/peeratcode/webserver/HttpUtil.java b/src/be/jeffcheasey88/peeratcode/framework/HttpUtil.java similarity index 99% rename from src/be/jeffcheasey88/peeratcode/webserver/HttpUtil.java rename to src/be/jeffcheasey88/peeratcode/framework/HttpUtil.java index ad880a9..d5e6da7 100644 --- a/src/be/jeffcheasey88/peeratcode/webserver/HttpUtil.java +++ b/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; diff --git a/src/be/jeffcheasey88/peeratcode/webserver/HttpWriter.java b/src/be/jeffcheasey88/peeratcode/framework/HttpWriter.java similarity index 94% rename from src/be/jeffcheasey88/peeratcode/webserver/HttpWriter.java rename to src/be/jeffcheasey88/peeratcode/framework/HttpWriter.java index 5546719..b6e0df6 100644 --- a/src/be/jeffcheasey88/peeratcode/webserver/HttpWriter.java +++ b/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; diff --git a/src/be/jeffcheasey88/peeratcode/webserver/Response.java b/src/be/jeffcheasey88/peeratcode/framework/Response.java similarity index 80% rename from src/be/jeffcheasey88/peeratcode/webserver/Response.java rename to src/be/jeffcheasey88/peeratcode/framework/Response.java index 2d7eec6..5175e34 100644 --- a/src/be/jeffcheasey88/peeratcode/webserver/Response.java +++ b/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; import java.util.regex.Pattern; diff --git a/src/be/jeffcheasey88/peeratcode/webserver/Route.java b/src/be/jeffcheasey88/peeratcode/framework/Route.java similarity index 88% rename from src/be/jeffcheasey88/peeratcode/webserver/Route.java rename to src/be/jeffcheasey88/peeratcode/framework/Route.java index fcfea70..a204475 100644 --- a/src/be/jeffcheasey88/peeratcode/webserver/Route.java +++ b/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; diff --git a/src/be/jeffcheasey88/peeratcode/webserver/Router.java b/src/be/jeffcheasey88/peeratcode/framework/Router.java similarity index 98% rename from src/be/jeffcheasey88/peeratcode/webserver/Router.java rename to src/be/jeffcheasey88/peeratcode/framework/Router.java index bb9236c..adf989f 100644 --- a/src/be/jeffcheasey88/peeratcode/webserver/Router.java +++ b/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; diff --git a/src/be/jeffcheasey88/peeratcode/webserver/User.java b/src/be/jeffcheasey88/peeratcode/framework/User.java similarity index 82% rename from src/be/jeffcheasey88/peeratcode/webserver/User.java rename to src/be/jeffcheasey88/peeratcode/framework/User.java index 0967426..632f397 100644 --- a/src/be/jeffcheasey88/peeratcode/webserver/User.java +++ b/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; diff --git a/src/be/jeffcheasey88/peeratcode/model/Badge.java b/src/be/jeffcheasey88/peeratcode/model/Badge.java index 55f6834..87a0514 100644 --- a/src/be/jeffcheasey88/peeratcode/model/Badge.java +++ b/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; @@ -15,7 +19,7 @@ public class Badge { this.level = level; } - public String getName() { + public String getName(){ return name; } diff --git a/src/be/jeffcheasey88/peeratcode/model/Player.java b/src/be/jeffcheasey88/peeratcode/model/Player.java index 278f5e9..04cd73e 100644 --- a/src/be/jeffcheasey88/peeratcode/model/Player.java +++ b/src/be/jeffcheasey88/peeratcode/model/Player.java @@ -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; diff --git a/src/be/jeffcheasey88/peeratcode/routes/BadgeDetails.java b/src/be/jeffcheasey88/peeratcode/routes/BadgeDetails.java index e96aa5e..732814d 100644 --- a/src/be/jeffcheasey88/peeratcode/routes/BadgeDetails.java +++ b/src/be/jeffcheasey88/peeratcode/routes/BadgeDetails.java @@ -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; diff --git a/src/be/jeffcheasey88/peeratcode/routes/ChapterElement.java b/src/be/jeffcheasey88/peeratcode/routes/ChapterElement.java index 8931419..f1cee37 100644 --- a/src/be/jeffcheasey88/peeratcode/routes/ChapterElement.java +++ b/src/be/jeffcheasey88/peeratcode/routes/ChapterElement.java @@ -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; diff --git a/src/be/jeffcheasey88/peeratcode/routes/ChapterList.java b/src/be/jeffcheasey88/peeratcode/routes/ChapterList.java index a12e9d1..85ce6d2 100644 --- a/src/be/jeffcheasey88/peeratcode/routes/ChapterList.java +++ b/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 { diff --git a/src/be/jeffcheasey88/peeratcode/routes/Leaderboard.java b/src/be/jeffcheasey88/peeratcode/routes/Leaderboard.java index 0230787..a69ca3c 100644 --- a/src/be/jeffcheasey88/peeratcode/routes/Leaderboard.java +++ b/src/be/jeffcheasey88/peeratcode/routes/Leaderboard.java @@ -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 { diff --git a/src/be/jeffcheasey88/peeratcode/routes/Login.java b/src/be/jeffcheasey88/peeratcode/routes/Login.java index ae33b8d..9eb5030 100644 --- a/src/be/jeffcheasey88/peeratcode/routes/Login.java +++ b/src/be/jeffcheasey88/peeratcode/routes/Login.java @@ -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 { diff --git a/src/be/jeffcheasey88/peeratcode/routes/PlayerDetails.java b/src/be/jeffcheasey88/peeratcode/routes/PlayerDetails.java index 7307ad2..95e1c30 100644 --- a/src/be/jeffcheasey88/peeratcode/routes/PlayerDetails.java +++ b/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 { diff --git a/src/be/jeffcheasey88/peeratcode/routes/PuzzleElement.java b/src/be/jeffcheasey88/peeratcode/routes/PuzzleElement.java index 6db30f9..16f5f68 100644 --- a/src/be/jeffcheasey88/peeratcode/routes/PuzzleElement.java +++ b/src/be/jeffcheasey88/peeratcode/routes/PuzzleElement.java @@ -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 { diff --git a/src/be/jeffcheasey88/peeratcode/routes/PuzzleResponse.java b/src/be/jeffcheasey88/peeratcode/routes/PuzzleResponse.java index 2280102..b17baac 100644 --- a/src/be/jeffcheasey88/peeratcode/routes/PuzzleResponse.java +++ b/src/be/jeffcheasey88/peeratcode/routes/PuzzleResponse.java @@ -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; diff --git a/src/be/jeffcheasey88/peeratcode/routes/Register.java b/src/be/jeffcheasey88/peeratcode/routes/Register.java index 5e65bf4..6af2b4b 100644 --- a/src/be/jeffcheasey88/peeratcode/routes/Register.java +++ b/src/be/jeffcheasey88/peeratcode/routes/Register.java @@ -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 { diff --git a/src/be/jeffcheasey88/peeratcode/routes/Result.java b/src/be/jeffcheasey88/peeratcode/routes/Result.java index 787d842..fd5d838 100644 --- a/src/be/jeffcheasey88/peeratcode/routes/Result.java +++ b/src/be/jeffcheasey88/peeratcode/routes/Result.java @@ -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{ diff --git a/src/be/jeffcheasey88/peeratcode/routes/groups/CreateGroup.java b/src/be/jeffcheasey88/peeratcode/routes/groups/CreateGroup.java index 2c96332..887488f 100644 --- a/src/be/jeffcheasey88/peeratcode/routes/groups/CreateGroup.java +++ b/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{ diff --git a/src/be/jeffcheasey88/peeratcode/routes/groups/GroupList.java b/src/be/jeffcheasey88/peeratcode/routes/groups/GroupList.java index 17038be..1985ba9 100644 --- a/src/be/jeffcheasey88/peeratcode/routes/groups/GroupList.java +++ b/src/be/jeffcheasey88/peeratcode/routes/groups/GroupList.java @@ -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{ diff --git a/test/be/jeffcheasey88/peeratcode/webclient/WebClient.java b/test/be/jeffcheasey88/peeratcode/webclient/WebClient.java index b489d97..b85dc0a 100644 --- a/test/be/jeffcheasey88/peeratcode/webclient/WebClient.java +++ b/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.webserver.HttpWriter; +import be.jeffcheasey88.peeratcode.framework.HttpReader; +import be.jeffcheasey88.peeratcode.framework.HttpWriter; public class WebClient {