diff --git a/core/src/main/java/cz/muni/pa165/data/model/CarComponent.java b/core/src/main/java/cz/muni/pa165/data/model/CarComponent.java index 8876317a2fd58b1b694d1419fe1bd08ef05038f5..f5641c0d22840e9cd6737e45d1d9e8ca716fa621 100644 --- a/core/src/main/java/cz/muni/pa165/data/model/CarComponent.java +++ b/core/src/main/java/cz/muni/pa165/data/model/CarComponent.java @@ -4,6 +4,8 @@ import cz.muni.pa165.data.enums.ComponentTypeEnum; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; import jakarta.persistence.*; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.Positive; import java.io.Serializable; import java.util.Objects; @@ -18,9 +20,10 @@ public class CarComponent extends DomainObject implements Serializable { private ComponentTypeEnum componentType; @Nonnull + @Positive private Double weight; - @Nonnull + @NotEmpty private String information; @ManyToOne(fetch = FetchType.LAZY) diff --git a/core/src/main/java/cz/muni/pa165/data/model/Department.java b/core/src/main/java/cz/muni/pa165/data/model/Department.java index 9e2726fa344d637a442acc47e09796b968e9de85..6914da6c06f2bb4750a661299c6d267e56b97084 100644 --- a/core/src/main/java/cz/muni/pa165/data/model/Department.java +++ b/core/src/main/java/cz/muni/pa165/data/model/Department.java @@ -3,6 +3,7 @@ package cz.muni.pa165.data.model; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; import jakarta.persistence.*; +import jakarta.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.Objects; @@ -12,7 +13,7 @@ import java.util.Set; @Table(name = "department") public class Department extends DomainObject implements Serializable { - @Nonnull + @NotEmpty private String specialization; @OneToMany(fetch = FetchType.LAZY, diff --git a/core/src/main/java/cz/muni/pa165/data/model/Driver.java b/core/src/main/java/cz/muni/pa165/data/model/Driver.java index d5058f44c7d7f0c6eb2a97e6cd462f333b445799..efa7bad06caf0c425cf334b18f929505357dd926 100644 --- a/core/src/main/java/cz/muni/pa165/data/model/Driver.java +++ b/core/src/main/java/cz/muni/pa165/data/model/Driver.java @@ -4,6 +4,10 @@ import cz.muni.pa165.data.enums.CharacteristicsEnum; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; import jakarta.persistence.*; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.Past; import java.io.Serializable; import java.time.LocalDate; @@ -14,19 +18,22 @@ import java.util.Set; @Table(name = "driver") public class Driver extends DomainObject implements Serializable { - @Nonnull + @NotEmpty private String name; - @Nonnull + @NotEmpty private String surname; @Nullable + @Min(100) + @Max(300) private Integer height; @Nullable + @Past private LocalDate birthday; - @Nonnull + @NotEmpty private String nationality; @ElementCollection(targetClass = CharacteristicsEnum.class) diff --git a/core/src/main/java/cz/muni/pa165/data/model/Engineer.java b/core/src/main/java/cz/muni/pa165/data/model/Engineer.java index 050f88cb238e07177d17a20ef8cad18413f09a8d..b427f07af990638d1318a82a0f961475afd89f24 100644 --- a/core/src/main/java/cz/muni/pa165/data/model/Engineer.java +++ b/core/src/main/java/cz/muni/pa165/data/model/Engineer.java @@ -3,6 +3,7 @@ package cz.muni.pa165.data.model; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; import jakarta.persistence.*; +import jakarta.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.Objects; @@ -11,10 +12,10 @@ import java.util.Objects; @Table(name = "engineer") public class Engineer extends DomainObject implements Serializable { - @Nonnull + @NotEmpty private String name; - @Nonnull + @NotEmpty private String surname; @ManyToOne(fetch = FetchType.LAZY)