Skip to content

Commit 2b29d0a

Browse files
ramrock93ramrock93
committed
Optimize imports
1 parent 8e6ee30 commit 2b29d0a

24 files changed

+83
-42
lines changed

‎src/main/kotlin/no/nav/sifinnsynapi/common/AktørId.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package no.nav.sifinnsynapi.common
22

33
import com.fasterxml.jackson.annotation.JsonValue
4-
import java.util.*
54
import jakarta.persistence.Embeddable
5+
import java.util.*
66

77
@Embeddable
88
data class AktørId(@get:JsonValue var aktørId: String? = null) {

‎src/main/kotlin/no/nav/sifinnsynapi/config/TxConfiguration.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package no.nav.sifinnsynapi.config
22

3+
import jakarta.persistence.EntityManagerFactory
34
import org.springframework.context.annotation.Bean
45
import org.springframework.context.annotation.Configuration
56
import org.springframework.context.annotation.Primary
67
import org.springframework.orm.jpa.JpaTransactionManager
7-
import jakarta.persistence.EntityManagerFactory
88

99
@Configuration
1010
class TxConfiguration {

‎src/main/kotlin/no/nav/sifinnsynapi/config/kafka/CommonKafkaConfig.kt

+5-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@ import org.apache.kafka.common.config.SslConfigs
1717
import org.json.JSONObject
1818
import org.slf4j.Logger
1919
import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory
20-
import org.springframework.kafka.core.*
20+
import org.springframework.kafka.core.ConsumerFactory
21+
import org.springframework.kafka.core.DefaultKafkaConsumerFactory
22+
import org.springframework.kafka.core.DefaultKafkaProducerFactory
23+
import org.springframework.kafka.core.KafkaTemplate
24+
import org.springframework.kafka.core.ProducerFactory
2125
import org.springframework.kafka.listener.ConsumerRecordRecoverer
2226
import org.springframework.kafka.listener.ContainerProperties
2327
import org.springframework.kafka.listener.DefaultAfterRollbackProcessor

‎src/main/kotlin/no/nav/sifinnsynapi/dittnav/DittnavService.kt

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package no.nav.sifinnsynapi.dittnav
33
import com.fasterxml.jackson.databind.ObjectMapper
44
import no.nav.sifinnsynapi.config.Topics.K9_DITTNAV_VARSEL_BESKJED_AIVEN
55
import no.nav.sifinnsynapi.config.Topics.K9_DITTNAV_VARSEL_MICROFRONTEND
6-
import no.nav.sifinnsynapi.util.MDCUtil
76
import org.apache.kafka.clients.producer.ProducerRecord
87
import org.json.JSONObject
98
import org.slf4j.Logger

‎src/main/kotlin/no/nav/sifinnsynapi/dittnav/K9Microfrontend.kt

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package no.nav.sifinnsynapi.dittnav
22

3-
import com.fasterxml.jackson.annotation.JsonValue
4-
import jakarta.persistence.Embeddable
53
import no.nav.sifinnsynapi.common.Metadata
64

75
data class K9Microfrontend(

‎src/main/kotlin/no/nav/sifinnsynapi/dokument/DokumentController.kt

+5-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ import org.springframework.http.HttpStatus
1212
import org.springframework.http.MediaType
1313
import org.springframework.http.ResponseEntity
1414
import org.springframework.validation.annotation.Validated
15-
import org.springframework.web.bind.annotation.*
15+
import org.springframework.web.bind.annotation.GetMapping
16+
import org.springframework.web.bind.annotation.PathVariable
17+
import org.springframework.web.bind.annotation.RequestParam
18+
import org.springframework.web.bind.annotation.ResponseStatus
19+
import org.springframework.web.bind.annotation.RestController
1620

1721
@RestController
1822
@ProtectedWithClaims(issuer = "selvbetjening", claimMap = ["acr=Level4"])

‎src/main/kotlin/no/nav/sifinnsynapi/filter/MDCFilter.kt

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
package no.nav.sifinnsynapi.filter
22

3+
import jakarta.servlet.FilterChain
4+
import jakarta.servlet.ServletException
5+
import jakarta.servlet.ServletRequest
6+
import jakarta.servlet.ServletResponse
7+
import jakarta.servlet.http.HttpFilter
8+
import jakarta.servlet.http.HttpServletRequest
39
import no.nav.sifinnsynapi.util.CallIdGenerator
410
import no.nav.sifinnsynapi.util.HttpHeaderConstants.NAV_CALL_ID
511
import no.nav.sifinnsynapi.util.HttpHeaderConstants.X_CORRELATION_ID
@@ -18,12 +24,6 @@ import org.springframework.http.client.ClientHttpRequestInterceptor
1824
import org.springframework.http.client.ClientHttpResponse
1925
import org.springframework.stereotype.Component
2026
import java.io.IOException
21-
import jakarta.servlet.FilterChain
22-
import jakarta.servlet.ServletException
23-
import jakarta.servlet.ServletRequest
24-
import jakarta.servlet.ServletResponse
25-
import jakarta.servlet.http.HttpFilter
26-
import jakarta.servlet.http.HttpServletRequest
2727

2828
@Component
2929
@Order(Ordered.HIGHEST_PRECEDENCE)

‎src/main/kotlin/no/nav/sifinnsynapi/filter/ResponseDecoratorFilter.kt

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
package no.nav.sifinnsynapi.filter
22

3-
import org.slf4j.Logger
4-
import org.slf4j.LoggerFactory
5-
import org.springframework.core.Ordered
6-
import org.springframework.core.annotation.Order
7-
import org.springframework.stereotype.Component
8-
import org.springframework.web.util.ContentCachingRequestWrapper
9-
import org.springframework.web.util.ContentCachingResponseWrapper
103
import jakarta.servlet.Filter
114
import jakarta.servlet.FilterChain
125
import jakarta.servlet.ServletRequest
136
import jakarta.servlet.ServletResponse
147
import jakarta.servlet.http.HttpServletRequest
158
import jakarta.servlet.http.HttpServletResponse
169
import no.nav.sifinnsynapi.util.HttpHeaderConstants.PROBLEM_DETAILS
10+
import org.slf4j.Logger
11+
import org.slf4j.LoggerFactory
12+
import org.springframework.core.Ordered
13+
import org.springframework.core.annotation.Order
14+
import org.springframework.stereotype.Component
15+
import org.springframework.web.util.ContentCachingRequestWrapper
16+
import org.springframework.web.util.ContentCachingResponseWrapper
1717

1818
@Component
1919
@Order(Ordered.LOWEST_PRECEDENCE)

‎src/main/kotlin/no/nav/sifinnsynapi/k9sakinnsynapi/K9SakInnsynApiClientConfig.kt

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import org.springframework.http.client.ClientHttpRequestExecution
1515
import org.springframework.http.client.ClientHttpRequestInterceptor
1616
import org.springframework.web.client.RestTemplate
1717
import java.time.Duration
18-
import java.util.*
1918

2019
@Configuration
2120
class K9SakInnsynApiClientConfig(

‎src/main/kotlin/no/nav/sifinnsynapi/k9sakinnsynapi/K9SakInnsynSøknadController.kt

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ import no.nav.sifinnsynapi.config.Issuers
77
import org.slf4j.LoggerFactory
88
import org.springframework.http.HttpStatus.OK
99
import org.springframework.http.MediaType
10-
import org.springframework.web.bind.annotation.*
10+
import org.springframework.web.bind.annotation.GetMapping
11+
import org.springframework.web.bind.annotation.ResponseStatus
12+
import org.springframework.web.bind.annotation.RestController
1113

1214
@RestController
1315
@RequiredIssuers(

‎src/main/kotlin/no/nav/sifinnsynapi/konsument/ettersending/K9EttersendingKonsument.kt

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
11
package no.nav.sifinnsynapi.konsument.ettersending
22

3-
import no.nav.sifinnsynapi.common.*
3+
import no.nav.sifinnsynapi.common.AktørId
4+
import no.nav.sifinnsynapi.common.Fødselsnummer
5+
import no.nav.sifinnsynapi.common.SøknadsStatus
6+
import no.nav.sifinnsynapi.common.Søknadstype
7+
import no.nav.sifinnsynapi.common.TopicEntry
48
import no.nav.sifinnsynapi.config.TxConfiguration
59
import no.nav.sifinnsynapi.dittnav.DittnavService
610
import no.nav.sifinnsynapi.dittnav.byggK9Beskjed
11+
import no.nav.sifinnsynapi.konsument.ettersending.K9EttersendingKonsument.Companion.Ettersendelsestype.PLEIEPENGER_LIVETS_SLUTTFASE
12+
import no.nav.sifinnsynapi.konsument.ettersending.K9EttersendingKonsument.Companion.Ettersendelsestype.PLEIEPENGER_SYKT_BARN
13+
import no.nav.sifinnsynapi.konsument.ettersending.K9EttersendingKonsument.Companion.Ettersendelsestype.valueOf
714
import no.nav.sifinnsynapi.konsument.ettersending.K9EttersendingKonsument.Companion.Keys.AKTØR_ID
815
import no.nav.sifinnsynapi.konsument.ettersending.K9EttersendingKonsument.Companion.Keys.FØDSELSNUMMER
916
import no.nav.sifinnsynapi.konsument.ettersending.K9EttersendingKonsument.Companion.Keys.MOTTATT
1017
import no.nav.sifinnsynapi.konsument.ettersending.K9EttersendingKonsument.Companion.Keys.SØKER
1118
import no.nav.sifinnsynapi.konsument.ettersending.K9EttersendingKonsument.Companion.Keys.SØKNAD_ID
1219
import no.nav.sifinnsynapi.konsument.ettersending.K9EttersendingKonsument.Companion.Keys.SØKNAD_TYPE
13-
import no.nav.sifinnsynapi.konsument.ettersending.K9EttersendingKonsument.Companion.Ettersendelsestype.*
1420
import no.nav.sifinnsynapi.soknad.Søknad
1521
import no.nav.sifinnsynapi.soknad.SøknadRepository
1622
import no.nav.sifinnsynapi.util.storForbokstav

‎src/main/kotlin/no/nav/sifinnsynapi/konsument/pleiepenger/endringsmelding/PleiepengerEndringsmeldingHendelseKonsument.kt

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
package no.nav.sifinnsynapi.konsument.pleiepenger.endringsmelding
22

3-
import no.nav.sifinnsynapi.common.*
3+
import no.nav.sifinnsynapi.common.AktørId
4+
import no.nav.sifinnsynapi.common.Fødselsnummer
5+
import no.nav.sifinnsynapi.common.SøknadsStatus
6+
import no.nav.sifinnsynapi.common.Søknadstype
7+
import no.nav.sifinnsynapi.common.TopicEntry
48
import no.nav.sifinnsynapi.config.TxConfiguration
59
import no.nav.sifinnsynapi.dittnav.DittnavService
610
import no.nav.sifinnsynapi.dittnav.byggK9Beskjed

‎src/main/kotlin/no/nav/sifinnsynapi/konsument/pleiepenger/syktbarn/PleiepengerSyktBarnHendelseKonsument.kt

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
package no.nav.sifinnsynapi.konsument.pleiepenger.syktbarn
22

3-
import no.nav.sifinnsynapi.common.*
3+
import no.nav.sifinnsynapi.common.AktørId
4+
import no.nav.sifinnsynapi.common.Fødselsnummer
5+
import no.nav.sifinnsynapi.common.SøknadsStatus
6+
import no.nav.sifinnsynapi.common.Søknadstype
7+
import no.nav.sifinnsynapi.common.TopicEntry
48
import no.nav.sifinnsynapi.config.TxConfiguration.Companion.TRANSACTION_MANAGER
59
import no.nav.sifinnsynapi.dittnav.DittnavService
610
import no.nav.sifinnsynapi.dittnav.byggK9Beskjed

‎src/main/kotlin/no/nav/sifinnsynapi/mikrofrontend/MikrofrontendDAO.kt

-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
package no.nav.sifinnsynapi.mikrofrontend
22

33
import jakarta.persistence.Column
4-
import jakarta.persistence.Embedded
54
import jakarta.persistence.Entity
65
import jakarta.persistence.EnumType
76
import jakarta.persistence.Enumerated
87
import jakarta.persistence.Id
98
import jakarta.persistence.Table
109
import no.nav.sifinnsynapi.dittnav.MicrofrontendAction
11-
import no.nav.sifinnsynapi.dittnav.MicrofrontendId
1210
import org.hibernate.annotations.JdbcTypeCode
1311
import org.hibernate.annotations.UpdateTimestamp
1412
import org.hibernate.type.SqlTypes

‎src/main/kotlin/no/nav/sifinnsynapi/mikrofrontend/MikrofrontendService.kt

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package no.nav.sifinnsynapi.mikrofrontend
22

3-
import no.nav.sifinnsynapi.common.Fødselsnummer
43
import no.nav.sifinnsynapi.common.Metadata
54
import no.nav.sifinnsynapi.common.Søknadstype
65
import no.nav.sifinnsynapi.config.TxConfiguration

‎src/main/kotlin/no/nav/sifinnsynapi/oppslag/OppslagsKlientKonfig.kt

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import org.springframework.web.client.RestTemplate
2222
import java.time.Duration
2323
import java.time.ZoneOffset.UTC
2424
import java.time.ZonedDateTime
25-
import java.util.*
2625

2726
@Configuration
2827
class OppslagsKlientKonfig(

‎src/main/kotlin/no/nav/sifinnsynapi/soknad/SøknadController.kt

+5-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ import org.springframework.http.HttpHeaders
1111
import org.springframework.http.HttpStatus.OK
1212
import org.springframework.http.MediaType
1313
import org.springframework.http.ResponseEntity
14-
import org.springframework.web.bind.annotation.*
14+
import org.springframework.web.bind.annotation.GetMapping
15+
import org.springframework.web.bind.annotation.PathVariable
16+
import org.springframework.web.bind.annotation.RequestParam
17+
import org.springframework.web.bind.annotation.ResponseStatus
18+
import org.springframework.web.bind.annotation.RestController
1519
import java.util.*
1620

1721
@RestController

‎src/main/kotlin/no/nav/sifinnsynapi/soknad/SøknadDAO.kt

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
package no.nav.sifinnsynapi.soknad
22

3-
import jakarta.persistence.*
3+
import jakarta.persistence.Column
4+
import jakarta.persistence.Embedded
5+
import jakarta.persistence.Entity
46
import jakarta.persistence.EnumType.STRING
7+
import jakarta.persistence.Enumerated
8+
import jakarta.persistence.Id
59
import no.nav.sifinnsynapi.common.AktørId
610
import no.nav.sifinnsynapi.common.Fødselsnummer
711
import no.nav.sifinnsynapi.common.SøknadsStatus

‎src/test/kotlin/no/nav/sifinnsynapi/dokument/DokumentControllerTest.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import no.nav.sifinnsynapi.Routes
88
import no.nav.sifinnsynapi.config.SecurityConfiguration
99
import no.nav.sifinnsynapi.safselvbetjening.ArkivertDokument
1010
import no.nav.sifinnsynapi.safselvbetjening.generated.enums.Datotype
11-
import no.nav.sifinnsynapi.safselvbetjening.generated.hentdokumentoversikt.*
11+
import no.nav.sifinnsynapi.safselvbetjening.generated.hentdokumentoversikt.RelevantDato
1212
import no.nav.sifinnsynapi.util.CallIdGenerator
1313
import no.nav.sifinnsynapi.utils.hentToken
1414
import org.junit.Assert
@@ -32,7 +32,6 @@ import org.springframework.test.web.servlet.result.MockMvcResultMatchers.content
3232
import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
3333
import java.net.URI
3434
import java.net.URL
35-
import jakarta.servlet.http.Cookie
3635

3736
@ExtendWith(SpringExtension::class)
3837
@TestInstance(TestInstance.Lifecycle.PER_CLASS)

‎src/test/kotlin/no/nav/sifinnsynapi/dokument/DokumentServiceTest.kt

+6-2
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,19 @@ package no.nav.sifinnsynapi.dokument
33
import assertk.assertThat
44
import assertk.assertions.hasSize
55
import assertk.assertions.isEmpty
6-
import assertk.assertions.isEqualTo
76
import com.ninjasquad.springmockk.MockkBean
87
import io.mockk.coEvery
98
import no.nav.security.token.support.spring.test.EnableMockOAuth2Server
109
import no.nav.sifinnsynapi.safselvbetjening.SafSelvbetjeningService
1110
import no.nav.sifinnsynapi.safselvbetjening.generated.enums.Datotype
1211
import no.nav.sifinnsynapi.safselvbetjening.generated.enums.Journalstatus
1312
import no.nav.sifinnsynapi.safselvbetjening.generated.enums.Variantformat
14-
import no.nav.sifinnsynapi.safselvbetjening.generated.hentdokumentoversikt.*
13+
import no.nav.sifinnsynapi.safselvbetjening.generated.hentdokumentoversikt.DokumentInfo
14+
import no.nav.sifinnsynapi.safselvbetjening.generated.hentdokumentoversikt.Dokumentoversikt
15+
import no.nav.sifinnsynapi.safselvbetjening.generated.hentdokumentoversikt.Dokumentvariant
16+
import no.nav.sifinnsynapi.safselvbetjening.generated.hentdokumentoversikt.Journalpost
17+
import no.nav.sifinnsynapi.safselvbetjening.generated.hentdokumentoversikt.RelevantDato
18+
import no.nav.sifinnsynapi.safselvbetjening.generated.hentdokumentoversikt.Sak
1519
import org.junit.jupiter.api.BeforeEach
1620
import org.junit.jupiter.api.Test
1721
import org.junit.jupiter.api.TestInstance

‎src/test/kotlin/no/nav/sifinnsynapi/konsument/KafkaTransactionRollbackTest.kt

+5-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@ import no.nav.sifinnsynapi.utils.leggPåTopic
1616
import no.nav.sifinnsynapi.utils.opprettKafkaProducer
1717
import org.apache.kafka.clients.producer.Producer
1818
import org.awaitility.kotlin.await
19-
import org.junit.jupiter.api.*
19+
import org.junit.jupiter.api.AfterAll
20+
import org.junit.jupiter.api.AfterEach
21+
import org.junit.jupiter.api.BeforeAll
22+
import org.junit.jupiter.api.Test
23+
import org.junit.jupiter.api.TestInstance
2024
import org.junit.jupiter.api.extension.ExtendWith
2125
import org.springframework.beans.factory.annotation.Autowired
2226
import org.springframework.boot.test.context.SpringBootTest

‎src/test/kotlin/no/nav/sifinnsynapi/soknad/SøknadControllerTest.kt

+3-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ import org.springframework.test.context.junit.jupiter.SpringExtension
3232
import org.springframework.test.web.servlet.MockMvc
3333
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders
3434
import org.springframework.test.web.servlet.result.MockMvcResultHandlers
35-
import org.springframework.test.web.servlet.result.MockMvcResultMatchers.*
35+
import org.springframework.test.web.servlet.result.MockMvcResultMatchers.header
36+
import org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath
37+
import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
3638
import java.net.URI
3739
import java.net.URLDecoder
3840
import java.nio.charset.Charset

‎src/test/kotlin/no/nav/sifinnsynapi/soknad/SøknadRepositoryTest.kt

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ import no.nav.sifinnsynapi.common.Fødselsnummer
77
import no.nav.sifinnsynapi.common.SøknadsStatus
88
import no.nav.sifinnsynapi.common.Søknadstype
99
import no.nav.sifinnsynapi.mikrofrontend.MikrofrontendRepository
10-
import org.junit.Assert.*
10+
import org.junit.Assert.assertFalse
11+
import org.junit.Assert.assertNotNull
12+
import org.junit.Assert.assertTrue
1113
import org.junit.jupiter.api.AfterEach
1214
import org.junit.jupiter.api.BeforeAll
1315
import org.junit.jupiter.api.Test
@@ -16,7 +18,6 @@ import org.junit.jupiter.api.extension.ExtendWith
1618
import org.springframework.beans.factory.annotation.Autowired
1719
import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase
1820
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest
19-
import org.springframework.data.domain.PageRequest
2021
import org.springframework.test.context.ActiveProfiles
2122
import org.springframework.test.context.junit.jupiter.SpringExtension
2223
import java.time.LocalDate

‎src/test/kotlin/no/nav/sifinnsynapi/soknad/SøknadServiceTest.kt

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
package no.nav.sifinnsynapi.soknad
22

33
import assertk.assertThat
4-
import assertk.assertions.*
4+
import assertk.assertions.isEmpty
5+
import assertk.assertions.isGreaterThan
6+
import assertk.assertions.isNotEmpty
7+
import assertk.assertions.isNotEqualTo
8+
import assertk.assertions.size
59
import com.ninjasquad.springmockk.MockkBean
610
import io.mockk.every
711
import no.nav.security.token.support.spring.test.EnableMockOAuth2Server
@@ -13,8 +17,11 @@ import no.nav.sifinnsynapi.dokument.DokumentService
1317
import no.nav.sifinnsynapi.oppslag.OppslagRespons
1418
import no.nav.sifinnsynapi.oppslag.OppslagsService
1519
import org.awaitility.kotlin.await
16-
import org.junit.jupiter.api.*
20+
import org.junit.jupiter.api.AfterAll
1721
import org.junit.jupiter.api.Assertions.assertNotNull
22+
import org.junit.jupiter.api.BeforeEach
23+
import org.junit.jupiter.api.Test
24+
import org.junit.jupiter.api.TestInstance
1825
import org.junit.jupiter.api.extension.ExtendWith
1926
import org.springframework.beans.factory.annotation.Autowired
2027
import org.springframework.boot.test.context.SpringBootTest

0 commit comments

Comments
 (0)