UPDATE: package name

navikt · Nov 15, 2024 · 2d9205a · 2d9205a
1 parent f77c62f
commit 2d9205a
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 44 deletions.
diff --git a/...dling/BehandlingensLivslopController.java → ...vslop/BehandlingensLivslopController.java b/...dling/BehandlingensLivslopController.java → ...vslop/BehandlingensLivslopController.java
@@ -1,44 +1,33 @@
- package no.nav.data.etterlevelse.behandling;
+ package no.nav.data.etterlevelse.behandlingensLivslop;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.data.common.exceptions.ValidationException;
 import no.nav.data.common.rest.PageParameters;
 import no.nav.data.common.rest.RestResponsePage;
-import no.nav.data.etterlevelse.behandling.domain.BehandlingensLivslop;
-import no.nav.data.etterlevelse.behandling.dto.BehandlingensLivslopRequest;
-import no.nav.data.etterlevelse.behandling.dto.BehandlingensLivslopResponse;
-import no.nav.data.pvk.pvkdokument.dto.PvkDokumentRequest;
-import no.nav.data.pvk.pvkdokument.dto.PvkDokumentResponse;
+import no.nav.data.etterlevelse.behandlingensLivslop.domain.BehandlingensLivslop;
+import no.nav.data.etterlevelse.behandlingensLivslop.dto.BehandlingensLivslopRequest;
+import no.nav.data.etterlevelse.behandlingensLivslop.dto.BehandlingensLivslopResponse;
 import org.springframework.data.domain.Page;
 import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.util.Assert;
-import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
 
-import static no.nav.data.common.utils.StreamUtils.convert;
-
-@Slf4j
+ @Slf4j
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/behandlingenslivslop")

diff --git a/...handling/BehandlingensLivslopService.java → ...sLivslop/BehandlingensLivslopService.java b/...handling/BehandlingensLivslopService.java → ...sLivslop/BehandlingensLivslopService.java
@@ -1,10 +1,11 @@
-package no.nav.data.etterlevelse.behandling;
+package no.nav.data.etterlevelse.behandlingensLivslop;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.data.common.exceptions.NotFoundException;
 import no.nav.data.common.rest.PageParameters;
-import no.nav.data.etterlevelse.behandling.domain.BehandlingensLivslop;
+import no.nav.data.etterlevelse.behandlingensLivslop.domain.BehandlingensLivslop;
+import no.nav.data.etterlevelse.behandlingensLivslop.domain.BehandlingensLivslopRepo;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;

diff --git a/...handling/domain/BehandlingensLivslop.java → ...sLivslop/domain/BehandlingensLivslop.java b/...handling/domain/BehandlingensLivslop.java → ...sLivslop/domain/BehandlingensLivslop.java
@@ -1,4 +1,4 @@
-package no.nav.data.etterlevelse.behandling.domain;
+package no.nav.data.etterlevelse.behandlingensLivslop.domain;
 
 import io.hypersistence.utils.hibernate.type.json.JsonBinaryType;
 import jakarta.persistence.Column;
@@ -11,14 +11,8 @@
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import no.nav.data.common.auditing.domain.Auditable;
-import no.nav.data.etterlevelse.codelist.codeusage.dto.InstanceId;
-import no.nav.data.etterlevelse.etterlevelse.domain.EtterlevelseData;
-import no.nav.data.etterlevelse.etterlevelse.domain.EtterlevelseStatus;
-import no.nav.data.etterlevelse.etterlevelse.domain.SuksesskriterieBegrunnelse;
 import org.hibernate.annotations.Type;
 
-import java.time.LocalDate;
-import java.util.List;
 import java.util.UUID;
 
 @Data

diff --git a/...ling/domain/BehandlingensLivslopData.java → ...slop/domain/BehandlingensLivslopData.java b/...ling/domain/BehandlingensLivslopData.java → ...slop/domain/BehandlingensLivslopData.java
@@ -1,4 +1,4 @@
-package no.nav.data.etterlevelse.behandling.domain;
+package no.nav.data.etterlevelse.behandlingensLivslop.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

