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

Bump the all-dependencies group across 1 directory with 19 updates #978

Merged
merged 3 commits into from
Nov 27, 2024
Merged

Bump the all-dependencies group across 1 directory with 19 updates #978

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
d219291
Bump the all-dependencies group across 1 directory with 19 updates
dependabot[bot] Nov 24, 2024
9254c3e
Gå vekk fra deprecated metode i kafka config
olekvernberg Nov 25, 2024
207a422
Linterendringer
olekvernberg Nov 25, 2024
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
18 changes: 9 additions & 9 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.5</version>
<version>3.4.0</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

Expand All @@ -16,13 +16,13 @@
<properties>
<java.version>21</java.version>
<kotlin.version>2.0.21</kotlin.version>
<springdoc.version>2.6.0</springdoc.version>
<felles.version>3.20240913110742_adb42f8</felles.version>
<familie.kontrakter.version>3.0_20241102131210_d65efd1</familie.kontrakter.version>
<springdoc.version>2.7.0</springdoc.version>
<felles.version>3.20241121151626_836e7ca</felles.version>
<familie.kontrakter.version>3.0_20241113143804_80bdd40</familie.kontrakter.version>
<familie.eksterne-kontrakter.stonadsstatistikk-ef>2.0_20240425094647_26b983d</familie.eksterne-kontrakter.stonadsstatistikk-ef>
<familie.eksterne-kontrakter.saksstatistikk-ef>2.0_20230214104704_706e9c0</familie.eksterne-kontrakter.saksstatistikk-ef>
<familie.eksterne-kontrakter.arbeidsoppfolging>2.0_20230214104704_706e9c0</familie.eksterne-kontrakter.arbeidsoppfolging>
<prosessering.version>2.20241011144712_deb1f2c</prosessering.version>
<prosessering.version>2.20241118095311_c66bd61</prosessering.version>
<utbetalingsgenerator.version>1.0_20241021103522_3adb9fa</utbetalingsgenerator.version>
<brukernotifikasjon-schemas.version>2.6.0</brukernotifikasjon-schemas.version>
<maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
Expand All @@ -33,7 +33,7 @@
<dotenv.version>6.4.1</dotenv.version>
<changelist>-SNAPSHOT</changelist>
<start-class>no.nav.familie.ef.iverksett.ApplicationKt</start-class>
<token-validation-spring.version>5.0.10</token-validation-spring.version>
<token-validation-spring.version>5.0.11</token-validation-spring.version>
<ibm-mq-client.version>9.4.1.0</ibm-mq-client.version>
<unleash.version>8.3.1</unleash.version>
<okhttp3.version>4.9.1</okhttp3.version> <!-- overskrever spring sin versjon, blir brukt av mock-oauth2-server -->
Expand Down Expand Up @@ -114,7 +114,7 @@
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>1.11.4</version>
<version>1.12.0</version>
</dependency>

<!-- Swagger -->
Expand Down Expand Up @@ -250,7 +250,7 @@
<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-database-postgresql</artifactId>
<version>10.21.0</version>
<version>11.0.0</version>
<scope>runtime</scope>
</dependency>
<!-- MQ / JMS -->
Expand All @@ -272,7 +272,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>postgresql</artifactId>
<version>1.20.3</version>
<version>1.20.4</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
16 changes: 12 additions & 4 deletions src/main/kotlin/no/nav/familie/ef/iverksett/infrastruktur/configuration/KafkaConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@ import no.nav.brukernotifikasjon.schemas.input.BeskjedInput
import no.nav.brukernotifikasjon.schemas.input.NokkelInput
import org.apache.kafka.clients.producer.ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG
import org.apache.kafka.clients.producer.ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG
import org.springframework.beans.factory.ObjectProvider
import org.springframework.beans.factory.annotation.Value
import org.springframework.boot.autoconfigure.kafka.KafkaProperties
import org.springframework.boot.ssl.SslBundles
import org.springframework.context.annotation.Bean
import org.springframework.context.annotation.Configuration
import org.springframework.kafka.core.DefaultKafkaProducerFactory
Expand All @@ -26,23 +28,29 @@ class KafkaConfig {
lateinit var schemaRegistryPassword: String

@Bean
fun kafkaTemplate(properties: KafkaProperties): KafkaTemplate<String, String> {
fun kafkaTemplate(
properties: KafkaProperties,
sslBundles: ObjectProvider<SslBundles>,
): KafkaTemplate<String, String> {
val producerListener = LoggingProducerListener<String, String>()
producerListener.setIncludeContents(false)
val producerFactory = DefaultKafkaProducerFactory<String, String>(properties.buildProducerProperties())
val producerFactory = DefaultKafkaProducerFactory<String, String>(properties.buildProducerProperties(sslBundles.getIfAvailable()))

return KafkaTemplate(producerFactory).apply<KafkaTemplate<String, String>> {
setProducerListener(producerListener)
}
}

@Bean
fun kafkaTemplateBrukerNotifikasjoner(properties: KafkaProperties): KafkaTemplate<NokkelInput, BeskjedInput> {
fun kafkaTemplateBrukerNotifikasjoner(
properties: KafkaProperties,
sslBundles: ObjectProvider<SslBundles>,
): KafkaTemplate<NokkelInput, BeskjedInput> {
val producerListener = LoggingProducerListener<NokkelInput, BeskjedInput>()
producerListener.setIncludeContents(false)
val producerFactory =
DefaultKafkaProducerFactory<NokkelInput, BeskjedInput>(
properties.buildProducerProperties().apply {
properties.buildProducerProperties(sslBundles.getIfAvailable()).apply {
put(KEY_SERIALIZER_CLASS_CONFIG, KafkaAvroSerializer::class.java)
put(VALUE_SERIALIZER_CLASS_CONFIG, KafkaAvroSerializer::class.java)
put(KafkaAvroSerializerConfig.SCHEMA_REGISTRY_URL_CONFIG, schemaRegistryUrl)
Expand Down