Refactor DTO classes to use Lombok's @DaTa annotation

#deploy-test-sykemelding-api

Replaced @value, @Getter, and @Setter with @DaTa for simplicity and consistency across all DTO classes. Removed the forced argument requirement from @NoArgsConstructor where it was previously applied. Additionally, adjusted null handling in the "Arbeidsgiver" domain class to manage DTO presence better.

apps/sykemelding-api/src/main/java/no/nav/registre/testnorge/sykemelding/domain/Arbeidsgiver.java

@@ -7,13 +7,13 @@
 import static java.util.Objects.nonNull;
 
 public class Arbeidsgiver {
-    private XMLHelseOpplysningerArbeidsuforhet.Arbeidsgiver xmlArbeidsgiver;
+    private final XMLHelseOpplysningerArbeidsuforhet.Arbeidsgiver xmlArbeidsgiver;
 
     Arbeidsgiver(ArbeidsgiverDTO dto) {
         xmlArbeidsgiver = new XMLHelseOpplysningerArbeidsuforhet.Arbeidsgiver()
                 .withHarArbeidsgiver(new XMLCS()
-                        .withDN("En arbeidsgiver")
-                        .withV("1"))
+                        .withDN(nonNull(dto) ? "En arbeidsgiver" : "Ingen arbeidsgiver")
+                        .withV(nonNull(dto) ? "1" : "3"))
                 .withNavnArbeidsgiver(nonNull(dto) ? dto.getNavn() : null)
                 .withYrkesbetegnelse(nonNull(dto) ? dto.getYrkesbetegnelse() : null)
                 .withStillingsprosent(nonNull(dto) ? getStillingsprosent(dto) : null);

libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/sykemelding/v1/AdresseDTO.java

@@ -2,16 +2,15 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.EqualsAndHashCode;
+import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.Value;
 
-@Value
+@Data
 @Builder
 @AllArgsConstructor
-@NoArgsConstructor(force = true)
-@EqualsAndHashCode
+@NoArgsConstructor
 public class AdresseDTO {
+
     private String gate;
     private String postnummer;
     private String by;

libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/sykemelding/v1/AktivitetDTO.java

@@ -3,16 +3,17 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
+import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.Value;
 
-@Value
+@Data
 @Builder
 @AllArgsConstructor
-@NoArgsConstructor(force = true)
+@NoArgsConstructor
 public class AktivitetDTO {
-    private final Integer grad;
-    private final Boolean reisetilskudd;
-    private final Integer behandlingsdager;
-    private final Aktivitet aktivitet;
+
+    private Integer grad;
+    private Boolean reisetilskudd;
+    private Integer behandlingsdager;
+    private Aktivitet aktivitet;
 }

libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/sykemelding/v1/ArbeidsgiverDTO.java

@@ -2,16 +2,15 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.EqualsAndHashCode;
+import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.Value;
 
-@Value
+@Data
 @Builder
 @AllArgsConstructor
-@NoArgsConstructor(force = true)
-@EqualsAndHashCode
+@NoArgsConstructor
 public class ArbeidsgiverDTO {
+
     private String navn;
     private String yrkesbetegnelse;
     private Float stillingsprosent;

libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/sykemelding/v1/DetaljerDTO.java

@@ -2,15 +2,13 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.Getter;
+import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
 
-@Getter
-@Setter
+@Data
+@Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@Builder
 public class DetaljerDTO {
 
     private String tiltakArbeidsplass;

libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/sykemelding/v1/DiagnoseDTO.java

@@ -1,22 +1,17 @@
 package no.nav.testnav.libs.dto.sykemelding.v1;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
+import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.Value;
 
-@Value
+@Data
 @Builder
 @AllArgsConstructor
-@NoArgsConstructor(force = true)
+@NoArgsConstructor
 public class DiagnoseDTO {
-    @JsonProperty
-    private String diagnose;
 
-    @JsonProperty
+    private String diagnose;
     private String system;
-
-    @JsonProperty
     private String diagnosekode;
 }

libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/sykemelding/v1/HelsepersonellDTO.java

@@ -1,28 +1,20 @@
 package no.nav.testnav.libs.dto.sykemelding.v1;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.EqualsAndHashCode;
+import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.Value;
 
-@Value
+@Data
 @Builder
 @AllArgsConstructor
-@NoArgsConstructor(force = true)
-@EqualsAndHashCode
+@NoArgsConstructor
 public class HelsepersonellDTO {
-    @JsonProperty
+
     private String ident;
-    @JsonProperty
     private String fornavn;
-    @JsonProperty
     private String mellomnavn;
-    @JsonProperty
     private String etternavn;
-    @JsonProperty
     private String hprId;
-    @JsonProperty
     private String samhandlerType;
 }

libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/sykemelding/v1/OrganisasjonDTO.java

@@ -2,17 +2,16 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.EqualsAndHashCode;
+import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.Value;
 
-@Value
+@Data
 @Builder
 @AllArgsConstructor
-@NoArgsConstructor(force = true)
-@EqualsAndHashCode
+@NoArgsConstructor
 public class OrganisasjonDTO {
-    private final String navn;
-    private final String orgNr;
-    private final AdresseDTO adresse;
+
+    private String navn;
+    private String orgNr;
+    private AdresseDTO adresse;
 }

libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/sykemelding/v1/PasientDTO.java

@@ -2,18 +2,17 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.EqualsAndHashCode;
+import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.Value;
 
 import java.time.LocalDate;
 
-@Value
+@Data
 @Builder
 @AllArgsConstructor
-@NoArgsConstructor(force = true)
-@EqualsAndHashCode
+@NoArgsConstructor
 public class PasientDTO {
+
     private String ident;
     private String fornavn;
     private String mellomnavn;

libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/sykemelding/v1/PeriodeDTO.java

@@ -2,18 +2,17 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.EqualsAndHashCode;
+import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.Value;
 
 import java.time.LocalDate;
 
-@Value
+@Data
 @Builder
 @AllArgsConstructor
-@NoArgsConstructor(force = true)
-@EqualsAndHashCode
+@NoArgsConstructor
 public class PeriodeDTO {
+
     private LocalDate fom;
     private LocalDate tom;
     private AktivitetDTO aktivitet;

libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/sykemelding/v1/SykemeldingDTO.java

@@ -14,7 +14,7 @@
 @Data
 @Builder
 @AllArgsConstructor
-@NoArgsConstructor(force = true)
+@NoArgsConstructor
 public class SykemeldingDTO {
 
     private LocalDate startDato;

libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/sykemelding/v1/UtdypendeOpplysningerDTO.java

@@ -12,6 +12,7 @@
 
 @Data
 @Builder
+@NoArgsConstructor
 @AllArgsConstructor
 public class UtdypendeOpplysningerDTO {