diff --git a/...dling/domain/BehandlingensLivslopFil.java → ...vslop/domain/BehandlingensLivslopFil.java b/...dling/domain/BehandlingensLivslopFil.java → ...vslop/domain/BehandlingensLivslopFil.java
@@ -1,4 +1,4 @@
-package no.nav.data.etterlevelse.behandling.domain;
+package no.nav.data.etterlevelse.behandlingensLivslop.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

diff --git a/.../behandling/BehandlingensLivslopRepo.java → ...slop/domain/BehandlingensLivslopRepo.java b/.../behandling/BehandlingensLivslopRepo.java → ...slop/domain/BehandlingensLivslopRepo.java
@@ -1,10 +1,8 @@
-package no.nav.data.etterlevelse.behandling;
+package no.nav.data.etterlevelse.behandlingensLivslop.domain;
 
-import no.nav.data.etterlevelse.behandling.domain.BehandlingensLivslop;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
-import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 

diff --git a/...ling/dto/BehandlingensLivslopRequest.java → ...slop/dto/BehandlingensLivslopRequest.java b/...ling/dto/BehandlingensLivslopRequest.java → ...slop/dto/BehandlingensLivslopRequest.java
@@ -1,22 +1,23 @@
-package no.nav.data.etterlevelse.behandling.dto;
+package no.nav.data.etterlevelse.behandlingensLivslop.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.experimental.FieldNameConstants;
 import no.nav.data.common.validator.RequestElement;
 import no.nav.data.common.validator.Validator;
-import no.nav.data.etterlevelse.behandling.domain.BehandlingensLivslop;
-import no.nav.data.etterlevelse.behandling.domain.BehandlingensLivslopData;
-import no.nav.data.etterlevelse.behandling.domain.BehandlingensLivslopFil;
-import no.nav.data.etterlevelse.etterlevelseDokumentasjon.dto.EtterlevelseDokumentasjonResponse;
+import no.nav.data.etterlevelse.behandlingensLivslop.domain.BehandlingensLivslop;
+import no.nav.data.etterlevelse.behandlingensLivslop.domain.BehandlingensLivslopData;
+import no.nav.data.etterlevelse.behandlingensLivslop.domain.BehandlingensLivslopFil;
 
 import java.util.List;
 import java.util.UUID;
 
 @Data
 @Builder
 @NoArgsConstructor
+@FieldNameConstants
 @AllArgsConstructor
 public class BehandlingensLivslopRequest implements RequestElement {
 
@@ -42,11 +43,8 @@ public BehandlingensLivslop convertToBehandlingensLivslop() {
     }
 
     public void validateFieldValues(Validator<?> validator) {
-        // FIXME
-    }
-
-    public Boolean getUpdate() {
-        return update;
+        validator.checkUUID(Fields.id, id);
+        validator.checkId(this);
     }
 
     public void mergeInto(BehandlingensLivslop bl) {

diff --git a/...ing/dto/BehandlingensLivslopResponse.java → ...lop/dto/BehandlingensLivslopResponse.java b/...ing/dto/BehandlingensLivslopResponse.java → ...lop/dto/BehandlingensLivslopResponse.java
@@ -1,12 +1,11 @@
-package no.nav.data.etterlevelse.behandling.dto;
+package no.nav.data.etterlevelse.behandlingensLivslop.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import no.nav.data.etterlevelse.behandling.domain.BehandlingensLivslop;
-import no.nav.data.etterlevelse.behandling.domain.BehandlingensLivslopFil;
-import no.nav.data.etterlevelse.etterlevelseDokumentasjon.dto.EtterlevelseDokumentasjonResponse;
+import no.nav.data.etterlevelse.behandlingensLivslop.domain.BehandlingensLivslop;
+import no.nav.data.etterlevelse.behandlingensLivslop.domain.BehandlingensLivslopFil;
 
 import java.util.List;
 import java.util.UUID;