VUU25: Fix issues caused by downgrading Java & Springboot

ScottLogic · Oct 9, 2023 · 07c179a · 07c179a
1 parent 594e454
commit 07c179a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/layout-server/pom.xml b/layout-server/pom.xml
@@ -58,6 +58,12 @@
             <artifactId>modelmapper</artifactId>
             <version>3.1.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>13.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/layout-server/src/main/java/org/finos/vuu/layoutserver/controller/LayoutController.java b/layout-server/src/main/java/org/finos/vuu/layoutserver/controller/LayoutController.java
@@ -2,9 +2,7 @@
 
 import java.util.List;
 import java.util.UUID;
-import jakarta.validation.Valid;
-import java.util.List;
-import java.util.UUID;
+import javax.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.finos.vuu.layoutserver.dto.request.LayoutRequestDTO;
 import org.finos.vuu.layoutserver.dto.response.CreateLayoutResponseDTO;
@@ -67,7 +65,8 @@ public List<MetadataResponseDTO> getMetadata() {
      */
     @ResponseStatus(HttpStatus.CREATED)
     @PostMapping
-    public CreateLayoutResponseDTO createLayout(@RequestBody @Valid LayoutRequestDTO layoutToCreate) {
+    public CreateLayoutResponseDTO createLayout(
+        @RequestBody @Valid LayoutRequestDTO layoutToCreate) {
         Layout layout = mapper.map(layoutToCreate, Layout.class);
 
         Layout createdLayout = layoutService.getLayout(layoutService.createLayout(layout));
@@ -83,7 +82,8 @@ public CreateLayoutResponseDTO createLayout(@RequestBody @Valid LayoutRequestDTO
      */
     @ResponseStatus(HttpStatus.NO_CONTENT)
     @PutMapping("/{id}")
-    public void updateLayout(@PathVariable UUID id, @RequestBody @Valid LayoutRequestDTO newLayout) {
+    public void updateLayout(@PathVariable UUID id,
+        @RequestBody @Valid LayoutRequestDTO newLayout) {
         // TODO I'm not sure about this, I think layoutService should be doing more logic, not
         //  the mapper here
         Layout layout = layoutService.getLayout(id);

diff --git a/layout-server/src/main/java/org/finos/vuu/layoutserver/dto/request/LayoutRequestDTO.java b/layout-server/src/main/java/org/finos/vuu/layoutserver/dto/request/LayoutRequestDTO.java
@@ -1,8 +1,8 @@
 package org.finos.vuu.layoutserver.dto.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Data

diff --git a/layout-server/src/main/java/org/finos/vuu/layoutserver/dto/request/MetadataRequestDTO.java b/layout-server/src/main/java/org/finos/vuu/layoutserver/dto/request/MetadataRequestDTO.java
@@ -1,7 +1,7 @@
 package org.finos.vuu.layoutserver.dto.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.util.Date;

diff --git a/layout-server/src/main/java/org/finos/vuu/layoutserver/model/Layout.java b/layout-server/src/main/java/org/finos/vuu/layoutserver/model/Layout.java
@@ -1,5 +1,6 @@
 package org.finos.vuu.layoutserver.model;
 
+import java.util.UUID;
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -8,7 +9,6 @@
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToOne;
 import lombok.Data;
-import java.util.UUID;
 
 @Data
 @Entity