Skip to content

Commit e746e9a

Browse files
authored
Fix UUID validation constraints in DTOs (#826)
* use dataset instead of distribution in resource.Detail_PUT.res200 test to reproduce issue #752 (the dataset already has a child distribution, which is sufficient to trigger the NotBlank error) * consistent usage of @NotNull instead of @notblank for all UUID fields in DTOs
1 parent 8f2c435 commit e746e9a

6 files changed

Lines changed: 8 additions & 6 deletions

File tree

src/main/java/org/fairdatapoint/api/dto/resource/ResourceDefinitionChildDTO.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
import jakarta.validation.Valid;
2626
import jakarta.validation.constraints.NotBlank;
27+
import jakarta.validation.constraints.NotNull;
2728
import lombok.AllArgsConstructor;
2829
import lombok.Builder;
2930
import lombok.Data;
@@ -38,7 +39,7 @@
3839
@Builder
3940
public class ResourceDefinitionChildDTO {
4041

41-
@NotBlank
42+
@NotNull
4243
private UUID resourceDefinitionUuid;
4344

4445
@NotBlank

src/main/java/org/fairdatapoint/api/dto/resource/ResourceDefinitionDTO.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
@Builder
3838
public class ResourceDefinitionDTO {
3939

40-
@NotBlank
40+
@NotNull
4141
private UUID uuid;
4242

4343
@NotBlank

src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaDTO.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
public class MetadataSchemaDTO {
3939

4040
@NotNull
41-
@NotBlank
4241
private UUID uuid;
4342

4443
@NotNull

src/main/java/org/fairdatapoint/api/dto/schema/MetadataSchemaDraftDTO.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
public class MetadataSchemaDraftDTO {
3939

4040
@NotNull
41-
@NotBlank
4241
private UUID uuid;
4342

4443
@NotNull

src/main/java/org/fairdatapoint/api/dto/search/SearchSavedQueryDTO.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
@Builder
4141
public class SearchSavedQueryDTO {
4242

43-
@NotBlank
43+
@NotNull
4444
private UUID uuid;
4545

4646
@NotBlank

src/test/java/org/fairdatapoint/acceptance/resource/Detail_PUT.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
import org.fairdatapoint.WebIntegrationTest;
2626
import org.fairdatapoint.api.dto.resource.ResourceDefinitionChangeDTO;
27+
import org.fairdatapoint.api.dto.resource.ResourceDefinitionChildDTO;
2728
import org.fairdatapoint.api.dto.resource.ResourceDefinitionDTO;
2829
import org.fairdatapoint.database.db.repository.ResourceDefinitionRepository;
2930
import org.fairdatapoint.entity.resource.ResourceDefinition;
@@ -36,6 +37,7 @@
3637
import org.springframework.http.*;
3738

3839
import java.net.URI;
40+
import java.util.List;
3941
import java.util.UUID;
4042

4143
import static java.lang.String.format;
@@ -69,7 +71,8 @@ private ResourceDefinitionChangeDTO reqDto(ResourceDefinition rd) {
6971
@DisplayName("HTTP 200")
7072
public void res200() {
7173
// GIVEN: Prepare data
72-
ResourceDefinition resourceDefinition = resourceDefinitionRepository.findByUuid(KnownUUIDs.RD_DISTRIBUTION_UUID).get();
74+
// (use dataset because it has children, which reproduces #752)
75+
ResourceDefinition resourceDefinition = resourceDefinitionRepository.findByUuid(KnownUUIDs.RD_DATASET_UUID).get();
7376
ResourceDefinitionChangeDTO reqDto = reqDto(resourceDefinition);
7477

7578
// AND: Prepare request

0 commit comments

Comments
 (0)