RaidBuilder/RaidBuilderAPI
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update dependencies

Browse Source
This commit is contained in:
Mattrixwv
2026-01-07 12:13:47 -05:00
parent 949d9805e5
commit 3c5791bd84
20 changed files with 87 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
pom.xml
View File

@@ -26,7 +26,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>3.5.4</version> <version>4.0.1</version>
</parent> </parent>
<dependencies> <dependencies>
@@ -92,31 +92,31 @@
<dependency> <dependency>
<groupId>org.postgresql</groupId> <groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId> <artifactId>postgresql</artifactId>
<version>42.7.7</version> <version>42.7.8</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.hypersistence</groupId> <groupId>io.hypersistence</groupId>
<artifactId>hypersistence-utils-hibernate-63</artifactId> <artifactId>hypersistence-utils-hibernate-63</artifactId>
<version>3.10.3</version> <version>3.14.1</version>
</dependency> </dependency>
<!--! Jackson --> <!--! Jackson -->
<dependency> <dependency>
<groupId>com.fasterxml.jackson.datatype</groupId> <groupId>tools.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId> <artifactId>jackson-datatype-jsr310</artifactId>
<version>2.19.2</version> <version>3.0.0-rc2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.datatype</groupId> <groupId>tools.jackson.datatype</groupId>
<artifactId>jackson-datatype-hibernate6</artifactId> <artifactId>jackson-datatype-hibernate6</artifactId>
<version>2.19.2</version> <version>3.0.3</version>
</dependency> </dependency>
<!--! Boilerplate Generator --> <!--! Boilerplate Generator -->
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<version>1.18.38</version> <version>1.18.42</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@@ -133,7 +133,7 @@
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-layout-template-json</artifactId> <artifactId>log4j-layout-template-json</artifactId>
<version>2.24.3</version> <version>2.25.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.lmax</groupId> <groupId>com.lmax</groupId>
@@ -145,12 +145,12 @@
<dependency> <dependency>
<groupId>org.eclipse.angus</groupId> <groupId>org.eclipse.angus</groupId>
<artifactId>angus-mail</artifactId> <artifactId>angus-mail</artifactId>
<version>2.0.4</version> <version>2.0.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-codec</groupId> <groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId> <artifactId>commons-codec</artifactId>
<version>1.19.0</version> <version>1.20.0</version>
</dependency> </dependency>
</dependencies> </dependencies>
@@ -164,7 +164,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId> <artifactId>maven-enforcer-plugin</artifactId>
<version>3.6.1</version> <version>3.6.2</version>
<executions> <executions>
<execution> <execution>
<id>enforce-maven</id> <id>enforce-maven</id>
@@ -189,15 +189,16 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version> <version>3.4.0</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.14.0</version> <version>3.14.1</version>
<configuration> <configuration>
<compilerArgs> <compilerArgs>
<arg>-Xlint:all</arg> <arg>-Xlint:all</arg>
<arg>-proc:full</arg>
</compilerArgs> </compilerArgs>
<showWarnings>true</showWarnings> <showWarnings>true</showWarnings>
<showDeprecation>true</showDeprecation> <showDeprecation>true</showDeprecation>
@@ -206,7 +207,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>3.5.3</version> <version>3.5.4</version>
<configuration> <configuration>
<skipTests>${skip.unit.tests}</skipTests> <skipTests>${skip.unit.tests}</skipTests>
<excludes> <excludes>
@@ -220,7 +221,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.4.2</version> <version>3.5.0</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@@ -235,7 +236,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId> <artifactId>maven-failsafe-plugin</artifactId>
<version>3.5.3</version> <version>3.5.4</version>
<executions> <executions>
<execution> <execution>
<configuration> <configuration>
@@ -263,7 +264,7 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId> <artifactId>versions-maven-plugin</artifactId>
<version>2.18.0</version> <version>2.20.1</version>
<configuration> <configuration>
<rulesUri>file://${session.executionRootDirectory}/version-rules.xml</rulesUri> <rulesUri>file://${session.executionRootDirectory}/version-rules.xml</rulesUri>
</configuration> </configuration>
@@ -272,12 +273,12 @@
<plugin> <plugin>
<groupId>org.sonarsource.scanner.maven</groupId> <groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId> <artifactId>sonar-maven-plugin</artifactId>
<version>5.1.0.4751</version> <version>5.5.0.6356</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.jacoco</groupId> <groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId> <artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.13</version> <version>0.8.14</version>
<configuration> <configuration>
<excludes> <excludes>
<exclude>**/CipherStreamAPI*</exclude> <exclude>**/CipherStreamAPI*</exclude>
@@ -303,7 +304,7 @@
<plugin> <plugin>
<groupId>org.owasp</groupId> <groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId> <artifactId>dependency-check-maven</artifactId>
<version>12.1.3</version> <version>12.1.9</version>
<executions> <executions>
<execution> <execution>
<phase>none</phase> <phase>none</phase>

