Merge branch 'main' into cpu-temp

This commit is contained in:
Antony Leons 2024-01-05 17:20:00 +00:00
commit 8bfd8a9fcf
3 changed files with 13 additions and 15 deletions

10
pom.xml
View File

@ -6,14 +6,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>dev.leons</groupId>
<artifactId>ward</artifactId>
<version>2.4.0</version>
<version>2.4.1</version>
<packaging>jar</packaging>
<!-- parent pom -->
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.2.1</version>
<version>3.1.7</version>
<relativePath></relativePath>
</parent>
@ -40,9 +40,9 @@
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>2.0.1.Final</version>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>3.0.2</version>
</dependency>
<dependency>
<groupId>com.github.oshi</groupId>

View File

@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid;
import jakarta.validation.Valid;
import java.io.IOException;
/**

View File

@ -1,15 +1,14 @@
package dev.leons.ward.dto;
import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Pattern;
import jakarta.validation.constraints.Size;
import lombok.Getter;
import lombok.Setter;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;
/**
* SetupDto is a values container for setup data
*
@ -24,8 +23,7 @@ public class SetupDto
* Server name Field
*/
@NotNull
@NotEmpty
@Size(min = 1, max = 10)
@Size(min = 0, max = 10)
private String serverName;
/**