Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fjern default instilling fra ekstra #6999

Merged
merged 3 commits into from
Feb 12, 2025
Merged

Fjern default instilling fra ekstra #6999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0edebfb
Fjern default instilling fra ekstra
sebassonav Feb 11, 2025
2d90f82
Ingen bruker de lenger, fjern
sebassonav Feb 11, 2025
b8826b8
Revert "Ingen bruker de lenger, fjern"
sebassonav Feb 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions apps/etterlatte-behandling-kafka/src/main/kotlin/no/nav/etterlatte/AppBuilder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package no.nav.etterlatte

import com.fasterxml.jackson.databind.SerializationFeature
import com.typesafe.config.Config
import com.typesafe.config.ConfigFactory
import io.ktor.client.HttpClient
Expand Down Expand Up @@ -88,7 +87,6 @@ class AppBuilder(
azureAppJwk = props.requireEnvValue(AZURE_APP_JWK),
azureAppWellKnownUrl = props.requireEnvValue(AZURE_APP_WELL_KNOWN_URL),
azureAppScope = props.requireEnvValue(BEHANDLING_AZURE_SCOPE),
ekstraJacksoninnstillinger = { it.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) },
)
}

Expand All @@ -101,7 +99,6 @@ class AppBuilder(
azureAppJwk = props.requireEnvValue(AZURE_APP_JWK),
azureAppWellKnownUrl = props.requireEnvValue(AZURE_APP_WELL_KNOWN_URL),
azureAppScope = props.requireEnvValue(scope),
ekstraJacksoninnstillinger = { it.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) },
)
}

Expand Down
2 changes: 0 additions & 2 deletions ...etterlatte-beregning-kafka/src/main/kotlin/no/nav/etterlatte/beregningkafka/AppBuilder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package no.nav.etterlatte.beregningkafka

import com.fasterxml.jackson.databind.SerializationFeature
import io.ktor.client.HttpClient
import no.nav.etterlatte.EnvKey.BEREGNING_AZURE_SCOPE
import no.nav.etterlatte.libs.common.Miljoevariabler
Expand All @@ -18,7 +17,6 @@ class AppBuilder(
azureAppJwk = props.requireEnvValue(AZURE_APP_JWK),
azureAppWellKnownUrl = props.requireEnvValue(AZURE_APP_WELL_KNOWN_URL),
azureAppScope = props.requireEnvValue(BEREGNING_AZURE_SCOPE),
ekstraJacksoninnstillinger = { it.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) },
)
}

Expand Down
3 changes: 0 additions & 3 deletions apps/etterlatte-brev-kafka/src/main/kotlin/no/nav/etterlatte/Application.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package no.nav.etterlatte

import com.fasterxml.jackson.databind.SerializationFeature
import com.typesafe.config.ConfigFactory
import io.ktor.client.HttpClient
import io.ktor.client.plugins.HttpTimeout
Expand All @@ -27,7 +26,6 @@ class ApplicationBuilder {
azureAppJwk = config.getString("azure.app.jwk"),
azureAppWellKnownUrl = config.getString("azure.app.well.known.url"),
azureAppScope = config.getString("brevapi.azure.scope"),
ekstraJacksoninnstillinger = { it.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) },
).config {
install(HttpTimeout)
}
Expand All @@ -39,7 +37,6 @@ class ApplicationBuilder {
azureAppJwk = config.getString("azure.app.jwk"),
azureAppWellKnownUrl = config.getString("azure.app.well.known.url"),
azureAppScope = config.getString("grunnlag.azure.scope"),
ekstraJacksoninnstillinger = { it.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) },
)
}
private val brevapiKlient = BrevapiKlient(config, brevhttpKlient)
Expand Down
2 changes: 0 additions & 2 deletions apps/etterlatte-grunnlag/src/main/kotlin/Application.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package no.nav.etterlatte

import com.fasterxml.jackson.databind.SerializationFeature
import com.typesafe.config.Config
import com.typesafe.config.ConfigFactory
import io.ktor.client.HttpClient
Expand Down Expand Up @@ -44,7 +43,6 @@ class ApplicationBuilder {
azureAppJwk = config.getString("azure.app.jwk"),
azureAppWellKnownUrl = config.getString("azure.app.well.known.url"),
azureAppScope = config.getString("pdltjenester.azure.scope"),
ekstraJacksoninnstillinger = { it.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) },
)
}