2
src/main/java/com/mattrixwv/raidbuilder/config/TokenService.java
View File

@@ -13,7 +13,6 @@ import org.springframework.security.oauth2.jwt.JwtClaimsSet;
import org.springframework.security.oauth2.jwt.JwtEncoder; import org.springframework.security.oauth2.jwt.JwtEncoder;
import org.springframework.security.oauth2.jwt.JwtEncoderParameters; import org.springframework.security.oauth2.jwt.JwtEncoderParameters;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.mattrixwv.raidbuilder.entity.Account; import com.mattrixwv.raidbuilder.entity.Account;
import com.mattrixwv.raidbuilder.entity.AccountPermission; import com.mattrixwv.raidbuilder.entity.AccountPermission;
import com.mattrixwv.raidbuilder.entity.GamePermission; import com.mattrixwv.raidbuilder.entity.GamePermission;
@@ -26,6 +25,7 @@ import com.mattrixwv.raidbuilder.service.RaidGroupRequestService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.ObjectMapper;
@Slf4j @Slf4j

27
src/main/java/com/mattrixwv/raidbuilder/config/WebConfig.java
View File

@@ -4,17 +4,15 @@ package com.mattrixwv.raidbuilder.config;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.lang.NonNull;
import org.springframework.web.servlet.config.annotation.CorsRegistry; import org.springframework.web.servlet.config.annotation.CorsRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.datatype.hibernate6.Hibernate6Module;
import com.fasterxml.jackson.datatype.hibernate6.Hibernate6Module.Feature;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.ObjectMapper;
import tools.jackson.databind.json.JsonMapper;
import tools.jackson.datatype.hibernate6.Hibernate6Module;
import tools.jackson.datatype.hibernate6.Hibernate6Module.Feature;
import tools.jackson.datatype.jsr310.JavaTimeModule;
@Slf4j @Slf4j
@@ -25,7 +23,7 @@ public class WebConfig implements WebMvcConfigurer{
@Override @Override
public void addCorsMappings(@NonNull CorsRegistry registry){ public void addCorsMappings(CorsRegistry registry){
log.debug("Adding CORS mappings: {}", allowedOrigins); log.debug("Adding CORS mappings: {}", allowedOrigins);
registry.addMapping("/**") registry.addMapping("/**")
@@ -37,8 +35,6 @@ public class WebConfig implements WebMvcConfigurer{
@Bean @Bean
public ObjectMapper objectMapper(){ public ObjectMapper objectMapper(){
ObjectMapper mapper = new ObjectMapper();
log.debug("Starting mapping configuration"); log.debug("Starting mapping configuration");
//Make sure Jackson doesn't attempt lazy loading //Make sure Jackson doesn't attempt lazy loading
@@ -47,12 +43,11 @@ public class WebConfig implements WebMvcConfigurer{
hibernate6Module.configure(Feature.USE_TRANSIENT_ANNOTATION, false); hibernate6Module.configure(Feature.USE_TRANSIENT_ANNOTATION, false);
hibernate6Module.configure(Feature.REQUIRE_EXPLICIT_LAZY_LOADING_MARKER, true); hibernate6Module.configure(Feature.REQUIRE_EXPLICIT_LAZY_LOADING_MARKER, true);
hibernate6Module.configure(Feature.WRITE_MISSING_ENTITIES_AS_NULL, false); hibernate6Module.configure(Feature.WRITE_MISSING_ENTITIES_AS_NULL, false);
mapper.registerModule(hibernate6Module); ObjectMapper mapper = JsonMapper.builder()
.addModule(hibernate6Module)
//Print dates as strings .addModule(new JavaTimeModule())
mapper.registerModule(new JavaTimeModule()); .findAndAddModules()
mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false); .build();
mapper.findAndRegisterModules();
log.debug("Completed mapping configuration"); log.debug("Completed mapping configuration");

3
src/main/java/com/mattrixwv/raidbuilder/config/WebFilter.java
View File

@@ -6,7 +6,6 @@ import java.util.StringJoiner;
import java.util.UUID; import java.util.UUID;
import org.slf4j.MDC; import org.slf4j.MDC;
import org.springframework.lang.NonNull;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.filter.OncePerRequestFilter; import org.springframework.web.filter.OncePerRequestFilter;
@@ -21,7 +20,7 @@ import lombok.extern.slf4j.Slf4j;
@Component @Component
public class WebFilter extends OncePerRequestFilter{ public class WebFilter extends OncePerRequestFilter{
@Override @Override
public void doFilterInternal(@NonNull HttpServletRequest request, @NonNull HttpServletResponse response, @NonNull FilterChain filterChain) throws ServletException, IOException{ public void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException{
if(!request.getMethod().equalsIgnoreCase("OPTIONS")){ if(!request.getMethod().equalsIgnoreCase("OPTIONS")){
setupMDC(request); setupMDC(request);
} }

10
src/main/java/com/mattrixwv/raidbuilder/controller/AccountController.java
View File

@@ -15,9 +15,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.raidbuilder.annotation.AccountAuthorization; import com.mattrixwv.raidbuilder.annotation.AccountAuthorization;
import com.mattrixwv.raidbuilder.annotation.RaidGroupAuthorization; import com.mattrixwv.raidbuilder.annotation.RaidGroupAuthorization;
import com.mattrixwv.raidbuilder.entity.Account; import com.mattrixwv.raidbuilder.entity.Account;
@@ -29,6 +26,9 @@ import com.mattrixwv.raidbuilder.util.DatabaseTypeUtil.RaidGroupPermissionType;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.ObjectMapper;
import tools.jackson.databind.node.ArrayNode;
import tools.jackson.databind.node.ObjectNode;
@Slf4j @Slf4j
@@ -111,7 +111,7 @@ public class AccountController{
returnNode.set("errors", arrayNode); returnNode.set("errors", arrayNode);
} }
else{ else{
RaidGroupPermissionType permission = RaidGroupPermissionType.valueOf(permissionNode.get("permission").asText()); RaidGroupPermissionType permission = RaidGroupPermissionType.valueOf(permissionNode.get("permission").asString());
existingPermission.setPermission(permission); existingPermission.setPermission(permission);
rgpService.createRaidGroupPermission(existingPermission); rgpService.createRaidGroupPermission(existingPermission);
@@ -258,7 +258,7 @@ public class AccountController{
account.setRefreshTokenExpiration(null); account.setRefreshTokenExpiration(null);
account.setForceReset(false); account.setForceReset(false);
accountService.updateAccount(account); accountService.updateAccount(account);
accountService.updatePassword(accountId, passwordNode.get("password").asText()); accountService.updatePassword(accountId, passwordNode.get("password").asString());
returnNode.put("status", "success"); returnNode.put("status", "success");
} }

4
src/main/java/com/mattrixwv/raidbuilder/controller/AccountTutorialController.java
View File

@@ -8,8 +8,6 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.raidbuilder.annotation.AccountAuthorization; import com.mattrixwv.raidbuilder.annotation.AccountAuthorization;
import com.mattrixwv.raidbuilder.entity.Account; import com.mattrixwv.raidbuilder.entity.Account;
import com.mattrixwv.raidbuilder.entity.AccountTutorialStatus; import com.mattrixwv.raidbuilder.entity.AccountTutorialStatus;
@@ -19,6 +17,8 @@ import com.mattrixwv.raidbuilder.util.DatabaseTypeUtil.AccountPermissionType;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.ObjectMapper;
import tools.jackson.databind.node.ObjectNode;

12
src/main/java/com/mattrixwv/raidbuilder/controller/AuthenticationController.java
View File

@@ -18,9 +18,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.raidbuilder.annotation.AccountAuthorization; import com.mattrixwv.raidbuilder.annotation.AccountAuthorization;
import com.mattrixwv.raidbuilder.config.TokenService; import com.mattrixwv.raidbuilder.config.TokenService;
import com.mattrixwv.raidbuilder.entity.Account; import com.mattrixwv.raidbuilder.entity.Account;
@@ -35,6 +32,9 @@ import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.ObjectMapper;
import tools.jackson.databind.node.ArrayNode;
import tools.jackson.databind.node.ObjectNode;
@Slf4j @Slf4j
@@ -213,7 +213,7 @@ public class AuthenticationController{
//Verify the account exists //Verify the account exists
Account existingAccount = accountService.getByRefreshToken(forgotToken); Account existingAccount = accountService.getByRefreshToken(forgotToken);
if(existingAccount != null){ if(existingAccount != null){
String newPassword = passwordNode.get("password").asText(); String newPassword = passwordNode.get("password").asString();
if(newPassword.trim().length() <= 0){ if(newPassword.trim().length() <= 0){
throw new IllegalArgumentException("Invalid password"); throw new IllegalArgumentException("Invalid password");
} }
@@ -246,8 +246,8 @@ public class AuthenticationController{
throw new IllegalArgumentException("Invalid request"); throw new IllegalArgumentException("Invalid request");
} }
String currentPassword = requestNode.get("currentPassword").asText(); String currentPassword = requestNode.get("currentPassword").asString();
String newPassword = requestNode.get("newPassword").asText(); String newPassword = requestNode.get("newPassword").asString();
if(newPassword.trim().length() <= 0){ if(newPassword.trim().length() <= 0){
throw new IllegalArgumentException("Invalid password"); throw new IllegalArgumentException("Invalid password");
} }

6
src/main/java/com/mattrixwv/raidbuilder/controller/CalendarController.java
View File

@@ -13,9 +13,6 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.raidbuilder.annotation.AccountAuthorization; import com.mattrixwv.raidbuilder.annotation.AccountAuthorization;
import com.mattrixwv.raidbuilder.annotation.GameAuthorization; import com.mattrixwv.raidbuilder.annotation.GameAuthorization;
import com.mattrixwv.raidbuilder.annotation.RaidGroupAuthorization; import com.mattrixwv.raidbuilder.annotation.RaidGroupAuthorization;
@@ -32,6 +29,9 @@ import com.mattrixwv.raidbuilder.util.validation.CalendarEventValidationUtil;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.ObjectMapper;
import tools.jackson.databind.node.ArrayNode;
import tools.jackson.databind.node.ObjectNode;
@Slf4j @Slf4j

11
src/main/java/com/mattrixwv/raidbuilder/controller/ClassGroupController.java
View File

@@ -15,10 +15,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.raidbuilder.annotation.AccountAuthorization; import com.mattrixwv.raidbuilder.annotation.AccountAuthorization;
import com.mattrixwv.raidbuilder.annotation.RaidGroupAuthorization; import com.mattrixwv.raidbuilder.annotation.RaidGroupAuthorization;
import com.mattrixwv.raidbuilder.entity.ClassGroup; import com.mattrixwv.raidbuilder.entity.ClassGroup;
@@ -30,6 +26,9 @@ import com.mattrixwv.raidbuilder.util.validation.ClassGroupValidationUtil;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.ObjectMapper;
import tools.jackson.databind.node.ArrayNode;
import tools.jackson.databind.node.ObjectNode;
@Slf4j @Slf4j
@@ -107,7 +106,7 @@ public class ClassGroupController{
@PostMapping @PostMapping
@AccountAuthorization(permissions = {AccountPermissionType.ADMIN, AccountPermissionType.USER}) @AccountAuthorization(permissions = {AccountPermissionType.ADMIN, AccountPermissionType.USER})
@RaidGroupAuthorization(permissions = {RaidGroupPermissionType.ADMIN, RaidGroupPermissionType.LEADER}) @RaidGroupAuthorization(permissions = {RaidGroupPermissionType.ADMIN, RaidGroupPermissionType.LEADER})
public ObjectNode createClassGroup(@PathVariable("raidGroupId") UUID raidGroupId, @RequestBody ObjectNode bodyNode) throws JsonProcessingException{ public ObjectNode createClassGroup(@PathVariable("raidGroupId") UUID raidGroupId, @RequestBody ObjectNode bodyNode){
log.info("Creating class group for raid group {}", raidGroupId); log.info("Creating class group for raid group {}", raidGroupId);
@@ -145,7 +144,7 @@ public class ClassGroupController{
@PutMapping("/{classGroupId}") @PutMapping("/{classGroupId}")
@AccountAuthorization(permissions = {AccountPermissionType.ADMIN, AccountPermissionType.USER}) @AccountAuthorization(permissions = {AccountPermissionType.ADMIN, AccountPermissionType.USER})
@RaidGroupAuthorization(permissions = {RaidGroupPermissionType.ADMIN, RaidGroupPermissionType.LEADER}) @RaidGroupAuthorization(permissions = {RaidGroupPermissionType.ADMIN, RaidGroupPermissionType.LEADER})
public ObjectNode updateClassGroup(@PathVariable("raidGroupId") UUID raidGroupId, @PathVariable("classGroupId") UUID classGroupId, @RequestBody ObjectNode bodyNode) throws JsonProcessingException{ public ObjectNode updateClassGroup(@PathVariable("raidGroupId") UUID raidGroupId, @PathVariable("classGroupId") UUID classGroupId, @RequestBody ObjectNode bodyNode){
log.info("Updating class group {} for raid group {}", classGroupId, raidGroupId); log.info("Updating class group {} for raid group {}", classGroupId, raidGroupId);

6
src/main/java/com/mattrixwv/raidbuilder/controller/ExceptionController.java
View File

@@ -8,12 +8,12 @@ import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.bind.annotation.RestControllerAdvice;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.raidbuilder.exception.MissingAuthorizationException; import com.mattrixwv.raidbuilder.exception.MissingAuthorizationException;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.ObjectMapper;
import tools.jackson.databind.node.ArrayNode;
import tools.jackson.databind.node.ObjectNode;
@Slf4j @Slf4j

6
src/main/java/com/mattrixwv/raidbuilder/controller/GameClassController.java
View File

@@ -14,9 +14,6 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.raidbuilder.annotation.AccountAuthorization; import com.mattrixwv.raidbuilder.annotation.AccountAuthorization;
import com.mattrixwv.raidbuilder.annotation.GameAuthorization; import com.mattrixwv.raidbuilder.annotation.GameAuthorization;
import com.mattrixwv.raidbuilder.entity.GameClass; import com.mattrixwv.raidbuilder.entity.GameClass;
@@ -27,6 +24,9 @@ import com.mattrixwv.raidbuilder.util.validation.GameClassValidationUtil;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.ObjectMapper;
import tools.jackson.databind.node.ArrayNode;
import tools.jackson.databind.node.ObjectNode;
@Slf4j @Slf4j

6
src/main/java/com/mattrixwv/raidbuilder/controller/GameController.java
View File

@@ -14,9 +14,6 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.raidbuilder.annotation.AccountAuthorization; import com.mattrixwv.raidbuilder.annotation.AccountAuthorization;
import com.mattrixwv.raidbuilder.annotation.GameAuthorization; import com.mattrixwv.raidbuilder.annotation.GameAuthorization;
import com.mattrixwv.raidbuilder.entity.Game; import com.mattrixwv.raidbuilder.entity.Game;
@@ -27,6 +24,9 @@ import com.mattrixwv.raidbuilder.util.validation.GameValidationUtil;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.ObjectMapper;
import tools.jackson.databind.node.ArrayNode;
import tools.jackson.databind.node.ObjectNode;
@Slf4j @Slf4j

6
src/main/java/com/mattrixwv/raidbuilder/controller/PersonCharacterController.java
View File

@@ -14,9 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.raidbuilder.annotation.AccountAuthorization; import com.mattrixwv.raidbuilder.annotation.AccountAuthorization;
import com.mattrixwv.raidbuilder.annotation.RaidGroupAuthorization; import com.mattrixwv.raidbuilder.annotation.RaidGroupAuthorization;
import com.mattrixwv.raidbuilder.entity.PersonCharacter; import com.mattrixwv.raidbuilder.entity.PersonCharacter;
@@ -27,6 +24,9 @@ import com.mattrixwv.raidbuilder.util.validation.PersonCharacterValidationUtil;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.ObjectMapper;
import tools.jackson.databind.node.ArrayNode;
import tools.jackson.databind.node.ObjectNode;
@Slf4j @Slf4j

6
src/main/java/com/mattrixwv/raidbuilder/controller/PersonController.java
View File

@@ -14,9 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.raidbuilder.annotation.AccountAuthorization; import com.mattrixwv.raidbuilder.annotation.AccountAuthorization;
import com.mattrixwv.raidbuilder.annotation.RaidGroupAuthorization; import com.mattrixwv.raidbuilder.annotation.RaidGroupAuthorization;
import com.mattrixwv.raidbuilder.entity.Person; import com.mattrixwv.raidbuilder.entity.Person;
@@ -27,6 +24,9 @@ import com.mattrixwv.raidbuilder.util.validation.PersonValidationUtil;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.ObjectMapper;
import tools.jackson.databind.node.ArrayNode;
import tools.jackson.databind.node.ObjectNode;
@Slf4j @Slf4j

6
src/main/java/com/mattrixwv/raidbuilder/controller/RaidGroupController.java
View File

@@ -14,9 +14,6 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.raidbuilder.annotation.AccountAuthorization; import com.mattrixwv.raidbuilder.annotation.AccountAuthorization;
import com.mattrixwv.raidbuilder.annotation.RaidGroupAuthorization; import com.mattrixwv.raidbuilder.annotation.RaidGroupAuthorization;
import com.mattrixwv.raidbuilder.entity.PersonCharacter; import com.mattrixwv.raidbuilder.entity.PersonCharacter;
@@ -29,6 +26,9 @@ import com.mattrixwv.raidbuilder.util.validation.RaidGroupValidationUtil;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.ObjectMapper;
import tools.jackson.databind.node.ArrayNode;
import tools.jackson.databind.node.ObjectNode;
@Slf4j @Slf4j

8
src/main/java/com/mattrixwv/raidbuilder/controller/RaidGroupRequestController.java
View File

@@ -15,9 +15,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.raidbuilder.annotation.AccountAuthorization; import com.mattrixwv.raidbuilder.annotation.AccountAuthorization;
import com.mattrixwv.raidbuilder.annotation.RaidGroupAuthorization; import com.mattrixwv.raidbuilder.annotation.RaidGroupAuthorization;
import com.mattrixwv.raidbuilder.entity.Account; import com.mattrixwv.raidbuilder.entity.Account;
@@ -30,6 +27,9 @@ import com.mattrixwv.raidbuilder.util.validation.RaidGroupRequestValidationUtil;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.ObjectMapper;
import tools.jackson.databind.node.ArrayNode;
import tools.jackson.databind.node.ObjectNode;
@Slf4j @Slf4j
@@ -83,7 +83,7 @@ public class RaidGroupRequestController{
log.info("Resolving raid group request for raid group id: {}", raidGroupId); log.info("Resolving raid group request for raid group id: {}", raidGroupId);
String resolution = bodyNode.get("resolution").asText(); String resolution = bodyNode.get("resolution").asString();
if(resolution.equals("denied")){ if(resolution.equals("denied")){
rgrService.deleteRaidGroupRequest(raidGroupRequestId); rgrService.deleteRaidGroupRequest(raidGroupRequestId);
} }

6
src/main/java/com/mattrixwv/raidbuilder/controller/RaidInstanceController.java
View File

@@ -15,9 +15,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.raidbuilder.annotation.AccountAuthorization; import com.mattrixwv.raidbuilder.annotation.AccountAuthorization;
import com.mattrixwv.raidbuilder.annotation.RaidGroupAuthorization; import com.mattrixwv.raidbuilder.annotation.RaidGroupAuthorization;
import com.mattrixwv.raidbuilder.entity.RaidInstance; import com.mattrixwv.raidbuilder.entity.RaidInstance;
@@ -28,6 +25,9 @@ import com.mattrixwv.raidbuilder.util.validation.RaidInstanceValidationUtil;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.ObjectMapper;
import tools.jackson.databind.node.ArrayNode;
import tools.jackson.databind.node.ObjectNode;
@Slf4j @Slf4j

4
src/main/java/com/mattrixwv/raidbuilder/controller/RaidInstancePersonCharacterXrefController.java
View File

@@ -11,8 +11,6 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.raidbuilder.annotation.AccountAuthorization; import com.mattrixwv.raidbuilder.annotation.AccountAuthorization;
import com.mattrixwv.raidbuilder.annotation.RaidGroupAuthorization; import com.mattrixwv.raidbuilder.annotation.RaidGroupAuthorization;
import com.mattrixwv.raidbuilder.entity.RaidInstancePersonCharacterXref; import com.mattrixwv.raidbuilder.entity.RaidInstancePersonCharacterXref;
@@ -22,6 +20,8 @@ import com.mattrixwv.raidbuilder.util.DatabaseTypeUtil.RaidGroupPermissionType;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.ObjectMapper;
import tools.jackson.databind.node.ObjectNode;
@Slf4j @Slf4j

6
src/main/java/com/mattrixwv/raidbuilder/controller/RaidLayoutController.java
View File

@@ -14,9 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mattrixwv.raidbuilder.annotation.AccountAuthorization; import com.mattrixwv.raidbuilder.annotation.AccountAuthorization;
import com.mattrixwv.raidbuilder.annotation.RaidGroupAuthorization; import com.mattrixwv.raidbuilder.annotation.RaidGroupAuthorization;
import com.mattrixwv.raidbuilder.entity.RaidLayout; import com.mattrixwv.raidbuilder.entity.RaidLayout;
@@ -28,6 +25,9 @@ import com.mattrixwv.raidbuilder.util.validation.RaidLayoutValidationUtil;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import tools.jackson.databind.ObjectMapper;
import tools.jackson.databind.node.ArrayNode;
import tools.jackson.databind.node.ObjectNode;

3
src/main/java/com/mattrixwv/raidbuilder/util/UserPrincipal.java
View File

@@ -4,7 +4,6 @@ package com.mattrixwv.raidbuilder.util;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import org.springframework.lang.NonNull;
import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetails;
@@ -17,7 +16,7 @@ public class UserPrincipal implements UserDetails{
private List<AccountPermission> accountPermissions; private List<AccountPermission> accountPermissions;
public UserPrincipal(@NonNull Account account, @NonNull List<AccountPermission> accountPermissions){ public UserPrincipal(Account account, List<AccountPermission> accountPermissions){
this.account = account; this.account = account;
this.accountPermissions = accountPermissions; this.accountPermissions = accountPermissions;
} }