Skip to content

Commit a3fa770

Browse files
author
Hugo Marcellin
committed
Clean up global filter dto
1 parent a781dd1 commit a3fa770

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/main/java/org/gridsuite/studyconfig/server/dto/GlobalFilterInfos.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*/
77
package org.gridsuite.studyconfig.server.dto;
88

9+
import com.fasterxml.jackson.annotation.JsonInclude;
910
import io.swagger.v3.oas.annotations.media.Schema;
1011
import jakarta.validation.constraints.NotNull;
1112
import lombok.Builder;
@@ -19,29 +20,31 @@
1920
@Schema(name = "GlobalFilterDto", description = "Global filter configuration")
2021
public record GlobalFilterInfos(
2122

22-
@Schema(description = "Global filter UUID")
23-
UUID id,
24-
23+
@JsonInclude(JsonInclude.Include.NON_NULL)
2524
@Schema(description = "Generic filter ID")
2625
UUID uuid,
2726

2827
@NotNull(message = "Filter type is mandatory")
2928
@Schema(description = "Filter type")
3029
String filterType,
3130

31+
@JsonInclude(JsonInclude.Include.NON_NULL)
3232
@Schema(description = "Filter subtype")
3333
String filterSubtype,
3434

3535
@NotNull(message = "Filter label is mandatory")
3636
@Schema(description = "Filter label")
3737
String label,
3838

39+
@JsonInclude(JsonInclude.Include.NON_NULL)
3940
@Schema(description = "Was filter recently applied")
4041
boolean recent,
4142

43+
@JsonInclude(JsonInclude.Include.NON_NULL)
4244
@Schema(description = "Generic filter related equipment type")
4345
String equipmentType,
4446

47+
@JsonInclude(JsonInclude.Include.NON_NULL)
4548
@Schema(description = "Generic filter path")
4649
String path
4750

src/main/java/org/gridsuite/studyconfig/server/mapper/SpreadsheetConfigMapper.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ public static ColumnEntity toColumnEntity(ColumnInfos dto) {
9494

9595
public static GlobalFilterInfos toGlobalFilterDto(GlobalFilterEntity entity) {
9696
return new GlobalFilterInfos(
97-
entity.getId(),
9897
entity.getUuid(),
9998
entity.getFilterType(),
10099
entity.getFilterSubtype(),

0 commit comments

Comments
 (0)