From 0703007ba813efd5bdf3d34bb9f334aa5458b697 Mon Sep 17 00:00:00 2001
From: Gabriel Copat <copatg@cardiff.ac.uk>
Date: Thu, 7 Dec 2023 13:19:10 +0000
Subject: [PATCH] Fixed naming issue with packages
---
.../SmartTowns}/SmartTownsApplication.java | 2 +-
.../SmartTowns}/data/DatabaseController.java | 2 +-
.../smartTowns => Team5/SmartTowns}/data/Location.java | 2 +-
.../SmartTowns}/data/LocationRepository.java | 2 +-
.../SmartTowns}/data/LocationRepositoryJDBC.java | 2 +-
.../smartTowns => Team5/SmartTowns}/data/Trail.java | 2 +-
.../SmartTowns}/data/TrailsRepository.java | 2 +-
.../SmartTowns}/data/TrailsRepositoryJDBC.java | 2 +-
.../SmartTowns}/landmarks/Landmarks.java | 2 +-
.../SmartTowns}/landmarks/LandmarksController.java | 6 +++---
.../smartTowns => Team5/SmartTowns}/rewards/Badge.java | 2 +-
.../smartTowns => Team5/SmartTowns}/rewards/Pack.java | 2 +-
.../smartTowns => Team5/SmartTowns}/rewards/Reward.java | 2 +-
.../SmartTowns}/rewards/RewardsRepository.java | 5 +----
.../SmartTowns}/rewards/RewardsRepositoryJDBC.java | 3 +--
.../smartTowns => Team5/SmartTowns}/rewards/Sticker.java | 2 +-
.../SmartTowns}/towns/TownController.java | 2 +-
.../SmartTowns}/towns/TownStorage.java | 2 +-
.../smartTowns => Team5/SmartTowns}/towns/Towns.java | 2 +-
.../smartTowns => Team5/SmartTowns}/trails/Trail.java | 2 +-
.../SmartTowns}/trails/TrailsController.java | 6 +++---
.../smartTowns => Team5/SmartTowns}/users/User.java | 9 +--------
.../SmartTowns}/users/UserController.java | 9 ++++-----
.../SmartTowns}/users/UserRepository.java | 3 +--
.../SmartTowns}/users/UserRepositoryJDBC.java | 5 +----
.../SmartTowns}/webpages/WebpageController.java | 5 +----
src/main/resources/templates/users/userFrags.html | 6 +++---
.../SmartTowns}/SmartTownsApplicationTests.java | 2 +-
28 files changed, 37 insertions(+), 56 deletions(-)
rename src/main/java/{team5/smartTowns => Team5/SmartTowns}/SmartTownsApplication.java (91%)
rename src/main/java/{team5/smartTowns => Team5/SmartTowns}/data/DatabaseController.java (96%)
rename src/main/java/{team5/smartTowns => Team5/SmartTowns}/data/Location.java (97%)
rename src/main/java/{team5/smartTowns => Team5/SmartTowns}/data/LocationRepository.java (85%)
rename src/main/java/{team5/smartTowns => Team5/SmartTowns}/data/LocationRepositoryJDBC.java (97%)
rename src/main/java/{team5/smartTowns => Team5/SmartTowns}/data/Trail.java (86%)
rename src/main/java/{team5/smartTowns => Team5/SmartTowns}/data/TrailsRepository.java (80%)
rename src/main/java/{team5/smartTowns => Team5/SmartTowns}/data/TrailsRepositoryJDBC.java (96%)
rename src/main/java/{team5/smartTowns => Team5/SmartTowns}/landmarks/Landmarks.java (97%)
rename src/main/java/{team5/smartTowns => Team5/SmartTowns}/landmarks/LandmarksController.java (93%)
rename src/main/java/{team5/smartTowns => Team5/SmartTowns}/rewards/Badge.java (94%)
rename src/main/java/{team5/smartTowns => Team5/SmartTowns}/rewards/Pack.java (95%)
rename src/main/java/{team5/smartTowns => Team5/SmartTowns}/rewards/Reward.java (97%)
rename src/main/java/{team5/smartTowns => Team5/SmartTowns}/rewards/RewardsRepository.java (72%)
rename src/main/java/{team5/smartTowns => Team5/SmartTowns}/rewards/RewardsRepositoryJDBC.java (97%)
rename src/main/java/{team5/smartTowns => Team5/SmartTowns}/rewards/Sticker.java (96%)
rename src/main/java/{team5/smartTowns => Team5/SmartTowns}/towns/TownController.java (94%)
rename src/main/java/{team5/smartTowns => Team5/SmartTowns}/towns/TownStorage.java (97%)
rename src/main/java/{team5/smartTowns => Team5/SmartTowns}/towns/Towns.java (97%)
rename src/main/java/{team5/smartTowns => Team5/SmartTowns}/trails/Trail.java (98%)
rename src/main/java/{team5/smartTowns => Team5/SmartTowns}/trails/TrailsController.java (93%)
rename src/main/java/{team5/smartTowns => Team5/SmartTowns}/users/User.java (77%)
rename src/main/java/{team5/smartTowns => Team5/SmartTowns}/users/UserController.java (94%)
rename src/main/java/{team5/smartTowns => Team5/SmartTowns}/users/UserRepository.java (84%)
rename src/main/java/{team5/smartTowns => Team5/SmartTowns}/users/UserRepositoryJDBC.java (93%)
rename src/main/java/{team5/smartTowns => Team5/SmartTowns}/webpages/WebpageController.java (79%)
rename src/test/java/{team5/smartTowns => Team5/SmartTowns}/SmartTownsApplicationTests.java (87%)
diff --git a/src/main/java/team5/smartTowns/SmartTownsApplication.java b/src/main/java/Team5/SmartTowns/SmartTownsApplication.java
similarity index 91%
rename from src/main/java/team5/smartTowns/SmartTownsApplication.java
rename to src/main/java/Team5/SmartTowns/SmartTownsApplication.java
index 0e185ece..a7b32da0 100644
--- a/src/main/java/team5/smartTowns/SmartTownsApplication.java
+++ b/src/main/java/Team5/SmartTowns/SmartTownsApplication.java
@@ -1,4 +1,4 @@
-package team5.smartTowns;
+package Team5.SmartTowns;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/src/main/java/team5/smartTowns/data/DatabaseController.java b/src/main/java/Team5/SmartTowns/data/DatabaseController.java
similarity index 96%
rename from src/main/java/team5/smartTowns/data/DatabaseController.java
rename to src/main/java/Team5/SmartTowns/data/DatabaseController.java
index 11af7938..63b7c5f0 100644
--- a/src/main/java/team5/smartTowns/data/DatabaseController.java
+++ b/src/main/java/Team5/SmartTowns/data/DatabaseController.java
@@ -1,4 +1,4 @@
-package team5.smartTowns.data;
+package Team5.SmartTowns.data;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
diff --git a/src/main/java/team5/smartTowns/data/Location.java b/src/main/java/Team5/SmartTowns/data/Location.java
similarity index 97%
rename from src/main/java/team5/smartTowns/data/Location.java
rename to src/main/java/Team5/SmartTowns/data/Location.java
index d968ac31..c733d9b9 100644
--- a/src/main/java/team5/smartTowns/data/Location.java
+++ b/src/main/java/Team5/SmartTowns/data/Location.java
@@ -1,5 +1,5 @@
//Holds variable data for the locations table (landmarks)
-package team5.smartTowns.data;
+package Team5.SmartTowns.data;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/src/main/java/team5/smartTowns/data/LocationRepository.java b/src/main/java/Team5/SmartTowns/data/LocationRepository.java
similarity index 85%
rename from src/main/java/team5/smartTowns/data/LocationRepository.java
rename to src/main/java/Team5/SmartTowns/data/LocationRepository.java
index 60a81f05..f4b79d1f 100644
--- a/src/main/java/team5/smartTowns/data/LocationRepository.java
+++ b/src/main/java/Team5/SmartTowns/data/LocationRepository.java
@@ -1,5 +1,5 @@
//Holds locations data repository (landmarks)
-package team5.smartTowns.data;
+package Team5.SmartTowns.data;
import java.util.List;
diff --git a/src/main/java/team5/smartTowns/data/LocationRepositoryJDBC.java b/src/main/java/Team5/SmartTowns/data/LocationRepositoryJDBC.java
similarity index 97%
rename from src/main/java/team5/smartTowns/data/LocationRepositoryJDBC.java
rename to src/main/java/Team5/SmartTowns/data/LocationRepositoryJDBC.java
index b832c7fe..e9c23c15 100644
--- a/src/main/java/team5/smartTowns/data/LocationRepositoryJDBC.java
+++ b/src/main/java/Team5/SmartTowns/data/LocationRepositoryJDBC.java
@@ -1,5 +1,5 @@
//Implements the locations repository using JDBC
-package team5.smartTowns.data;
+package Team5.SmartTowns.data;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.RowMapper;
diff --git a/src/main/java/team5/smartTowns/data/Trail.java b/src/main/java/Team5/SmartTowns/data/Trail.java
similarity index 86%
rename from src/main/java/team5/smartTowns/data/Trail.java
rename to src/main/java/Team5/SmartTowns/data/Trail.java
index 4bcf497b..1a44d927 100644
--- a/src/main/java/team5/smartTowns/data/Trail.java
+++ b/src/main/java/Team5/SmartTowns/data/Trail.java
@@ -1,5 +1,5 @@
//Holds variable data for the trails table
-package team5.smartTowns.data;
+package Team5.SmartTowns.data;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/src/main/java/team5/smartTowns/data/TrailsRepository.java b/src/main/java/Team5/SmartTowns/data/TrailsRepository.java
similarity index 80%
rename from src/main/java/team5/smartTowns/data/TrailsRepository.java
rename to src/main/java/Team5/SmartTowns/data/TrailsRepository.java
index 42c77dab..d25e6fd6 100644
--- a/src/main/java/team5/smartTowns/data/TrailsRepository.java
+++ b/src/main/java/Team5/SmartTowns/data/TrailsRepository.java
@@ -1,5 +1,5 @@
//Holds trails data repository
-package team5.smartTowns.data;
+package Team5.SmartTowns.data;
import java.util.List;
diff --git a/src/main/java/team5/smartTowns/data/TrailsRepositoryJDBC.java b/src/main/java/Team5/SmartTowns/data/TrailsRepositoryJDBC.java
similarity index 96%
rename from src/main/java/team5/smartTowns/data/TrailsRepositoryJDBC.java
rename to src/main/java/Team5/SmartTowns/data/TrailsRepositoryJDBC.java
index d41b9635..3acf61c4 100644
--- a/src/main/java/team5/smartTowns/data/TrailsRepositoryJDBC.java
+++ b/src/main/java/Team5/SmartTowns/data/TrailsRepositoryJDBC.java
@@ -1,5 +1,5 @@
//Implements the trails repository using JDBC
-package team5.smartTowns.data;
+package Team5.SmartTowns.data;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.RowMapper;
diff --git a/src/main/java/team5/smartTowns/landmarks/Landmarks.java b/src/main/java/Team5/SmartTowns/landmarks/Landmarks.java
similarity index 97%
rename from src/main/java/team5/smartTowns/landmarks/Landmarks.java
rename to src/main/java/Team5/SmartTowns/landmarks/Landmarks.java
index 4a57f7f5..871aac6e 100644
--- a/src/main/java/team5/smartTowns/landmarks/Landmarks.java
+++ b/src/main/java/Team5/SmartTowns/landmarks/Landmarks.java
@@ -1,4 +1,4 @@
-package team5.smartTowns.landmarks;
+package Team5.SmartTowns.landmarks;
import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotEmpty;
diff --git a/src/main/java/team5/smartTowns/landmarks/LandmarksController.java b/src/main/java/Team5/SmartTowns/landmarks/LandmarksController.java
similarity index 93%
rename from src/main/java/team5/smartTowns/landmarks/LandmarksController.java
rename to src/main/java/Team5/SmartTowns/landmarks/LandmarksController.java
index efca1ea1..630740b5 100644
--- a/src/main/java/team5/smartTowns/landmarks/LandmarksController.java
+++ b/src/main/java/Team5/SmartTowns/landmarks/LandmarksController.java
@@ -1,7 +1,7 @@
-package team5.smartTowns.landmarks;
+package Team5.SmartTowns.landmarks;
-import team5.smartTowns.data.Location;
-import team5.smartTowns.data.LocationRepository;
+import Team5.SmartTowns.data.Location;
+import Team5.SmartTowns.data.LocationRepository;
import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
diff --git a/src/main/java/team5/smartTowns/rewards/Badge.java b/src/main/java/Team5/SmartTowns/rewards/Badge.java
similarity index 94%
rename from src/main/java/team5/smartTowns/rewards/Badge.java
rename to src/main/java/Team5/SmartTowns/rewards/Badge.java
index bf85cb7c..97623880 100644
--- a/src/main/java/team5/smartTowns/rewards/Badge.java
+++ b/src/main/java/Team5/SmartTowns/rewards/Badge.java
@@ -1,5 +1,5 @@
/*AUTHOR: Gabriel Copat*/
-package team5.smartTowns.rewards;
+package Team5.SmartTowns.rewards;
import lombok.Getter;
diff --git a/src/main/java/team5/smartTowns/rewards/Pack.java b/src/main/java/Team5/SmartTowns/rewards/Pack.java
similarity index 95%
rename from src/main/java/team5/smartTowns/rewards/Pack.java
rename to src/main/java/Team5/SmartTowns/rewards/Pack.java
index 20f12213..ef7fe740 100644
--- a/src/main/java/team5/smartTowns/rewards/Pack.java
+++ b/src/main/java/Team5/SmartTowns/rewards/Pack.java
@@ -1,4 +1,4 @@
-package team5.smartTowns.rewards;
+package Team5.SmartTowns.rewards;
import lombok.Getter;
diff --git a/src/main/java/team5/smartTowns/rewards/Reward.java b/src/main/java/Team5/SmartTowns/rewards/Reward.java
similarity index 97%
rename from src/main/java/team5/smartTowns/rewards/Reward.java
rename to src/main/java/Team5/SmartTowns/rewards/Reward.java
index dd45b905..0a2d9145 100644
--- a/src/main/java/team5/smartTowns/rewards/Reward.java
+++ b/src/main/java/Team5/SmartTowns/rewards/Reward.java
@@ -1,4 +1,4 @@
-package team5.smartTowns.rewards;
+package Team5.SmartTowns.rewards;
import lombok.Getter;
diff --git a/src/main/java/team5/smartTowns/rewards/RewardsRepository.java b/src/main/java/Team5/SmartTowns/rewards/RewardsRepository.java
similarity index 72%
rename from src/main/java/team5/smartTowns/rewards/RewardsRepository.java
rename to src/main/java/Team5/SmartTowns/rewards/RewardsRepository.java
index a11e4372..51bde7f2 100644
--- a/src/main/java/team5/smartTowns/rewards/RewardsRepository.java
+++ b/src/main/java/Team5/SmartTowns/rewards/RewardsRepository.java
@@ -1,8 +1,5 @@
//Holds locations data repository
-package team5.smartTowns.rewards;
-
-import team5.smartTowns.rewards.Badge;
-import team5.smartTowns.rewards.Sticker;
+package Team5.SmartTowns.rewards;
import java.util.List;
diff --git a/src/main/java/team5/smartTowns/rewards/RewardsRepositoryJDBC.java b/src/main/java/Team5/SmartTowns/rewards/RewardsRepositoryJDBC.java
similarity index 97%
rename from src/main/java/team5/smartTowns/rewards/RewardsRepositoryJDBC.java
rename to src/main/java/Team5/SmartTowns/rewards/RewardsRepositoryJDBC.java
index 8ca62446..65eaa984 100644
--- a/src/main/java/team5/smartTowns/rewards/RewardsRepositoryJDBC.java
+++ b/src/main/java/Team5/SmartTowns/rewards/RewardsRepositoryJDBC.java
@@ -1,10 +1,9 @@
//Implements the locations repository using JDBC
-package team5.smartTowns.rewards;
+package Team5.SmartTowns.rewards;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.RowMapper;
import org.springframework.stereotype.Repository;
-import team5.smartTowns.users.User;
import java.util.List;
diff --git a/src/main/java/team5/smartTowns/rewards/Sticker.java b/src/main/java/Team5/SmartTowns/rewards/Sticker.java
similarity index 96%
rename from src/main/java/team5/smartTowns/rewards/Sticker.java
rename to src/main/java/Team5/SmartTowns/rewards/Sticker.java
index 2634e8ac..7e5315c6 100644
--- a/src/main/java/team5/smartTowns/rewards/Sticker.java
+++ b/src/main/java/Team5/SmartTowns/rewards/Sticker.java
@@ -1,5 +1,5 @@
/*AUTHOR: Gabriel Copat*/
-package team5.smartTowns.rewards;
+package Team5.SmartTowns.rewards;
import lombok.Getter;
diff --git a/src/main/java/team5/smartTowns/towns/TownController.java b/src/main/java/Team5/SmartTowns/towns/TownController.java
similarity index 94%
rename from src/main/java/team5/smartTowns/towns/TownController.java
rename to src/main/java/Team5/SmartTowns/towns/TownController.java
index 05fb13ca..9063712b 100644
--- a/src/main/java/team5/smartTowns/towns/TownController.java
+++ b/src/main/java/Team5/SmartTowns/towns/TownController.java
@@ -1,4 +1,4 @@
-package team5.smartTowns.towns;
+package Team5.SmartTowns.towns;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
diff --git a/src/main/java/team5/smartTowns/towns/TownStorage.java b/src/main/java/Team5/SmartTowns/towns/TownStorage.java
similarity index 97%
rename from src/main/java/team5/smartTowns/towns/TownStorage.java
rename to src/main/java/Team5/SmartTowns/towns/TownStorage.java
index 28360145..988a2022 100644
--- a/src/main/java/team5/smartTowns/towns/TownStorage.java
+++ b/src/main/java/Team5/SmartTowns/towns/TownStorage.java
@@ -1,4 +1,4 @@
-package team5.smartTowns.towns;
+package Team5.SmartTowns.towns;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/team5/smartTowns/towns/Towns.java b/src/main/java/Team5/SmartTowns/towns/Towns.java
similarity index 97%
rename from src/main/java/team5/smartTowns/towns/Towns.java
rename to src/main/java/Team5/SmartTowns/towns/Towns.java
index 7c17035a..ebe6fd47 100644
--- a/src/main/java/team5/smartTowns/towns/Towns.java
+++ b/src/main/java/Team5/SmartTowns/towns/Towns.java
@@ -1,4 +1,4 @@
-package team5.smartTowns.towns;
+package Team5.SmartTowns.towns;
import lombok.Data;
diff --git a/src/main/java/team5/smartTowns/trails/Trail.java b/src/main/java/Team5/SmartTowns/trails/Trail.java
similarity index 98%
rename from src/main/java/team5/smartTowns/trails/Trail.java
rename to src/main/java/Team5/SmartTowns/trails/Trail.java
index 841b8cab..a7067f83 100644
--- a/src/main/java/team5/smartTowns/trails/Trail.java
+++ b/src/main/java/Team5/SmartTowns/trails/Trail.java
@@ -1,4 +1,4 @@
-package team5.smartTowns.trails;
+package Team5.SmartTowns.trails;
import lombok.Data;
diff --git a/src/main/java/team5/smartTowns/trails/TrailsController.java b/src/main/java/Team5/SmartTowns/trails/TrailsController.java
similarity index 93%
rename from src/main/java/team5/smartTowns/trails/TrailsController.java
rename to src/main/java/Team5/SmartTowns/trails/TrailsController.java
index 0c3f481b..84aed1ee 100644
--- a/src/main/java/team5/smartTowns/trails/TrailsController.java
+++ b/src/main/java/Team5/SmartTowns/trails/TrailsController.java
@@ -1,7 +1,7 @@
-package team5.smartTowns.trails;
+package Team5.SmartTowns.trails;
-import team5.smartTowns.landmarks.Landmarks;
+import Team5.SmartTowns.landmarks.Landmarks;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
@@ -12,7 +12,7 @@ import org.springframework.web.servlet.ModelAndView;
import java.util.List;
-import static team5.smartTowns.landmarks.Landmarks.getLandmarksDragonstrail;
+import static Team5.SmartTowns.landmarks.Landmarks.getLandmarksDragonstrail;
@Controller
public class TrailsController {
diff --git a/src/main/java/team5/smartTowns/users/User.java b/src/main/java/Team5/SmartTowns/users/User.java
similarity index 77%
rename from src/main/java/team5/smartTowns/users/User.java
rename to src/main/java/Team5/SmartTowns/users/User.java
index ba3f7873..d87a1fc9 100644
--- a/src/main/java/team5/smartTowns/users/User.java
+++ b/src/main/java/Team5/SmartTowns/users/User.java
@@ -1,15 +1,8 @@
-package team5.smartTowns.users;
+package Team5.SmartTowns.users;
import lombok.Getter;
-import lombok.Setter;
-import team5.smartTowns.rewards.Badge;
-import team5.smartTowns.rewards.Sticker;
-import lombok.Data;
import java.io.File;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
@Getter
public class User {
diff --git a/src/main/java/team5/smartTowns/users/UserController.java b/src/main/java/Team5/SmartTowns/users/UserController.java
similarity index 94%
rename from src/main/java/team5/smartTowns/users/UserController.java
rename to src/main/java/Team5/SmartTowns/users/UserController.java
index e22aff62..989d13b7 100644
--- a/src/main/java/team5/smartTowns/users/UserController.java
+++ b/src/main/java/Team5/SmartTowns/users/UserController.java
@@ -1,9 +1,9 @@
-package team5.smartTowns.users;
+package Team5.SmartTowns.users;
-import team5.smartTowns.rewards.Pack;
-import team5.smartTowns.rewards.RewardsRepository;
-import team5.smartTowns.rewards.Sticker;
+import Team5.SmartTowns.rewards.Pack;
+import Team5.SmartTowns.rewards.RewardsRepository;
+import Team5.SmartTowns.rewards.Sticker;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
@@ -11,7 +11,6 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.servlet.ModelAndView;
import java.util.List;
-import java.util.Map;
@Controller
public class UserController {
diff --git a/src/main/java/team5/smartTowns/users/UserRepository.java b/src/main/java/Team5/SmartTowns/users/UserRepository.java
similarity index 84%
rename from src/main/java/team5/smartTowns/users/UserRepository.java
rename to src/main/java/Team5/SmartTowns/users/UserRepository.java
index 8b08f257..f0f01269 100644
--- a/src/main/java/team5/smartTowns/users/UserRepository.java
+++ b/src/main/java/Team5/SmartTowns/users/UserRepository.java
@@ -1,8 +1,7 @@
//Holds users data repository
-package team5.smartTowns.users;
+package Team5.SmartTowns.users;
import java.util.List;
-import java.util.Map;
public interface UserRepository {
List<User> getAllUsers();
diff --git a/src/main/java/team5/smartTowns/users/UserRepositoryJDBC.java b/src/main/java/Team5/SmartTowns/users/UserRepositoryJDBC.java
similarity index 93%
rename from src/main/java/team5/smartTowns/users/UserRepositoryJDBC.java
rename to src/main/java/Team5/SmartTowns/users/UserRepositoryJDBC.java
index 37f759f1..868e738a 100644
--- a/src/main/java/team5/smartTowns/users/UserRepositoryJDBC.java
+++ b/src/main/java/Team5/SmartTowns/users/UserRepositoryJDBC.java
@@ -1,14 +1,11 @@
//Implements the users repository using JDBC
-package team5.smartTowns.users;
+package Team5.SmartTowns.users;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.RowMapper;
import org.springframework.stereotype.Repository;
-import team5.smartTowns.rewards.Sticker;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
@Repository
public class UserRepositoryJDBC implements UserRepository{
diff --git a/src/main/java/team5/smartTowns/webpages/WebpageController.java b/src/main/java/Team5/SmartTowns/webpages/WebpageController.java
similarity index 79%
rename from src/main/java/team5/smartTowns/webpages/WebpageController.java
rename to src/main/java/Team5/SmartTowns/webpages/WebpageController.java
index 768b1fba..7cb5243f 100644
--- a/src/main/java/team5/smartTowns/webpages/WebpageController.java
+++ b/src/main/java/Team5/SmartTowns/webpages/WebpageController.java
@@ -1,10 +1,7 @@
-package team5.smartTowns.webpages;
+package Team5.SmartTowns.webpages;
-import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.stereotype.Controller;
@Controller
diff --git a/src/main/resources/templates/users/userFrags.html b/src/main/resources/templates/users/userFrags.html
index dbeb8ee3..5b5e8201 100644
--- a/src/main/resources/templates/users/userFrags.html
+++ b/src/main/resources/templates/users/userFrags.html
@@ -1,6 +1,6 @@
-<!-- @thymesVar id="sticker" type="team5.smartTowns.rewards.Sticker" -->
-<!-- @thymesVar id="user" type="team5.smartTowns.users.User" -->
-<!-- @thymesVar id="selectedPack" type="team5.smartTowns.rewards.Pack" -->
+<!-- @thymesVar id="sticker" type="Team5.SmartTowns.rewards.Sticker" -->
+<!-- @thymesVar id="user" type="Team5.SmartTowns.users.User" -->
+<!-- @thymesVar id="selectedPack" type="Team5.SmartTowns.rewards.Pack" -->
<div th:fragment="stickersBox" id="packRewardsWrapper">
<article class="progressionContainer">
<h1 th:text="${selectedPack.getName()}"></h1>
diff --git a/src/test/java/team5/smartTowns/SmartTownsApplicationTests.java b/src/test/java/Team5/SmartTowns/SmartTownsApplicationTests.java
similarity index 87%
rename from src/test/java/team5/smartTowns/SmartTownsApplicationTests.java
rename to src/test/java/Team5/SmartTowns/SmartTownsApplicationTests.java
index 8deb2e9e..d9c15a4b 100644
--- a/src/test/java/team5/smartTowns/SmartTownsApplicationTests.java
+++ b/src/test/java/Team5/SmartTowns/SmartTownsApplicationTests.java
@@ -1,4 +1,4 @@
-package team5.smartTowns;
+package Team5.SmartTowns;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
--
GitLab