diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 549e00a2a96fa9d7c5dbc9859664a78d980158c2..0000000000000000000000000000000000000000 --- a/.gitignore +++ /dev/null @@ -1,33 +0,0 @@ -HELP.md -target/ -!.mvn/wrapper/maven-wrapper.jar -!**/src/main/**/target/ -!**/src/test/**/target/ - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ -build/ -!**/src/main/**/build/ -!**/src/test/**/build/ - -### VS Code ### -.vscode/ diff --git a/FullstackProsjekt/pom.xml b/FullstackProsjekt/pom.xml index 49f6148dad8b6a3bfe7858de0a57ebe2680c704d..58e2066d59c09afdc60f8b039fbca4727cf89da0 100644 --- a/FullstackProsjekt/pom.xml +++ b/FullstackProsjekt/pom.xml @@ -1,56 +1,78 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-parent</artifactId> - <version>3.2.4</version> - <relativePath/> <!-- lookup parent from repository --> - </parent> - <groupId>edu.ntnu</groupId> - <artifactId>idatt2105</artifactId> - <version>0.0.1-SNAPSHOT</version> - <name>FullstackProsjekt</name> - <description>FullstackProsjekt</description> - <properties> - <java.version>17</java.version> - </properties> - <dependencies> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-web</artifactId> - </dependency> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-parent</artifactId> + <version>3.2.4</version> + <relativePath/> <!-- lookup parent from repository --> + </parent> + <groupId>edu.ntnu</groupId> + <artifactId>idatt2105</artifactId> + <version>0.0.1-SNAPSHOT</version> + <name>FullstackProsjekt</name> + <description>FullstackProsjekt</description> + <properties> + <java.version>17</java.version> + </properties> + <dependencies> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-data-jpa</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-web</artifactId> + </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-devtools</artifactId> - <scope>runtime</scope> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-test</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-web-services</artifactId> - </dependency> - </dependencies> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-test</artifactId> + <scope>test</scope> + </dependency> + <!-- Spring Security --> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-security</artifactId> + </dependency> - <build> - <plugins> - <plugin> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-maven-plugin</artifactId> - </plugin> - </plugins> - </build> + <dependency> + <groupId>io.jsonwebtoken</groupId> + <artifactId>jjwt-api</artifactId> + <version>0.11.5</version> + </dependency> + + <dependency> + <groupId>io.jsonwebtoken</groupId> + <artifactId>jjwt-impl</artifactId> + <version>0.11.5</version> + </dependency> + + <dependency> + <groupId>io.jsonwebtoken</groupId> + <artifactId>jjwt-jackson</artifactId> + <version>0.11.5</version> + </dependency> + + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-oauth2-resource-server</artifactId> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-maven-plugin</artifactId> + </plugin> + </plugins> + </build> </project> diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/QuizCreationAndTest.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/QuizCreationAndTest.java similarity index 96% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/QuizCreationAndTest.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/QuizCreationAndTest.java index 88c0eb6dce44242e91c01029edfaac99c2c48ccb..d9b01b90a67c6df96ed7f3b802932b39afcb7e00 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/QuizCreationAndTest.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/QuizCreationAndTest.java @@ -1,6 +1,6 @@ -package idatt2105.group11.idatt2105projectbackend; +package edu.ntnu.idatt2105; -import idatt2105.group11.idatt2105projectbackend.model.*; +import edu.ntnu.idatt2105.model.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/configuration/SecurityConfiguration.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/configuration/SecurityConfiguration.java similarity index 96% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/configuration/SecurityConfiguration.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/configuration/SecurityConfiguration.java index 0679b4aee4995f4187d4077db753f15e1a5e867a..3573b1649c55b77275e33890a7fe2fe164bcbf21 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/configuration/SecurityConfiguration.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/configuration/SecurityConfiguration.java @@ -1,4 +1,4 @@ -package idatt2105.group11.idatt2105projectbackend.configuration; +package edu.ntnu.idatt2105.configuration; import com.nimbusds.jose.jwk.JWK; @@ -7,7 +7,7 @@ import com.nimbusds.jose.jwk.RSAKey; import com.nimbusds.jose.jwk.source.ImmutableJWKSet; import com.nimbusds.jose.jwk.source.JWKSource; import com.nimbusds.jose.proc.SecurityContext; -import idatt2105.group11.idatt2105projectbackend.utils.RSAKeyProperties; +import edu.ntnu.idatt2105.utils.RSAKeyProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.authentication.AuthenticationManager; diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/controller/AuthenticationController.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/AuthenticationController.java similarity index 75% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/controller/AuthenticationController.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/AuthenticationController.java index ccd2d1d24d4b3fc9f8506f03bfa59a0606f0e561..7109197e9c096bdcd374e288bba57e31a5f9b5fe 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/controller/AuthenticationController.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/AuthenticationController.java @@ -1,11 +1,11 @@ -package idatt2105.group11.idatt2105projectbackend.controller; +package edu.ntnu.idatt2105.controller; -import idatt2105.group11.idatt2105projectbackend.dto.LoginResponseDTO; -import idatt2105.group11.idatt2105projectbackend.dto.TokenDTO; -import idatt2105.group11.idatt2105projectbackend.dto.UserRegistrationDTO; -import idatt2105.group11.idatt2105projectbackend.model.User; -import idatt2105.group11.idatt2105projectbackend.service.AuthenticationService; +import edu.ntnu.idatt2105.dto.LoginResponseDTO; +import edu.ntnu.idatt2105.dto.TokenDTO; +import edu.ntnu.idatt2105.dto.UserRegistrationDTO; +import edu.ntnu.idatt2105.model.User; +import edu.ntnu.idatt2105.service.AuthenticationService; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/controller/QuestionAnswerController.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/QuestionAnswerController.java similarity index 81% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/controller/QuestionAnswerController.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/QuestionAnswerController.java index 2ba6e67ab3ee5fedffa956a9a36859af55ddb0d2..5159ea07a3676421abd52eef95f611ac8c8009ff 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/controller/QuestionAnswerController.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/QuestionAnswerController.java @@ -1,8 +1,8 @@ -package idatt2105.group11.idatt2105projectbackend.controller; +package edu.ntnu.idatt2105.controller; -import idatt2105.group11.idatt2105projectbackend.dto.QuestionAnswerDTO; -import idatt2105.group11.idatt2105projectbackend.model.QuestionAnswer; -import idatt2105.group11.idatt2105projectbackend.service.QuestionAnswerService; +import edu.ntnu.idatt2105.dto.QuestionAnswerDTO; +import edu.ntnu.idatt2105.model.QuestionAnswer; +import edu.ntnu.idatt2105.service.QuestionAnswerService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/controller/QuestionController.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/QuestionController.java similarity index 83% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/controller/QuestionController.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/QuestionController.java index 96580e013fc370959124d5f4c683addd42223b27..8fa11b8ea7a9490985d475f15f3a0c62953d9132 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/controller/QuestionController.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/QuestionController.java @@ -1,9 +1,9 @@ -package idatt2105.group11.idatt2105projectbackend.controller; +package edu.ntnu.idatt2105.controller; -import idatt2105.group11.idatt2105projectbackend.dto.QuestionDTO; -import idatt2105.group11.idatt2105projectbackend.model.MultipleChoiceQuestion; -import idatt2105.group11.idatt2105projectbackend.model.Question; -import idatt2105.group11.idatt2105projectbackend.service.QuestionService; +import edu.ntnu.idatt2105.dto.QuestionDTO; +import edu.ntnu.idatt2105.model.MultipleChoiceQuestion; +import edu.ntnu.idatt2105.model.Question; +import edu.ntnu.idatt2105.service.QuestionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/controller/QuizController.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/QuizController.java similarity index 88% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/controller/QuizController.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/QuizController.java index efb1ecd213e77191a5a30cd05d930b4a5416f021..342ae4696c249757063903f44cd75bd435ae50b0 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/controller/QuizController.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/QuizController.java @@ -1,9 +1,12 @@ -package idatt2105.group11.idatt2105projectbackend.controller; +package edu.ntnu.idatt2105.controller; -import idatt2105.group11.idatt2105projectbackend.dto.*; -import idatt2105.group11.idatt2105projectbackend.exception.UserNotFoundException; -import idatt2105.group11.idatt2105projectbackend.model.*; -import idatt2105.group11.idatt2105projectbackend.service.QuizService; + +import edu.ntnu.idatt2105.dto.QuizDTO; +import edu.ntnu.idatt2105.model.Question; +import edu.ntnu.idatt2105.model.Quiz; +import edu.ntnu.idatt2105.model.QuizCategory; +import edu.ntnu.idatt2105.model.QuizDifficulty; +import edu.ntnu.idatt2105.service.QuizService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/controller/QuizResultController.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/QuizResultController.java similarity index 87% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/controller/QuizResultController.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/QuizResultController.java index e301efabc8abaf1aa8d33d2a882e4ba72fb36c5e..235c131d2821a86d303f1eac63520b8b02a70000 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/controller/QuizResultController.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/QuizResultController.java @@ -1,8 +1,9 @@ -package idatt2105.group11.idatt2105projectbackend.controller; +package edu.ntnu.idatt2105.controller; -import idatt2105.group11.idatt2105projectbackend.dto.QuizResultDTO; -import idatt2105.group11.idatt2105projectbackend.model.QuizResult; -import idatt2105.group11.idatt2105projectbackend.service.QuizResultService; + +import edu.ntnu.idatt2105.dto.QuizResultDTO; +import edu.ntnu.idatt2105.model.QuizResult; +import edu.ntnu.idatt2105.service.QuizResultService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/controller/UserController.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/UserController.java similarity index 69% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/controller/UserController.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/UserController.java index 8aed1a6f88950a2b4ce9e05db96843d80f541830..9ec0bc2f3e285aa397c81be7dadcca9c8d8e954f 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/controller/UserController.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/UserController.java @@ -1,8 +1,8 @@ -package idatt2105.group11.idatt2105projectbackend.controller; +package edu.ntnu.idatt2105.controller; -import idatt2105.group11.idatt2105projectbackend.model.User; -import idatt2105.group11.idatt2105projectbackend.service.UserService; +import edu.ntnu.idatt2105.model.User; +import edu.ntnu.idatt2105.service.UserService; import org.springframework.web.bind.annotation.*; import java.util.List; diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/dto/LoginResponseDTO.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/LoginResponseDTO.java similarity index 88% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/dto/LoginResponseDTO.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/LoginResponseDTO.java index 6abc9a4b701dd234a38844cbe35e8c2337ee5e0e..692cd22d41d9a225d02733a436d4316204b7d687 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/dto/LoginResponseDTO.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/LoginResponseDTO.java @@ -1,6 +1,7 @@ -package idatt2105.group11.idatt2105projectbackend.dto; +package edu.ntnu.idatt2105.dto; -import idatt2105.group11.idatt2105projectbackend.model.User; + +import edu.ntnu.idatt2105.model.User; public class LoginResponseDTO { diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/dto/QuestionAnswerDTO.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/QuestionAnswerDTO.java similarity index 95% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/dto/QuestionAnswerDTO.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/QuestionAnswerDTO.java index e8e9a930e10bc83d7cdb0dd3578dfea5f671cbcd..0bfba37dbedca1b17c777e1e20b691068c2a1dbe 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/dto/QuestionAnswerDTO.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/QuestionAnswerDTO.java @@ -1,4 +1,4 @@ -package idatt2105.group11.idatt2105projectbackend.dto; +package edu.ntnu.idatt2105.dto; public class QuestionAnswerDTO { private Integer id; diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/dto/QuestionDTO.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/QuestionDTO.java similarity index 95% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/dto/QuestionDTO.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/QuestionDTO.java index 43511a249edf0abc2b601cfaab074b53c3c30fe2..86132ab446b07c69cbc773111103831ab4dc2fad 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/dto/QuestionDTO.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/QuestionDTO.java @@ -1,4 +1,4 @@ -package idatt2105.group11.idatt2105projectbackend.dto; +package edu.ntnu.idatt2105.dto; import java.util.List; diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/dto/QuizDTO.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/QuizDTO.java similarity index 84% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/dto/QuizDTO.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/QuizDTO.java index 8ca7f073d1435bc0aa745b52cee9b1d7a8e14357..a2ecaeeca036b136b3afc2b2ea8b561708298ee1 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/dto/QuizDTO.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/QuizDTO.java @@ -1,8 +1,8 @@ -package idatt2105.group11.idatt2105projectbackend.dto; +package edu.ntnu.idatt2105.dto; -import idatt2105.group11.idatt2105projectbackend.model.Quiz; -import idatt2105.group11.idatt2105projectbackend.model.QuizCategory; -import idatt2105.group11.idatt2105projectbackend.model.QuizDifficulty; + +import edu.ntnu.idatt2105.model.QuizCategory; +import edu.ntnu.idatt2105.model.QuizDifficulty; import java.util.List; diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/dto/QuizResultDTO.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/QuizResultDTO.java similarity index 97% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/dto/QuizResultDTO.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/QuizResultDTO.java index ca90fa8f7b96ca0c3936fcf2d418a93c0d03c495..37af5eee55f6eb6003dde702c187db4648d069c1 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/dto/QuizResultDTO.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/QuizResultDTO.java @@ -1,4 +1,4 @@ -package idatt2105.group11.idatt2105projectbackend.dto; +package edu.ntnu.idatt2105.dto; import java.time.LocalDateTime; import java.util.List; diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/dto/TokenDTO.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/TokenDTO.java similarity index 88% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/dto/TokenDTO.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/TokenDTO.java index 3663df5be9b4c3deabd5a7cce812d4254d00beb4..f2d464039b2862fbe8ac7f852aca723ccf216951 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/dto/TokenDTO.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/TokenDTO.java @@ -1,4 +1,4 @@ -package idatt2105.group11.idatt2105projectbackend.dto; +package edu.ntnu.idatt2105.dto; public class TokenDTO { diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/dto/UserDTO.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/UserDTO.java similarity index 89% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/dto/UserDTO.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/UserDTO.java index e849b91953f0686bb7389f93007d430739a986c3..10379f597b72339cb81247c07700a4a2705e640c 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/dto/UserDTO.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/UserDTO.java @@ -1,4 +1,4 @@ -package idatt2105.group11.idatt2105projectbackend.dto; +package edu.ntnu.idatt2105.dto; import java.util.List; diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/dto/UserRegistrationDTO.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/UserRegistrationDTO.java similarity index 92% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/dto/UserRegistrationDTO.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/UserRegistrationDTO.java index 586b8fa8399d034e48f4f2ad2f23f71b0a8ac719..5c37272d3ecb910a075274f00a21c1088ad5209f 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/dto/UserRegistrationDTO.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/UserRegistrationDTO.java @@ -1,4 +1,4 @@ -package idatt2105.group11.idatt2105projectbackend.dto; +package edu.ntnu.idatt2105.dto; public class UserRegistrationDTO { diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/exception/QuestionNotFoundException.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/exception/QuestionNotFoundException.java similarity index 70% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/exception/QuestionNotFoundException.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/exception/QuestionNotFoundException.java index bde8a6a8374eead1e2a033a2b43d8de32c48b73e..a17f24133899326365f3376b375fff00e4826ca2 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/exception/QuestionNotFoundException.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/exception/QuestionNotFoundException.java @@ -1,4 +1,4 @@ -package idatt2105.group11.idatt2105projectbackend.exception; +package edu.ntnu.idatt2105.exception; public class QuestionNotFoundException extends RuntimeException { public QuestionNotFoundException(String message) { diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/exception/QuizNotFoundException.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/exception/QuizNotFoundException.java similarity index 69% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/exception/QuizNotFoundException.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/exception/QuizNotFoundException.java index d49ab7e6cb8c2da6393b5c6ab6f58845b54184f6..5386c8ee5c2771027c524f642a41be562b7b1842 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/exception/QuizNotFoundException.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/exception/QuizNotFoundException.java @@ -1,4 +1,4 @@ -package idatt2105.group11.idatt2105projectbackend.exception; +package edu.ntnu.idatt2105.exception; public class QuizNotFoundException extends RuntimeException { diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/exception/UserNotFoundException.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/exception/UserNotFoundException.java similarity index 69% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/exception/UserNotFoundException.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/exception/UserNotFoundException.java index 5a0b429d45e440089073b74444c5539f7b2abc23..83340fcc387c5204a77d3bdfba3b5157cbf44916 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/exception/UserNotFoundException.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/exception/UserNotFoundException.java @@ -1,4 +1,4 @@ -package idatt2105.group11.idatt2105projectbackend.exception; +package edu.ntnu.idatt2105.exception; public class UserNotFoundException extends RuntimeException { diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/model/MultipleChoiceQuestion.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/MultipleChoiceQuestion.java similarity index 95% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/model/MultipleChoiceQuestion.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/MultipleChoiceQuestion.java index 3860211ee4d98725a7e770c95051d6382432b626..58c809d6eedbc226131291df500b6b5ad2e8134f 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/model/MultipleChoiceQuestion.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/MultipleChoiceQuestion.java @@ -1,4 +1,4 @@ -package idatt2105.group11.idatt2105projectbackend.model; +package edu.ntnu.idatt2105.model; import jakarta.persistence.*; diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/model/Question.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/Question.java similarity index 95% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/model/Question.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/Question.java index 43551670e3194a45aacb9bf419191d70c5e209e2..c6cf0ebb8bdff1c96e6c5437db92c7686a25cdb0 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/model/Question.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/Question.java @@ -1,4 +1,4 @@ -package idatt2105.group11.idatt2105projectbackend.model; +package edu.ntnu.idatt2105.model; import jakarta.persistence.*; diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/model/QuestionAnswer.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/QuestionAnswer.java similarity index 96% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/model/QuestionAnswer.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/QuestionAnswer.java index 615243610fea4b81b934c89181007e13ea28b28c..ecbcd5c7d9ff35517383d17ee2f5a267db7e83d1 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/model/QuestionAnswer.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/QuestionAnswer.java @@ -1,4 +1,4 @@ -package idatt2105.group11.idatt2105projectbackend.model; +package edu.ntnu.idatt2105.model; import jakarta.persistence.*; diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/model/Quiz.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/Quiz.java similarity index 96% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/model/Quiz.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/Quiz.java index a0bb5a153a199663d97dad16dd8219eec3f76989..d66280eab4909fa910e7e9106e9c577a59f25e20 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/model/Quiz.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/Quiz.java @@ -1,4 +1,4 @@ -package idatt2105.group11.idatt2105projectbackend.model; +package edu.ntnu.idatt2105.model; import jakarta.persistence.*; diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/model/QuizCategory.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/QuizCategory.java similarity index 82% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/model/QuizCategory.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/QuizCategory.java index d3b61a168d77f5c535ec36cb7f4cfac60316d3ca..fe841d1704c6012e27e9e195447beadd22433b0f 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/model/QuizCategory.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/QuizCategory.java @@ -1,4 +1,4 @@ -package idatt2105.group11.idatt2105projectbackend.model; +package edu.ntnu.idatt2105.model; public enum QuizCategory { BUSINESS, diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/model/QuizDifficulty.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/QuizDifficulty.java similarity index 52% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/model/QuizDifficulty.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/QuizDifficulty.java index 6d3d97cf3a95b16ebca1f9096ffd66bac652217a..8f8758e4448d6ac20cc0d5355a9a95dc57058328 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/model/QuizDifficulty.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/QuizDifficulty.java @@ -1,4 +1,4 @@ -package idatt2105.group11.idatt2105projectbackend.model; +package edu.ntnu.idatt2105.model; public enum QuizDifficulty { EASY, diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/model/QuizResult.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/QuizResult.java similarity index 98% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/model/QuizResult.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/QuizResult.java index c4acb5445e1ddf478ca20023e04169d5886bdb53..1e8b0a7de3bb924ed5042860f3551734dbc98a09 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/model/QuizResult.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/QuizResult.java @@ -1,4 +1,4 @@ -package idatt2105.group11.idatt2105projectbackend.model; +package edu.ntnu.idatt2105.model; import jakarta.persistence.*; diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/model/Role.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/Role.java similarity index 95% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/model/Role.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/Role.java index 02cfab748a4a8fc3f0455b25be2e210c815396c7..6aa56f8b41ea01f65e548bdd8221f26c8c90e4ed 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/model/Role.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/Role.java @@ -1,4 +1,4 @@ -package idatt2105.group11.idatt2105projectbackend.model; +package edu.ntnu.idatt2105.model; import jakarta.persistence.Id; diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/model/User.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/User.java similarity index 93% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/model/User.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/User.java index 38ac0b49dd27d1cdf18aa72a79988d21268a4ab6..cb26fd580528b42c557c52558ab616349d02634b 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/model/User.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/User.java @@ -1,7 +1,5 @@ -package idatt2105.group11.idatt2105projectbackend.model; +package edu.ntnu.idatt2105.model; -import idatt2105.group11.idatt2105projectbackend.model.Quiz; -import idatt2105.group11.idatt2105projectbackend.model.QuizResult; import jakarta.persistence.*; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/repository/QuestionAnswerRepository.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/repository/QuestionAnswerRepository.java similarity index 71% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/repository/QuestionAnswerRepository.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/repository/QuestionAnswerRepository.java index 8379417a02f96aa55e05fb23b12773656dd65455..46e85280472acffe1c29d0232540fb36289707aa 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/repository/QuestionAnswerRepository.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/repository/QuestionAnswerRepository.java @@ -1,6 +1,6 @@ -package idatt2105.group11.idatt2105projectbackend.repository; +package edu.ntnu.idatt2105.repository; -import idatt2105.group11.idatt2105projectbackend.model.QuestionAnswer; +import edu.ntnu.idatt2105.model.QuestionAnswer; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/repository/QuestionRepository.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/repository/QuestionRepository.java similarity index 73% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/repository/QuestionRepository.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/repository/QuestionRepository.java index 5ee965157540a1c033c6ca56ba5cddd4dd9ec5f7..ce181e3fc399ae1371b5bd14d132b15d5eb97c2e 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/repository/QuestionRepository.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/repository/QuestionRepository.java @@ -1,6 +1,6 @@ -package idatt2105.group11.idatt2105projectbackend.repository; +package edu.ntnu.idatt2105.repository; -import idatt2105.group11.idatt2105projectbackend.model.Question; +import edu.ntnu.idatt2105.model.Question; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/repository/QuizRepository.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/repository/QuizRepository.java similarity index 63% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/repository/QuizRepository.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/repository/QuizRepository.java index b507f9251a6f1824efd10a72a8a8275bcf87492b..41d3bd6c4d3d7b1b4e98bc6267c89685f13c493a 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/repository/QuizRepository.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/repository/QuizRepository.java @@ -1,8 +1,8 @@ -package idatt2105.group11.idatt2105projectbackend.repository; +package edu.ntnu.idatt2105.repository; -import idatt2105.group11.idatt2105projectbackend.model.QuizCategory; -import idatt2105.group11.idatt2105projectbackend.model.Quiz; -import idatt2105.group11.idatt2105projectbackend.model.QuizDifficulty; +import edu.ntnu.idatt2105.model.Quiz; +import edu.ntnu.idatt2105.model.QuizCategory; +import edu.ntnu.idatt2105.model.QuizDifficulty; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/repository/QuizResultRepository.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/repository/QuizResultRepository.java similarity index 75% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/repository/QuizResultRepository.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/repository/QuizResultRepository.java index a20076e27484240c3366eea68f9cfaa1c81d9e15..4fcad2eff4357ef571716cd72c2f0627c638691b 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/repository/QuizResultRepository.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/repository/QuizResultRepository.java @@ -1,6 +1,6 @@ -package idatt2105.group11.idatt2105projectbackend.repository; +package edu.ntnu.idatt2105.repository; -import idatt2105.group11.idatt2105projectbackend.model.QuizResult; +import edu.ntnu.idatt2105.model.QuizResult; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/repository/RoleRepository.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/repository/RoleRepository.java similarity index 69% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/repository/RoleRepository.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/repository/RoleRepository.java index 3a758ba07c72563e7816e3702cae124744cd9a74..9c1325e06bd29b005b3936b56b543dcfc811171d 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/repository/RoleRepository.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/repository/RoleRepository.java @@ -1,6 +1,6 @@ -package idatt2105.group11.idatt2105projectbackend.repository; +package edu.ntnu.idatt2105.repository; -import idatt2105.group11.idatt2105projectbackend.model.Role; +import edu.ntnu.idatt2105.model.Role; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/repository/UserRepository.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/repository/UserRepository.java similarity index 74% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/repository/UserRepository.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/repository/UserRepository.java index a8a93475d75592888618834657756ec06e80d998..4ac8972db50f0ebd4039251c8b37acb72893388f 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/repository/UserRepository.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/repository/UserRepository.java @@ -1,7 +1,7 @@ -package idatt2105.group11.idatt2105projectbackend.repository; +package edu.ntnu.idatt2105.repository; -import idatt2105.group11.idatt2105projectbackend.model.User; +import edu.ntnu.idatt2105.model.User; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/service/AuthenticationService.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/service/AuthenticationService.java similarity index 86% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/service/AuthenticationService.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/service/AuthenticationService.java index cf05fd22658da70d7828fd5b29ec74c5dd00e5c7..99babbad41261e1481bb23ef6224f43eefda746e 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/service/AuthenticationService.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/service/AuthenticationService.java @@ -1,11 +1,11 @@ -package idatt2105.group11.idatt2105projectbackend.service; - -import idatt2105.group11.idatt2105projectbackend.dto.LoginResponseDTO; -import idatt2105.group11.idatt2105projectbackend.exception.UserNotFoundException; -import idatt2105.group11.idatt2105projectbackend.model.Role; -import idatt2105.group11.idatt2105projectbackend.model.User; -import idatt2105.group11.idatt2105projectbackend.repository.RoleRepository; -import idatt2105.group11.idatt2105projectbackend.repository.UserRepository; +package edu.ntnu.idatt2105.service; + +import edu.ntnu.idatt2105.dto.LoginResponseDTO; +import edu.ntnu.idatt2105.exception.UserNotFoundException; +import edu.ntnu.idatt2105.model.Role; +import edu.ntnu.idatt2105.model.User; +import edu.ntnu.idatt2105.repository.RoleRepository; +import edu.ntnu.idatt2105.repository.UserRepository; import jakarta.transaction.Transactional; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/service/QuestionAnswerService.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/service/QuestionAnswerService.java similarity index 70% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/service/QuestionAnswerService.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/service/QuestionAnswerService.java index a9f20e6fa52ef6068b582195ad2ece7cb850e2f3..c5fed258622c23416aa2272f52a2854facc3828a 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/service/QuestionAnswerService.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/service/QuestionAnswerService.java @@ -1,13 +1,13 @@ -package idatt2105.group11.idatt2105projectbackend.service; - -import idatt2105.group11.idatt2105projectbackend.dto.QuestionAnswerDTO; -import idatt2105.group11.idatt2105projectbackend.exception.QuizNotFoundException; -import idatt2105.group11.idatt2105projectbackend.model.Question; -import idatt2105.group11.idatt2105projectbackend.model.QuestionAnswer; -import idatt2105.group11.idatt2105projectbackend.model.QuizResult; -import idatt2105.group11.idatt2105projectbackend.repository.QuestionAnswerRepository; -import idatt2105.group11.idatt2105projectbackend.repository.QuestionRepository; -import idatt2105.group11.idatt2105projectbackend.repository.QuizResultRepository; +package edu.ntnu.idatt2105.service; + +import edu.ntnu.idatt2105.dto.QuestionAnswerDTO; +import edu.ntnu.idatt2105.exception.QuizNotFoundException; +import edu.ntnu.idatt2105.model.Question; +import edu.ntnu.idatt2105.model.QuestionAnswer; +import edu.ntnu.idatt2105.model.QuizResult; +import edu.ntnu.idatt2105.repository.QuestionAnswerRepository; +import edu.ntnu.idatt2105.repository.QuestionRepository; +import edu.ntnu.idatt2105.repository.QuizResultRepository; import jakarta.persistence.EntityNotFoundException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/service/QuestionService.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/service/QuestionService.java similarity index 83% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/service/QuestionService.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/service/QuestionService.java index fa81452fa0ff11c89ab45cccbc71d377c155e454..91e584cd93467b78e2313cf1f6a53b94dbd87c87 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/service/QuestionService.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/service/QuestionService.java @@ -1,10 +1,10 @@ -package idatt2105.group11.idatt2105projectbackend.service; +package edu.ntnu.idatt2105.service; -import idatt2105.group11.idatt2105projectbackend.dto.QuestionDTO; -import idatt2105.group11.idatt2105projectbackend.exception.QuestionNotFoundException; -import idatt2105.group11.idatt2105projectbackend.model.MultipleChoiceQuestion; -import idatt2105.group11.idatt2105projectbackend.model.Question; -import idatt2105.group11.idatt2105projectbackend.repository.QuestionRepository; +import edu.ntnu.idatt2105.dto.QuestionDTO; +import edu.ntnu.idatt2105.exception.QuestionNotFoundException; +import edu.ntnu.idatt2105.model.MultipleChoiceQuestion; +import edu.ntnu.idatt2105.model.Question; +import edu.ntnu.idatt2105.repository.QuestionRepository; import jakarta.transaction.Transactional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/service/QuizResultService.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/service/QuizResultService.java similarity index 85% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/service/QuizResultService.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/service/QuizResultService.java index e325ce932252a0befe528a6e75067fa0f68f2d7f..405574475db95d873bcbc326bffe899c59d34220 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/service/QuizResultService.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/service/QuizResultService.java @@ -1,15 +1,15 @@ -package idatt2105.group11.idatt2105projectbackend.service; - -import idatt2105.group11.idatt2105projectbackend.dto.QuestionAnswerDTO; -import idatt2105.group11.idatt2105projectbackend.dto.QuizResultDTO; -import idatt2105.group11.idatt2105projectbackend.exception.QuestionNotFoundException; -import idatt2105.group11.idatt2105projectbackend.exception.QuizNotFoundException; -import idatt2105.group11.idatt2105projectbackend.exception.UserNotFoundException; -import idatt2105.group11.idatt2105projectbackend.model.*; -import idatt2105.group11.idatt2105projectbackend.repository.QuestionRepository; -import idatt2105.group11.idatt2105projectbackend.repository.QuizRepository; -import idatt2105.group11.idatt2105projectbackend.repository.QuizResultRepository; -import idatt2105.group11.idatt2105projectbackend.repository.UserRepository; +package edu.ntnu.idatt2105.service; + +import edu.ntnu.idatt2105.dto.QuestionAnswerDTO; +import edu.ntnu.idatt2105.dto.QuizResultDTO; +import edu.ntnu.idatt2105.exception.QuestionNotFoundException; +import edu.ntnu.idatt2105.exception.QuizNotFoundException; +import edu.ntnu.idatt2105.exception.UserNotFoundException; +import edu.ntnu.idatt2105.model.*; +import edu.ntnu.idatt2105.repository.QuestionRepository; +import edu.ntnu.idatt2105.repository.QuizRepository; +import edu.ntnu.idatt2105.repository.QuizResultRepository; +import edu.ntnu.idatt2105.repository.UserRepository; import jakarta.persistence.EntityNotFoundException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/service/QuizService.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/service/QuizService.java similarity index 86% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/service/QuizService.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/service/QuizService.java index 703a19ea61eb67d51b715d95d39538c020463f71..53a5a771369a395c50458f8becd04ec3b6c64955 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/service/QuizService.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/service/QuizService.java @@ -1,10 +1,13 @@ -package idatt2105.group11.idatt2105projectbackend.service; - -import idatt2105.group11.idatt2105projectbackend.dto.QuizDTO; -import idatt2105.group11.idatt2105projectbackend.exception.QuizNotFoundException; -import idatt2105.group11.idatt2105projectbackend.model.*; -import idatt2105.group11.idatt2105projectbackend.repository.QuestionRepository; -import idatt2105.group11.idatt2105projectbackend.repository.QuizRepository; +package edu.ntnu.idatt2105.service; + +import edu.ntnu.idatt2105.dto.QuizDTO; +import edu.ntnu.idatt2105.exception.QuizNotFoundException; +import edu.ntnu.idatt2105.model.Question; +import edu.ntnu.idatt2105.model.Quiz; +import edu.ntnu.idatt2105.model.QuizCategory; +import edu.ntnu.idatt2105.model.QuizDifficulty; +import edu.ntnu.idatt2105.repository.QuestionRepository; +import edu.ntnu.idatt2105.repository.QuizRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/service/TokenService.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/service/TokenService.java similarity index 96% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/service/TokenService.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/service/TokenService.java index c6fd4f8d0286a48cfa26a5350f414655dc71b6db..e820e888a7c448c889ebc5d83bb7cbc472771ce7 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/service/TokenService.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/service/TokenService.java @@ -1,4 +1,4 @@ -package idatt2105.group11.idatt2105projectbackend.service; +package edu.ntnu.idatt2105.service; import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/service/UserService.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/service/UserService.java similarity index 83% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/service/UserService.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/service/UserService.java index 185bfc55bb4ceb68002462e48d07460a10634cbb..32a2ab966cbf6bc53f5f713c61bf8b1615926d0e 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/service/UserService.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/service/UserService.java @@ -1,8 +1,7 @@ -package idatt2105.group11.idatt2105projectbackend.service; +package edu.ntnu.idatt2105.service; -import idatt2105.group11.idatt2105projectbackend.exception.UserNotFoundException; -import idatt2105.group11.idatt2105projectbackend.model.User; -import idatt2105.group11.idatt2105projectbackend.repository.UserRepository; +import edu.ntnu.idatt2105.model.User; +import edu.ntnu.idatt2105.repository.UserRepository; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/utils/KeyGeneratorUtility.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/utils/KeyGeneratorUtility.java similarity index 88% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/utils/KeyGeneratorUtility.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/utils/KeyGeneratorUtility.java index 56a6d94fe8f7d75295dab8b03be1425829dbd30c..29d7e70c8ee7405a3a7800f30045e52a4d8924be 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/utils/KeyGeneratorUtility.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/utils/KeyGeneratorUtility.java @@ -1,4 +1,4 @@ -package idatt2105.group11.idatt2105projectbackend.utils; +package edu.ntnu.idatt2105.utils; import java.security.KeyPair; diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/utils/RSAKeyProperties.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/utils/RSAKeyProperties.java similarity index 93% rename from src/main/java/idatt2105/group11/idatt2105projectbackend/utils/RSAKeyProperties.java rename to FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/utils/RSAKeyProperties.java index 763b6fc58d1237d834eabafe8212e025c917a942..d216a053e506a0c3e4c57da09a4b8a9dbdb088b3 100644 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/utils/RSAKeyProperties.java +++ b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/utils/RSAKeyProperties.java @@ -1,4 +1,4 @@ -package idatt2105.group11.idatt2105projectbackend.utils; +package edu.ntnu.idatt2105.utils; import org.springframework.stereotype.Component; diff --git a/FullstackProsjekt/src/test/java/edu/ntnu/idatt2105/CheckHTTPResponse.java b/FullstackProsjekt/src/test/java/edu/ntnu/idatt2105/CheckHTTPResponse.java index 5da60d486f15296103be98b2ea00e1f013d399c2..4272e612805bdf64c52544a800f68254ffdb1622 100644 --- a/FullstackProsjekt/src/test/java/edu/ntnu/idatt2105/CheckHTTPResponse.java +++ b/FullstackProsjekt/src/test/java/edu/ntnu/idatt2105/CheckHTTPResponse.java @@ -1,6 +1,7 @@ package edu.ntnu.idatt2105; -import org.junit.Test; + +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.client.TestRestTemplate; diff --git a/mvnw b/mvnw deleted file mode 100644 index 66df2854281f4cb6869e4830dd1a7abd1e946c18..0000000000000000000000000000000000000000 --- a/mvnw +++ /dev/null @@ -1,308 +0,0 @@ -#!/bin/sh -# ---------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.2.0 -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir -# -# Optional ENV vars -# ----------------- -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files -# ---------------------------------------------------------------------------- - -if [ -z "$MAVEN_SKIP_RC" ] ; then - - if [ -f /usr/local/etc/mavenrc ] ; then - . /usr/local/etc/mavenrc - fi - - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi - - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" - fi - -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false -case "$(uname)" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home - # See https://developer.apple.com/library/mac/qa/qa1170/_index.html - if [ -z "$JAVA_HOME" ]; then - if [ -x "/usr/libexec/java_home" ]; then - JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME - else - JAVA_HOME="/Library/Java/Home"; export JAVA_HOME - fi - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=$(java-config --jre-home) - fi -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$JAVA_HOME" ] && - JAVA_HOME=$(cygpath --unix "$JAVA_HOME") - [ -n "$CLASSPATH" ] && - CLASSPATH=$(cygpath --path --unix "$CLASSPATH") -fi - -# For Mingw, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] && - JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)" -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="$(which javac)" - if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=$(which readlink) - if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then - if $darwin ; then - javaHome="$(dirname "\"$javaExecutable\"")" - javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac" - else - javaExecutable="$(readlink -f "\"$javaExecutable\"")" - fi - javaHome="$(dirname "\"$javaExecutable\"")" - javaHome=$(expr "$javaHome" : '\(.*\)/bin') - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - else - JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)" - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." -fi - -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { - if [ -z "$1" ] - then - echo "Path not specified to find_maven_basedir" - return 1 - fi - - basedir="$1" - wdir="$1" - while [ "$wdir" != '/' ] ; do - if [ -d "$wdir"/.mvn ] ; then - basedir=$wdir - break - fi - # workaround for JBEAP-8937 (on Solaris 10/Sparc) - if [ -d "${wdir}" ]; then - wdir=$(cd "$wdir/.." || exit 1; pwd) - fi - # end of workaround - done - printf '%s' "$(cd "$basedir" || exit 1; pwd)" -} - -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - # Remove \r in case we run on Windows within Git Bash - # and check out the repository with auto CRLF management - # enabled. Otherwise, we may read lines that are delimited with - # \r\n and produce $'-Xarg\r' rather than -Xarg due to word - # splitting rules. - tr -s '\r\n' ' ' < "$1" - fi -} - -log() { - if [ "$MVNW_VERBOSE" = true ]; then - printf '%s\n' "$1" - fi -} - -BASE_DIR=$(find_maven_basedir "$(dirname "$0")") -if [ -z "$BASE_DIR" ]; then - exit 1; -fi - -MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR -log "$MAVEN_PROJECTBASEDIR" - -########################################################################################## -# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -# This allows using the maven wrapper in projects that prohibit checking in binary data. -########################################################################################## -wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" -if [ -r "$wrapperJarPath" ]; then - log "Found $wrapperJarPath" -else - log "Couldn't find $wrapperJarPath, downloading it ..." - - if [ -n "$MVNW_REPOURL" ]; then - wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - else - wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - fi - while IFS="=" read -r key value; do - # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) - safeValue=$(echo "$value" | tr -d '\r') - case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;; - esac - done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" - log "Downloading from: $wrapperUrl" - - if $cygwin; then - wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") - fi - - if command -v wget > /dev/null; then - log "Found wget ... using wget" - [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - else - wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - fi - elif command -v curl > /dev/null; then - log "Found curl ... using curl" - [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" - else - curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" - fi - else - log "Falling back to using Java to download" - javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" - javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" - # For Cygwin, switch paths to Windows format before running javac - if $cygwin; then - javaSource=$(cygpath --path --windows "$javaSource") - javaClass=$(cygpath --path --windows "$javaClass") - fi - if [ -e "$javaSource" ]; then - if [ ! -e "$javaClass" ]; then - log " - Compiling MavenWrapperDownloader.java ..." - ("$JAVA_HOME/bin/javac" "$javaSource") - fi - if [ -e "$javaClass" ]; then - log " - Running MavenWrapperDownloader.java ..." - ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" - fi - fi - fi -fi -########################################################################################## -# End of extension -########################################################################################## - -# If specified, validate the SHA-256 sum of the Maven wrapper jar file -wrapperSha256Sum="" -while IFS="=" read -r key value; do - case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;; - esac -done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" -if [ -n "$wrapperSha256Sum" ]; then - wrapperSha256Result=false - if command -v sha256sum > /dev/null; then - if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then - wrapperSha256Result=true - fi - elif command -v shasum > /dev/null; then - if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then - wrapperSha256Result=true - fi - else - echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." - echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." - exit 1 - fi - if [ $wrapperSha256Result = false ]; then - echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2 - echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2 - echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2 - exit 1 - fi -fi - -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$JAVA_HOME" ] && - JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME") - [ -n "$CLASSPATH" ] && - CLASSPATH=$(cygpath --path --windows "$CLASSPATH") - [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR") -fi - -# Provide a "standardized" way to retrieve the CLI args that will -# work with both Windows and non-Windows executions. -MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*" -export MAVEN_CMD_LINE_ARGS - -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -# shellcheck disable=SC2086 # safe args -exec "$JAVACMD" \ - $MAVEN_OPTS \ - $MAVEN_DEBUG_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd deleted file mode 100644 index 95ba6f54ac526de46248af840bab26f33f946b93..0000000000000000000000000000000000000000 --- a/mvnw.cmd +++ /dev/null @@ -1,205 +0,0 @@ -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM https://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Apache Maven Wrapper startup batch script, version 3.2.0 -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM set title of command window -title %0 -@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* -if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" -set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B -) - -@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -@REM This allows using the maven wrapper in projects that prohibit checking in binary data. -if exist %WRAPPER_JAR% ( - if "%MVNW_VERBOSE%" == "true" ( - echo Found %WRAPPER_JAR% - ) -) else ( - if not "%MVNW_REPOURL%" == "" ( - SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - ) - if "%MVNW_VERBOSE%" == "true" ( - echo Couldn't find %WRAPPER_JAR%, downloading it ... - echo Downloading from: %WRAPPER_URL% - ) - - powershell -Command "&{"^ - "$webclient = new-object System.Net.WebClient;"^ - "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ - "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ - "}"^ - "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ - "}" - if "%MVNW_VERBOSE%" == "true" ( - echo Finished downloading %WRAPPER_JAR% - ) -) -@REM End of extension - -@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file -SET WRAPPER_SHA_256_SUM="" -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B -) -IF NOT %WRAPPER_SHA_256_SUM%=="" ( - powershell -Command "&{"^ - "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ - "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ - " Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ - " Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ - " Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ - " exit 1;"^ - "}"^ - "}" - if ERRORLEVEL 1 goto error -) - -@REM Provide a "standardized" way to retrieve the CLI args that will -@REM work with both Windows and non-Windows executions. -set MAVEN_CMD_LINE_ARGS=%* - -%MAVEN_JAVA_EXE% ^ - %JVM_CONFIG_MAVEN_PROPS% ^ - %MAVEN_OPTS% ^ - %MAVEN_DEBUG_OPTS% ^ - -classpath %WRAPPER_JAR% ^ - "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ - %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" -if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%"=="on" pause - -if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% - -cmd /C exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 7427f5eb4c5713ba283696bbec8d7a41e35a9dc0..0000000000000000000000000000000000000000 --- a/pom.xml +++ /dev/null @@ -1,78 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-parent</artifactId> - <version>3.2.4</version> - <relativePath/> <!-- lookup parent from repository --> - </parent> - <groupId>idatt2105.group11</groupId> - <artifactId>idatt2105-project-backend</artifactId> - <version>0.0.1-SNAPSHOT</version> - <name>idatt2105-project-backend</name> - <description>Backend for IDATT2105 project</description> - <properties> - <java.version>21</java.version> - </properties> - <dependencies> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-data-jpa</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-web</artifactId> - </dependency> - - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-test</artifactId> - <scope>test</scope> - </dependency> - <!-- Spring Security --> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-security</artifactId> - </dependency> - - <dependency> - <groupId>io.jsonwebtoken</groupId> - <artifactId>jjwt-api</artifactId> - <version>0.11.5</version> - </dependency> - - <dependency> - <groupId>io.jsonwebtoken</groupId> - <artifactId>jjwt-impl</artifactId> - <version>0.11.5</version> - </dependency> - - <dependency> - <groupId>io.jsonwebtoken</groupId> - <artifactId>jjwt-jackson</artifactId> - <version>0.11.5</version> - </dependency> - - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-oauth2-resource-server</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-maven-plugin</artifactId> - </plugin> - </plugins> - </build> - -</project> diff --git a/src/main/java/idatt2105/group11/idatt2105projectbackend/Idatt2105ProjectBackendApplication.java b/src/main/java/idatt2105/group11/idatt2105projectbackend/Idatt2105ProjectBackendApplication.java deleted file mode 100644 index 8205825790b4a80b7ed1536b977c830baa8b44e4..0000000000000000000000000000000000000000 --- a/src/main/java/idatt2105/group11/idatt2105projectbackend/Idatt2105ProjectBackendApplication.java +++ /dev/null @@ -1,13 +0,0 @@ -package idatt2105.group11.idatt2105projectbackend; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class Idatt2105ProjectBackendApplication { - - public static void main(String[] args) { - SpringApplication.run(Idatt2105ProjectBackendApplication.class, args); - } - -} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties deleted file mode 100644 index 76e1cf573705f3c659270f849edc2a27cb1b9176..0000000000000000000000000000000000000000 --- a/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -spring.application.name=idatt2105-project-backend diff --git a/src/test/java/idatt2105/group11/idatt2105projectbackend/Idatt2105ProjectBackendApplicationTests.java b/src/test/java/idatt2105/group11/idatt2105projectbackend/Idatt2105ProjectBackendApplicationTests.java deleted file mode 100644 index c3296332859b522ae82ced6f7faa27092f3e45d5..0000000000000000000000000000000000000000 --- a/src/test/java/idatt2105/group11/idatt2105projectbackend/Idatt2105ProjectBackendApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -package idatt2105.group11.idatt2105projectbackend; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class Idatt2105ProjectBackendApplicationTests { - - @Test - void contextLoads() { - } - -}