Expand Down
2 changes: 0 additions & 2 deletions apps/etterlatte-hendelser-pdl/src/main/kotlin/hendelserpdl/config/ApplicationContext.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package no.nav.etterlatte.hendelserpdl.config

import com.fasterxml.jackson.databind.SerializationFeature
import no.nav.etterlatte.EnvKey.HTTP_PORT
import no.nav.etterlatte.hendelserpdl.PersonHendelseFordeler
import no.nav.etterlatte.hendelserpdl.common.PersonhendelseKonsument
Expand All @@ -25,7 +24,6 @@ class ApplicationContext(
azureAppJwk = env.requireEnvValue(AzureEnums.AZURE_APP_JWK),
azureAppWellKnownUrl = env.requireEnvValue(AzureEnums.AZURE_APP_WELL_KNOWN_URL),
azureAppScope = env.requireEnvValue(PDL_AZURE_SCOPE),
ekstraJacksoninnstillinger = { it.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) },
),
url = "http://etterlatte-pdltjenester",
),
Expand Down
2 changes: 0 additions & 2 deletions apps/etterlatte-tilbakekreving/src/main/kotlin/tilbakekreving/config/ApplicationContext.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package no.nav.etterlatte.tilbakekreving.config

import com.fasterxml.jackson.databind.SerializationFeature
import no.nav.etterlatte.libs.common.Miljoevariabler
import no.nav.etterlatte.libs.database.DataSourceBuilder
import no.nav.etterlatte.libs.ktor.httpClientClientCredentials
Expand Down Expand Up @@ -41,7 +40,6 @@ class ApplicationContext(
azureAppJwk = properties.azureAppJwk,
azureAppWellKnownUrl = properties.azureAppWellKnownUrl,
azureAppScope = properties.behandlingScope,
ekstraJacksoninnstillinger = { it.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) },
),
)

Expand Down
2 changes: 0 additions & 2 deletions ...tterlatte-trygdetid-kafka/src/main/kotlin/no/nav/etterlatte/trygdetid/kafka/AppBuilder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package no.nav.etterlatte.trygdetid.kafka

import com.fasterxml.jackson.databind.SerializationFeature
import io.ktor.client.HttpClient
import no.nav.etterlatte.EnvKey.TRYGDETID_AZURE_SCOPE
import no.nav.etterlatte.libs.common.Miljoevariabler
Expand All @@ -18,7 +17,6 @@ class AppBuilder(
azureAppJwk = props.requireEnvValue(AZURE_APP_JWK),
azureAppWellKnownUrl = props.requireEnvValue(AZURE_APP_WELL_KNOWN_URL),
azureAppScope = props.requireEnvValue(TRYGDETID_AZURE_SCOPE),
ekstraJacksoninnstillinger = { it.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) },
)
}

Expand Down
4 changes: 0 additions & 4 deletions ...erlatte-vedtaksvurdering-kafka/src/main/kotlin/no/nav/etterlatte/regulering/AppBuilder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package no.nav.etterlatte.regulering

import com.fasterxml.jackson.databind.SerializationFeature
import com.typesafe.config.Config
import com.typesafe.config.ConfigFactory
import io.ktor.client.HttpClient
Expand Down Expand Up @@ -46,7 +45,6 @@ class AppBuilder(
azureAppJwk = env.requireEnvValue(AZURE_APP_JWK),
azureAppWellKnownUrl = env.requireEnvValue(AZURE_APP_WELL_KNOWN_URL),
azureAppScope = env.requireEnvValue(VEDTAK_AZURE_SCOPE),
ekstraJacksoninnstillinger = { it.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) },
)
}

Expand All @@ -56,7 +54,6 @@ class AppBuilder(
azureAppJwk = env.requireEnvValue(AZURE_APP_JWK),
azureAppWellKnownUrl = env.requireEnvValue(AZURE_APP_WELL_KNOWN_URL),
azureAppScope = env.requireEnvValue(UTBETALING_AZURE_SCOPE),
ekstraJacksoninnstillinger = { it.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) },
)
}

Expand All @@ -66,7 +63,6 @@ class AppBuilder(
azureAppJwk = env.requireEnvValue(AZURE_APP_JWK),
azureAppWellKnownUrl = env.requireEnvValue(AZURE_APP_WELL_KNOWN_URL),
azureAppScope = env.requireEnvValue(EnvKey.BREV_AZURE_SCOPE),
ekstraJacksoninnstillinger = { it.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) },
)
}

Expand Down