diff --git a/pom.xml b/pom.xml index 04de4df..d2ed542 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.4 + 4.0.1 @@ -92,31 +92,31 @@ org.postgresql postgresql - 42.7.7 + 42.7.8 io.hypersistence hypersistence-utils-hibernate-63 - 3.10.3 + 3.14.1 - com.fasterxml.jackson.datatype + tools.jackson.datatype jackson-datatype-jsr310 - 2.19.2 + 3.0.0-rc2 - com.fasterxml.jackson.datatype + tools.jackson.datatype jackson-datatype-hibernate6 - 2.19.2 + 3.0.3 org.projectlombok lombok - 1.18.38 + 1.18.42 provided @@ -133,7 +133,7 @@ org.apache.logging.log4j log4j-layout-template-json - 2.24.3 + 2.25.3 com.lmax @@ -145,12 +145,12 @@ org.eclipse.angus angus-mail - 2.0.4 + 2.0.5 commons-codec commons-codec - 1.19.0 + 1.20.0 @@ -164,7 +164,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.6.1 + 3.6.2 enforce-maven @@ -189,15 +189,16 @@ org.apache.maven.plugins maven-resources-plugin - 3.3.1 + 3.4.0 org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 -Xlint:all + -proc:full true true @@ -206,7 +207,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.3 + 3.5.4 ${skip.unit.tests} @@ -220,7 +221,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.5.0 org.apache.maven.plugins @@ -235,7 +236,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.5.3 + 3.5.4 @@ -263,7 +264,7 @@ org.codehaus.mojo versions-maven-plugin - 2.18.0 + 2.20.1 file://${session.executionRootDirectory}/version-rules.xml @@ -272,12 +273,12 @@ org.sonarsource.scanner.maven sonar-maven-plugin - 5.1.0.4751 + 5.5.0.6356 org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 **/CipherStreamAPI* @@ -303,7 +304,7 @@ org.owasp dependency-check-maven - 12.1.3 + 12.1.9 none diff --git a/src/main/java/com/mattrixwv/raidbuilder/config/TokenService.java b/src/main/java/com/mattrixwv/raidbuilder/config/TokenService.java index 23058c1..1ef5f00 100644 --- a/src/main/java/com/mattrixwv/raidbuilder/config/TokenService.java +++ b/src/main/java/com/mattrixwv/raidbuilder/config/TokenService.java @@ -13,7 +13,6 @@ import org.springframework.security.oauth2.jwt.JwtClaimsSet; import org.springframework.security.oauth2.jwt.JwtEncoder; import org.springframework.security.oauth2.jwt.JwtEncoderParameters; -import com.fasterxml.jackson.databind.ObjectMapper; import com.mattrixwv.raidbuilder.entity.Account; import com.mattrixwv.raidbuilder.entity.AccountPermission; import com.mattrixwv.raidbuilder.entity.GamePermission; @@ -26,6 +25,7 @@ import com.mattrixwv.raidbuilder.service.RaidGroupRequestService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import tools.jackson.databind.ObjectMapper; @Slf4j diff --git a/src/main/java/com/mattrixwv/raidbuilder/config/WebConfig.java b/src/main/java/com/mattrixwv/raidbuilder/config/WebConfig.java index 72ec2c2..7e59dab 100644 --- a/src/main/java/com/mattrixwv/raidbuilder/config/WebConfig.java +++ b/src/main/java/com/mattrixwv/raidbuilder/config/WebConfig.java @@ -4,17 +4,15 @@ package com.mattrixwv.raidbuilder.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; 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.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 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 @@ -25,7 +23,7 @@ public class WebConfig implements WebMvcConfigurer{ @Override - public void addCorsMappings(@NonNull CorsRegistry registry){ + public void addCorsMappings(CorsRegistry registry){ log.debug("Adding CORS mappings: {}", allowedOrigins); registry.addMapping("/**") @@ -37,8 +35,6 @@ public class WebConfig implements WebMvcConfigurer{ @Bean public ObjectMapper objectMapper(){ - ObjectMapper mapper = new ObjectMapper(); - log.debug("Starting mapping configuration"); //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.REQUIRE_EXPLICIT_LAZY_LOADING_MARKER, true); hibernate6Module.configure(Feature.WRITE_MISSING_ENTITIES_AS_NULL, false); - mapper.registerModule(hibernate6Module); - - //Print dates as strings - mapper.registerModule(new JavaTimeModule()); - mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false); - mapper.findAndRegisterModules(); + ObjectMapper mapper = JsonMapper.builder() + .addModule(hibernate6Module) + .addModule(new JavaTimeModule()) + .findAndAddModules() + .build(); log.debug("Completed mapping configuration"); diff --git a/src/main/java/com/mattrixwv/raidbuilder/config/WebFilter.java b/src/main/java/com/mattrixwv/raidbuilder/config/WebFilter.java index defbce7..9830b7d 100644 --- a/src/main/java/com/mattrixwv/raidbuilder/config/WebFilter.java +++ b/src/main/java/com/mattrixwv/raidbuilder/config/WebFilter.java @@ -6,7 +6,6 @@ import java.util.StringJoiner; import java.util.UUID; import org.slf4j.MDC; -import org.springframework.lang.NonNull; import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; @@ -21,7 +20,7 @@ import lombok.extern.slf4j.Slf4j; @Component public class WebFilter extends OncePerRequestFilter{ @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")){ setupMDC(request); } diff --git a/src/main/java/com/mattrixwv/raidbuilder/controller/AccountController.java b/src/main/java/com/mattrixwv/raidbuilder/controller/AccountController.java index 18dd6f6..8d60ba6 100644 --- a/src/main/java/com/mattrixwv/raidbuilder/controller/AccountController.java +++ b/src/main/java/com/mattrixwv/raidbuilder/controller/AccountController.java @@ -15,9 +15,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; 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.RaidGroupAuthorization; import com.mattrixwv.raidbuilder.entity.Account; @@ -29,6 +26,9 @@ import com.mattrixwv.raidbuilder.util.DatabaseTypeUtil.RaidGroupPermissionType; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.node.ArrayNode; +import tools.jackson.databind.node.ObjectNode; @Slf4j @@ -111,7 +111,7 @@ public class AccountController{ returnNode.set("errors", arrayNode); } else{ - RaidGroupPermissionType permission = RaidGroupPermissionType.valueOf(permissionNode.get("permission").asText()); + RaidGroupPermissionType permission = RaidGroupPermissionType.valueOf(permissionNode.get("permission").asString()); existingPermission.setPermission(permission); rgpService.createRaidGroupPermission(existingPermission); @@ -258,7 +258,7 @@ public class AccountController{ account.setRefreshTokenExpiration(null); account.setForceReset(false); accountService.updateAccount(account); - accountService.updatePassword(accountId, passwordNode.get("password").asText()); + accountService.updatePassword(accountId, passwordNode.get("password").asString()); returnNode.put("status", "success"); } diff --git a/src/main/java/com/mattrixwv/raidbuilder/controller/AccountTutorialController.java b/src/main/java/com/mattrixwv/raidbuilder/controller/AccountTutorialController.java index 426c45d..d5477ff 100644 --- a/src/main/java/com/mattrixwv/raidbuilder/controller/AccountTutorialController.java +++ b/src/main/java/com/mattrixwv/raidbuilder/controller/AccountTutorialController.java @@ -8,8 +8,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; 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.entity.Account; import com.mattrixwv.raidbuilder.entity.AccountTutorialStatus; @@ -19,6 +17,8 @@ import com.mattrixwv.raidbuilder.util.DatabaseTypeUtil.AccountPermissionType; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.node.ObjectNode; diff --git a/src/main/java/com/mattrixwv/raidbuilder/controller/AuthenticationController.java b/src/main/java/com/mattrixwv/raidbuilder/controller/AuthenticationController.java index c538b09..68dcb65 100644 --- a/src/main/java/com/mattrixwv/raidbuilder/controller/AuthenticationController.java +++ b/src/main/java/com/mattrixwv/raidbuilder/controller/AuthenticationController.java @@ -18,9 +18,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; 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.config.TokenService; import com.mattrixwv.raidbuilder.entity.Account; @@ -35,6 +32,9 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.node.ArrayNode; +import tools.jackson.databind.node.ObjectNode; @Slf4j @@ -213,7 +213,7 @@ public class AuthenticationController{ //Verify the account exists Account existingAccount = accountService.getByRefreshToken(forgotToken); if(existingAccount != null){ - String newPassword = passwordNode.get("password").asText(); + String newPassword = passwordNode.get("password").asString(); if(newPassword.trim().length() <= 0){ throw new IllegalArgumentException("Invalid password"); } @@ -246,8 +246,8 @@ public class AuthenticationController{ throw new IllegalArgumentException("Invalid request"); } - String currentPassword = requestNode.get("currentPassword").asText(); - String newPassword = requestNode.get("newPassword").asText(); + String currentPassword = requestNode.get("currentPassword").asString(); + String newPassword = requestNode.get("newPassword").asString(); if(newPassword.trim().length() <= 0){ throw new IllegalArgumentException("Invalid password"); } diff --git a/src/main/java/com/mattrixwv/raidbuilder/controller/CalendarController.java b/src/main/java/com/mattrixwv/raidbuilder/controller/CalendarController.java index f51fab6..51e7294 100644 --- a/src/main/java/com/mattrixwv/raidbuilder/controller/CalendarController.java +++ b/src/main/java/com/mattrixwv/raidbuilder/controller/CalendarController.java @@ -13,9 +13,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; 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.GameAuthorization; import com.mattrixwv.raidbuilder.annotation.RaidGroupAuthorization; @@ -32,6 +29,9 @@ import com.mattrixwv.raidbuilder.util.validation.CalendarEventValidationUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.node.ArrayNode; +import tools.jackson.databind.node.ObjectNode; @Slf4j diff --git a/src/main/java/com/mattrixwv/raidbuilder/controller/ClassGroupController.java b/src/main/java/com/mattrixwv/raidbuilder/controller/ClassGroupController.java index d169335..c1584ed 100644 --- a/src/main/java/com/mattrixwv/raidbuilder/controller/ClassGroupController.java +++ b/src/main/java/com/mattrixwv/raidbuilder/controller/ClassGroupController.java @@ -15,10 +15,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; 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.RaidGroupAuthorization; import com.mattrixwv.raidbuilder.entity.ClassGroup; @@ -30,6 +26,9 @@ import com.mattrixwv.raidbuilder.util.validation.ClassGroupValidationUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.node.ArrayNode; +import tools.jackson.databind.node.ObjectNode; @Slf4j @@ -107,7 +106,7 @@ public class ClassGroupController{ @PostMapping @AccountAuthorization(permissions = {AccountPermissionType.ADMIN, AccountPermissionType.USER}) @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); @@ -145,7 +144,7 @@ public class ClassGroupController{ @PutMapping("/{classGroupId}") @AccountAuthorization(permissions = {AccountPermissionType.ADMIN, AccountPermissionType.USER}) @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); diff --git a/src/main/java/com/mattrixwv/raidbuilder/controller/ExceptionController.java b/src/main/java/com/mattrixwv/raidbuilder/controller/ExceptionController.java index b109321..2d1b34d 100644 --- a/src/main/java/com/mattrixwv/raidbuilder/controller/ExceptionController.java +++ b/src/main/java/com/mattrixwv/raidbuilder/controller/ExceptionController.java @@ -8,12 +8,12 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseStatus; 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 lombok.extern.slf4j.Slf4j; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.node.ArrayNode; +import tools.jackson.databind.node.ObjectNode; @Slf4j diff --git a/src/main/java/com/mattrixwv/raidbuilder/controller/GameClassController.java b/src/main/java/com/mattrixwv/raidbuilder/controller/GameClassController.java index 4344628..01b18c2 100644 --- a/src/main/java/com/mattrixwv/raidbuilder/controller/GameClassController.java +++ b/src/main/java/com/mattrixwv/raidbuilder/controller/GameClassController.java @@ -14,9 +14,6 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; 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.GameAuthorization; import com.mattrixwv.raidbuilder.entity.GameClass; @@ -27,6 +24,9 @@ import com.mattrixwv.raidbuilder.util.validation.GameClassValidationUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.node.ArrayNode; +import tools.jackson.databind.node.ObjectNode; @Slf4j diff --git a/src/main/java/com/mattrixwv/raidbuilder/controller/GameController.java b/src/main/java/com/mattrixwv/raidbuilder/controller/GameController.java index 397e653..d49358f 100644 --- a/src/main/java/com/mattrixwv/raidbuilder/controller/GameController.java +++ b/src/main/java/com/mattrixwv/raidbuilder/controller/GameController.java @@ -14,9 +14,6 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; 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.GameAuthorization; import com.mattrixwv.raidbuilder.entity.Game; @@ -27,6 +24,9 @@ import com.mattrixwv.raidbuilder.util.validation.GameValidationUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.node.ArrayNode; +import tools.jackson.databind.node.ObjectNode; @Slf4j diff --git a/src/main/java/com/mattrixwv/raidbuilder/controller/PersonCharacterController.java b/src/main/java/com/mattrixwv/raidbuilder/controller/PersonCharacterController.java index 4e0080a..25f735c 100644 --- a/src/main/java/com/mattrixwv/raidbuilder/controller/PersonCharacterController.java +++ b/src/main/java/com/mattrixwv/raidbuilder/controller/PersonCharacterController.java @@ -14,9 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; 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.RaidGroupAuthorization; import com.mattrixwv.raidbuilder.entity.PersonCharacter; @@ -27,6 +24,9 @@ import com.mattrixwv.raidbuilder.util.validation.PersonCharacterValidationUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.node.ArrayNode; +import tools.jackson.databind.node.ObjectNode; @Slf4j diff --git a/src/main/java/com/mattrixwv/raidbuilder/controller/PersonController.java b/src/main/java/com/mattrixwv/raidbuilder/controller/PersonController.java index 71fd8f3..5b82670 100644 --- a/src/main/java/com/mattrixwv/raidbuilder/controller/PersonController.java +++ b/src/main/java/com/mattrixwv/raidbuilder/controller/PersonController.java @@ -14,9 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; 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.RaidGroupAuthorization; import com.mattrixwv.raidbuilder.entity.Person; @@ -27,6 +24,9 @@ import com.mattrixwv.raidbuilder.util.validation.PersonValidationUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.node.ArrayNode; +import tools.jackson.databind.node.ObjectNode; @Slf4j diff --git a/src/main/java/com/mattrixwv/raidbuilder/controller/RaidGroupController.java b/src/main/java/com/mattrixwv/raidbuilder/controller/RaidGroupController.java index 38eb864..0c71981 100644 --- a/src/main/java/com/mattrixwv/raidbuilder/controller/RaidGroupController.java +++ b/src/main/java/com/mattrixwv/raidbuilder/controller/RaidGroupController.java @@ -14,9 +14,6 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; 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.RaidGroupAuthorization; import com.mattrixwv.raidbuilder.entity.PersonCharacter; @@ -29,6 +26,9 @@ import com.mattrixwv.raidbuilder.util.validation.RaidGroupValidationUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.node.ArrayNode; +import tools.jackson.databind.node.ObjectNode; @Slf4j diff --git a/src/main/java/com/mattrixwv/raidbuilder/controller/RaidGroupRequestController.java b/src/main/java/com/mattrixwv/raidbuilder/controller/RaidGroupRequestController.java index 644e001..916fd06 100644 --- a/src/main/java/com/mattrixwv/raidbuilder/controller/RaidGroupRequestController.java +++ b/src/main/java/com/mattrixwv/raidbuilder/controller/RaidGroupRequestController.java @@ -15,9 +15,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; 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.RaidGroupAuthorization; import com.mattrixwv.raidbuilder.entity.Account; @@ -30,6 +27,9 @@ import com.mattrixwv.raidbuilder.util.validation.RaidGroupRequestValidationUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.node.ArrayNode; +import tools.jackson.databind.node.ObjectNode; @Slf4j @@ -83,7 +83,7 @@ public class RaidGroupRequestController{ 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")){ rgrService.deleteRaidGroupRequest(raidGroupRequestId); } diff --git a/src/main/java/com/mattrixwv/raidbuilder/controller/RaidInstanceController.java b/src/main/java/com/mattrixwv/raidbuilder/controller/RaidInstanceController.java index 25f4441..bc5f707 100644 --- a/src/main/java/com/mattrixwv/raidbuilder/controller/RaidInstanceController.java +++ b/src/main/java/com/mattrixwv/raidbuilder/controller/RaidInstanceController.java @@ -15,9 +15,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; 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.RaidGroupAuthorization; import com.mattrixwv.raidbuilder.entity.RaidInstance; @@ -28,6 +25,9 @@ import com.mattrixwv.raidbuilder.util.validation.RaidInstanceValidationUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.node.ArrayNode; +import tools.jackson.databind.node.ObjectNode; @Slf4j diff --git a/src/main/java/com/mattrixwv/raidbuilder/controller/RaidInstancePersonCharacterXrefController.java b/src/main/java/com/mattrixwv/raidbuilder/controller/RaidInstancePersonCharacterXrefController.java index 0d6c3fc..f1a07af 100644 --- a/src/main/java/com/mattrixwv/raidbuilder/controller/RaidInstancePersonCharacterXrefController.java +++ b/src/main/java/com/mattrixwv/raidbuilder/controller/RaidInstancePersonCharacterXrefController.java @@ -11,8 +11,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; 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.RaidGroupAuthorization; import com.mattrixwv.raidbuilder.entity.RaidInstancePersonCharacterXref; @@ -22,6 +20,8 @@ import com.mattrixwv.raidbuilder.util.DatabaseTypeUtil.RaidGroupPermissionType; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.node.ObjectNode; @Slf4j diff --git a/src/main/java/com/mattrixwv/raidbuilder/controller/RaidLayoutController.java b/src/main/java/com/mattrixwv/raidbuilder/controller/RaidLayoutController.java index 52abf06..269c5bd 100644 --- a/src/main/java/com/mattrixwv/raidbuilder/controller/RaidLayoutController.java +++ b/src/main/java/com/mattrixwv/raidbuilder/controller/RaidLayoutController.java @@ -14,9 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; 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.RaidGroupAuthorization; import com.mattrixwv.raidbuilder.entity.RaidLayout; @@ -28,6 +25,9 @@ import com.mattrixwv.raidbuilder.util.validation.RaidLayoutValidationUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.node.ArrayNode; +import tools.jackson.databind.node.ObjectNode; diff --git a/src/main/java/com/mattrixwv/raidbuilder/util/UserPrincipal.java b/src/main/java/com/mattrixwv/raidbuilder/util/UserPrincipal.java index a9ad5f7..8745e74 100644 --- a/src/main/java/com/mattrixwv/raidbuilder/util/UserPrincipal.java +++ b/src/main/java/com/mattrixwv/raidbuilder/util/UserPrincipal.java @@ -4,7 +4,6 @@ package com.mattrixwv.raidbuilder.util; import java.util.Collection; import java.util.List; -import org.springframework.lang.NonNull; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; @@ -17,7 +16,7 @@ public class UserPrincipal implements UserDetails{ private List accountPermissions; - public UserPrincipal(@NonNull Account account, @NonNull List accountPermissions){ + public UserPrincipal(Account account, List accountPermissions){ this.account = account; this.accountPermissions = accountPermissions; }