From 608b92933ab1bf78cc56c47f318dc6432314bc79 Mon Sep 17 00:00:00 2001 From: Ugur Alpay Cenar Date: Fri, 19 Jan 2024 09:50:17 +0100 Subject: [PATCH] Oppgrader avhengigheter (#450) --- .github/workflows/deploy_feature.yaml | 1 - pom.xml | 18 ++++++++++-------- .../dokument/arkiv/consumer/SafConsumer.kt | 3 +-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/deploy_feature.yaml b/.github/workflows/deploy_feature.yaml index 341776b9..76a98ba0 100644 --- a/.github/workflows/deploy_feature.yaml +++ b/.github/workflows/deploy_feature.yaml @@ -5,7 +5,6 @@ on: - '**' - '!main' - '!dependabot/**' - - jobs: build-deploy: name: "Build and deploy to feature" diff --git a/pom.xml b/pom.xml index 3461c20d..9ad220da 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.0 + 3.2.1 @@ -23,7 +23,7 @@ 21 - 1.9.20 + 1.9.22 1.11.3 @@ -31,18 +31,18 @@ 1.20230503150725_3c2c77b 20231113102624_1040a39 1.16.0 - 6.0.5 + 8.2.1 67a9be4476b63b7247cfacfaf821ab656bd2a952 - 7.3.3 - 7.3 + 7.5.3 + 7.4 9.15.2 2.1.0 4.0.4 - 4.11.0 + 4.12.0 3.2.0 - 3.3.0 + 3.5.0 3.8.0 2.22.2 ${java.version} @@ -86,7 +86,7 @@ org.jetbrains.kotlinx kotlinx-datetime-jvm - 0.4.0 + 0.5.0 @@ -216,11 +216,13 @@ ch.qos.logback logback-core + 1.4.12 ch.qos.logback logback-classic + 1.4.12 diff --git a/src/main/java/no/nav/bidrag/dokument/arkiv/consumer/SafConsumer.kt b/src/main/java/no/nav/bidrag/dokument/arkiv/consumer/SafConsumer.kt index cf35df8e..ed9a58cb 100644 --- a/src/main/java/no/nav/bidrag/dokument/arkiv/consumer/SafConsumer.kt +++ b/src/main/java/no/nav/bidrag/dokument/arkiv/consumer/SafConsumer.kt @@ -5,7 +5,6 @@ import com.netflix.graphql.dgs.client.GraphQLError import com.netflix.graphql.dgs.client.GraphQLResponse import com.netflix.graphql.dgs.client.HttpResponse import no.nav.bidrag.commons.web.HttpHeaderRestTemplate -import no.nav.bidrag.dokument.arkiv.consumer.SafConsumer.NotFoundException import no.nav.bidrag.dokument.arkiv.dto.DistribusjonsInfo import no.nav.bidrag.dokument.arkiv.dto.Journalpost import no.nav.bidrag.dokument.arkiv.dto.TilknyttetJournalpost @@ -71,7 +70,7 @@ open class SafConsumer(private val restTemplate: RestTemplate) { val queryString = query.getQuery() val graphQLClient = CustomGraphQLClient("") { _: String, _: Map>, body: String -> val exchange = restTemplate.exchange("/graphql", HttpMethod.POST, HttpEntity(body), String::class.java) - HttpResponse(exchange.statusCodeValue, exchange.body) + HttpResponse(exchange.statusCode.value(), exchange.body) } val response = graphQLClient.executeQuery(queryString, query.getVariables()) if (response.hasErrors()) {