From 72e203dc7c945fdf7b70277d48f6d31efe613e5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Garseg=20M=C3=B8rk?= Date: Tue, 19 Nov 2024 13:44:26 +0100 Subject: [PATCH] Etter struktur --- .../no/nav/familie/pdf/{util => mottak}/HttpHeadersUtil.kt | 2 +- src/main/kotlin/no/nav/familie/pdf/mottak/MottakClient.kt | 1 - .../pdf/mottak/{PdfController.kt => MottakController.kt} | 2 +- .../mottak/{PdfControllerTest.kt => MottakControllerTest.kt} | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-) rename src/main/kotlin/no/nav/familie/pdf/{util => mottak}/HttpHeadersUtil.kt (87%) rename src/main/kotlin/no/nav/familie/pdf/mottak/{PdfController.kt => MottakController.kt} (95%) rename src/test/kotlin/no/nav/familie/pdf/mottak/{PdfControllerTest.kt => MottakControllerTest.kt} (81%) diff --git a/src/main/kotlin/no/nav/familie/pdf/util/HttpHeadersUtil.kt b/src/main/kotlin/no/nav/familie/pdf/mottak/HttpHeadersUtil.kt similarity index 87% rename from src/main/kotlin/no/nav/familie/pdf/util/HttpHeadersUtil.kt rename to src/main/kotlin/no/nav/familie/pdf/mottak/HttpHeadersUtil.kt index 8502b84..1273c5b 100644 --- a/src/main/kotlin/no/nav/familie/pdf/util/HttpHeadersUtil.kt +++ b/src/main/kotlin/no/nav/familie/pdf/mottak/HttpHeadersUtil.kt @@ -1,4 +1,4 @@ -package no.nav.familie.pdf.util +package no.nav.familie.pdf.mottak import org.springframework.http.HttpHeaders diff --git a/src/main/kotlin/no/nav/familie/pdf/mottak/MottakClient.kt b/src/main/kotlin/no/nav/familie/pdf/mottak/MottakClient.kt index 51f5a6b..cdc7535 100644 --- a/src/main/kotlin/no/nav/familie/pdf/mottak/MottakClient.kt +++ b/src/main/kotlin/no/nav/familie/pdf/mottak/MottakClient.kt @@ -1,7 +1,6 @@ package no.nav.familie.pdf.mottak import no.nav.familie.http.client.AbstractRestClient -import no.nav.familie.pdf.util.medContentTypeJsonUTF8 import org.springframework.beans.factory.annotation.Qualifier import org.springframework.http.HttpHeaders import org.springframework.stereotype.Service diff --git a/src/main/kotlin/no/nav/familie/pdf/mottak/PdfController.kt b/src/main/kotlin/no/nav/familie/pdf/mottak/MottakController.kt similarity index 95% rename from src/main/kotlin/no/nav/familie/pdf/mottak/PdfController.kt rename to src/main/kotlin/no/nav/familie/pdf/mottak/MottakController.kt index 30b8266..c59692f 100644 --- a/src/main/kotlin/no/nav/familie/pdf/mottak/PdfController.kt +++ b/src/main/kotlin/no/nav/familie/pdf/mottak/MottakController.kt @@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RestController @RestController @RequestMapping("api/pdf") @Unprotected -class PdfController( +class MottakController( val mottakClient: MottakClient, ) { @GetMapping("/helsesjekk") diff --git a/src/test/kotlin/no/nav/familie/pdf/mottak/PdfControllerTest.kt b/src/test/kotlin/no/nav/familie/pdf/mottak/MottakControllerTest.kt similarity index 81% rename from src/test/kotlin/no/nav/familie/pdf/mottak/PdfControllerTest.kt rename to src/test/kotlin/no/nav/familie/pdf/mottak/MottakControllerTest.kt index b27ca88..ed62582 100644 --- a/src/test/kotlin/no/nav/familie/pdf/mottak/PdfControllerTest.kt +++ b/src/test/kotlin/no/nav/familie/pdf/mottak/MottakControllerTest.kt @@ -5,9 +5,9 @@ import io.mockk.mockk import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -internal class PdfControllerTest { +internal class MottakControllerTest { private val mottakClient: MottakClient = mockk() - private val søknadController = PdfController(mottakClient) + private val søknadController = MottakController(mottakClient) @Test fun `skal returnere OK`() {