Skip to content

Commit

Permalink
Bump com.pinterest:ktlint from 0.50.0 to 1.0.1 (#443)
Browse files Browse the repository at this point in the history
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
dependabot[bot] authored Oct 18, 2023
1 parent 2672819 commit b622d67
Show file tree
Hide file tree
Showing 450 changed files with 12,632 additions and 10,966 deletions.
2 changes: 2 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[*.{kt,kts}]
max_line_length = off
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ dependencies {
implementation("io.micrometer:micrometer-registry-prometheus")
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.15.2")
implementation("com.neovisionaries:nv-i18n:1.29")
ktlint("com.pinterest:ktlint:0.50.0") {
ktlint("com.pinterest.ktlint:ktlint-cli:1.0.1") {
attributes {
attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling.EXTERNAL))
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,14 @@ class BarnehagebarnController(
private val barnehageListeService: BarnehageListeService,
private val tilgangService: TilgangService,
) {

@PostMapping(
path = ["/barnehagebarnliste"],
consumes = [MediaType.APPLICATION_JSON_VALUE],
produces = [MediaType.APPLICATION_JSON_VALUE],
)
fun hentAlleBarnehagebarnPage(@RequestBody(required = true) barnehagebarnRequestParams: BarnehagebarnRequestParams): ResponseEntity<Ressurs<Page<BarnehagebarnDtoInterface>>> {
fun hentAlleBarnehagebarnPage(
@RequestBody(required = true) barnehagebarnRequestParams: BarnehagebarnRequestParams,
): ResponseEntity<Ressurs<Page<BarnehagebarnDtoInterface>>> {
tilgangService.validerTilgangTilHandling(
minimumBehandlerRolle = BehandlerRolle.VEILEDER,
handling = "hente ut alle barnehagebarn",
Expand All @@ -45,7 +46,9 @@ class BarnehagebarnController(
consumes = [MediaType.APPLICATION_JSON_VALUE],
produces = [MediaType.APPLICATION_JSON_VALUE],
)
fun hentAlleBarnehagebarnInfotrygdPage(@RequestBody(required = true) barnehagebarnRequestParams: BarnehagebarnRequestParams): ResponseEntity<Ressurs<Page<BarnehagebarnInfotrygdDto>>> {
fun hentAlleBarnehagebarnInfotrygdPage(
@RequestBody(required = true) barnehagebarnRequestParams: BarnehagebarnRequestParams,
): ResponseEntity<Ressurs<Page<BarnehagebarnInfotrygdDto>>> {
tilgangService.validerTilgangTilHandling(
minimumBehandlerRolle = BehandlerRolle.VEILEDER,
handling = "hente ut alle barnehagebarn",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,10 @@ class BehandlingController(
private val tilkjentYtelseValideringService: TilkjentYtelseValideringService,
private val leggTilBarnService: LeggTilBarnService,
) {

@PostMapping(produces = [MediaType.APPLICATION_JSON_VALUE])
fun opprettBehandling(@RequestBody opprettBehandlingDto: OpprettBehandlingDto): ResponseEntity<Ressurs<BehandlingResponsDto>> {
fun opprettBehandling(
@RequestBody opprettBehandlingDto: OpprettBehandlingDto,
): ResponseEntity<Ressurs<BehandlingResponsDto>> {
tilgangService.validerTilgangTilHandlingOgPersoner(
personIdenter = listOf(opprettBehandlingDto.søkersIdent),
minimumBehandlerRolle = BehandlerRolle.SAKSBEHANDLER,
Expand All @@ -57,7 +58,9 @@ class BehandlingController(
}

@GetMapping(path = ["/{behandlingId}"], produces = [MediaType.APPLICATION_JSON_VALUE])
fun hentBehandling(@PathVariable behandlingId: Long): ResponseEntity<Ressurs<BehandlingResponsDto>> {
fun hentBehandling(
@PathVariable behandlingId: Long,
): ResponseEntity<Ressurs<BehandlingResponsDto>> {
tilgangService.validerTilgangTilHandlingOgFagsakForBehandling(
behandlingId = behandlingId,
minimumBehandlerRolle = BehandlerRolle.VEILEDER,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ class BehandlingStegController(
private val stegService: StegService,
private val behandlingService: BehandlingService,
) {

@PostMapping(path = ["/registrer-søknad"], produces = [MediaType.APPLICATION_JSON_VALUE])
fun registrereSøknadOgOppdaterPersongrunnlag(
@PathVariable behandlingId: Long,
Expand All @@ -44,7 +43,9 @@ class BehandlingStegController(
}

@PostMapping(path = ["/vilkårsvurdering"])
fun utførVilkårsvurdering(@PathVariable behandlingId: Long): ResponseEntity<Ressurs<BehandlingResponsDto>> {
fun utførVilkårsvurdering(
@PathVariable behandlingId: Long,
): ResponseEntity<Ressurs<BehandlingResponsDto>> {
tilgangService.validerTilgangTilHandling(
minimumBehandlerRolle = BehandlerRolle.SAKSBEHANDLER,
handling = "utfør vilkårsvurdering",
Expand All @@ -56,7 +57,9 @@ class BehandlingStegController(
}

@PostMapping(path = ["/behandlingsresultat"])
fun utledBehandlingsresultat(@PathVariable behandlingId: Long): ResponseEntity<Ressurs<BehandlingResponsDto>> {
fun utledBehandlingsresultat(
@PathVariable behandlingId: Long,
): ResponseEntity<Ressurs<BehandlingResponsDto>> {
tilgangService.validerTilgangTilHandling(
minimumBehandlerRolle = BehandlerRolle.SAKSBEHANDLER,
handling = "vurdere behandlingsresultat",
Expand Down
5 changes: 3 additions & 2 deletions src/main/kotlin/no/nav/familie/ks/sak/api/BisysController.kt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import org.springframework.web.bind.annotation.RestController
@RequestMapping("/api/bisys")
@ProtectedWithClaims(issuer = "azuread")
class BisysController(private val bisysService: BisysService, private val tilgangService: TilgangService) {

@Operation(description = "Tjeneste for BISYS for å hente utbetalingsinfo for barna.")
@ApiResponses(
value = [
Expand Down Expand Up @@ -53,7 +52,9 @@ class BisysController(private val bisysService: BisysService, private val tilgan
consumes = [MediaType.APPLICATION_JSON_VALUE],
produces = [MediaType.APPLICATION_JSON_VALUE],
)
fun hentUtbetalingsinfo(@RequestBody bisysRequestDto: BisysDto): ResponseEntity<BisysResponsDto> {
fun hentUtbetalingsinfo(
@RequestBody bisysRequestDto: BisysDto,
): ResponseEntity<BisysResponsDto> {
return ResponseEntity.ok(bisysService.hentUtbetalingsinfo(bisysRequestDto.fom, bisysRequestDto.identer))
}
}
15 changes: 9 additions & 6 deletions src/main/kotlin/no/nav/familie/ks/sak/api/BrevController.kt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ class BrevController(
private val behandlingService: BehandlingService,
private val vedtakService: VedtakService,
) {

@PostMapping(path = ["/forhåndsvis-brev/{behandlingId}"])
fun hentForhåndsvisning(
@PathVariable behandlingId: Long,
Expand Down Expand Up @@ -81,7 +80,9 @@ class BrevController(
}

@GetMapping(path = ["/forhåndsvis-vedtaksbrev/{behandlingId}"])
fun hentVedtaksbrev(@PathVariable behandlingId: Long): Ressurs<ByteArray> {
fun hentVedtaksbrev(
@PathVariable behandlingId: Long,
): Ressurs<ByteArray> {
logger.info("${SikkerhetContext.hentSaksbehandlerNavn()} henter vedtaksbrev")

tilgangService.validerTilgangTilHandlingOgFagsakForBehandling(
Expand All @@ -91,15 +92,18 @@ class BrevController(
handling = "hent vedtaksbrev",
)

val vedtaksbrev = vedtakService.hentAktivVedtakForBehandling(behandlingId).stønadBrevPdf
?: throw Feil("Klarte ikke finne vedtaksbrev for behandling med id $behandlingId")
val vedtaksbrev =
vedtakService.hentAktivVedtakForBehandling(behandlingId).stønadBrevPdf
?: throw Feil("Klarte ikke finne vedtaksbrev for behandling med id $behandlingId")

return Ressurs.success(vedtaksbrev)
}

@Transactional
@PostMapping(path = ["forhåndsvis-og-lagre-vedtaksbrev/{behandlingId}"])
fun genererOgLagreVedtaksbrev(@PathVariable behandlingId: Long): Ressurs<ByteArray> {
fun genererOgLagreVedtaksbrev(
@PathVariable behandlingId: Long,
): Ressurs<ByteArray> {
logger.info("${SikkerhetContext.hentSaksbehandlerNavn()} henter vedtaksbrev")

tilgangService.validerTilgangTilHandlingOgFagsakForBehandling(
Expand All @@ -118,7 +122,6 @@ class BrevController(
}

companion object {

private val logger = LoggerFactory.getLogger(BrevController::class.java)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ class EndretUtbetalingAndelController(
private val behandlingService: BehandlingService,
private val tilbakestillBehandlingService: TilbakestillBehandlingService,
) {

@PutMapping(path = ["/{behandlingId}/{endretUtbetalingAndelId}"])
fun oppdaterEndretUtbetalingAndelOgOppdaterTilkjentYtelse(
@PathVariable behandlingId: Long,
Expand Down
21 changes: 15 additions & 6 deletions src/main/kotlin/no/nav/familie/ks/sak/api/FagsakController.kt
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,21 @@ class FagsakController(
private val tilgangService: TilgangService,
private val tilbakekrevingService: TilbakekrevingService,
) {

private val logger: Logger = LoggerFactory.getLogger(FagsakController::class.java)

@PostMapping(path = ["/sok"])
fun søkFagsak(@RequestBody søkParam: SøkParamDto): ResponseEntity<Ressurs<List<FagsakDeltagerResponsDto>>> {
fun søkFagsak(
@RequestBody søkParam: SøkParamDto,
): ResponseEntity<Ressurs<List<FagsakDeltagerResponsDto>>> {
logger.info("${SikkerhetContext.hentSaksbehandlerNavn()} søker fagsak")
val fagsakDeltagere = fagsakService.hentFagsakDeltagere(søkParam.personIdent)
return ResponseEntity.ok().body(Ressurs.success(fagsakDeltagere))
}

@PostMapping(produces = [MediaType.APPLICATION_JSON_VALUE])
fun hentEllerOpprettFagsak(@RequestBody fagsakRequest: FagsakRequestDto): ResponseEntity<Ressurs<MinimalFagsakResponsDto>> {
fun hentEllerOpprettFagsak(
@RequestBody fagsakRequest: FagsakRequestDto,
): ResponseEntity<Ressurs<MinimalFagsakResponsDto>> {
logger.info("${SikkerhetContext.hentSaksbehandlerNavn()} henter eller oppretter ny fagsak")

tilgangService.validerTilgangTilHandlingOgPersoner(
Expand All @@ -60,7 +63,9 @@ class FagsakController(
}

@GetMapping(path = ["/minimal/{fagsakId}"], produces = [MediaType.APPLICATION_JSON_VALUE])
fun hentMinimalFagsak(@PathVariable fagsakId: Long): ResponseEntity<Ressurs<MinimalFagsakResponsDto>> {
fun hentMinimalFagsak(
@PathVariable fagsakId: Long,
): ResponseEntity<Ressurs<MinimalFagsakResponsDto>> {
logger.info("${SikkerhetContext.hentSaksbehandlerNavn()} henter minimal fagsak med id $fagsakId")

tilgangService.validerTilgangTilHandlingOgFagsak(
Expand All @@ -74,7 +79,9 @@ class FagsakController(
}

@PostMapping(path = ["/hent-fagsak-paa-person"], produces = [MediaType.APPLICATION_JSON_VALUE])
fun hentMinimalFagsakForPerson(@RequestBody request: PersonIdent): ResponseEntity<Ressurs<MinimalFagsakResponsDto>> {
fun hentMinimalFagsakForPerson(
@RequestBody request: PersonIdent,
): ResponseEntity<Ressurs<MinimalFagsakResponsDto>> {
val personIdent = request.ident

tilgangService.validerTilgangTilHandlingOgFagsakForPerson(
Expand All @@ -94,7 +101,9 @@ class FagsakController(
path = ["/{fagsakId}/har-åpen-tilbakekrevingsbehandling"],
produces = [MediaType.APPLICATION_JSON_VALUE],
)
fun harÅpenTilbakekrevingsbehandling(@PathVariable fagsakId: Long): ResponseEntity<Ressurs<Boolean>> {
fun harÅpenTilbakekrevingsbehandling(
@PathVariable fagsakId: Long,
): ResponseEntity<Ressurs<Boolean>> {
tilgangService.validerTilgangTilHandlingOgFagsak(
fagsakId = fagsakId,
minimumBehandlerRolle = BehandlerRolle.VEILEDER,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ import org.springframework.web.bind.annotation.RestController
@ProtectedWithClaims(issuer = "azuread")
@Validated
class FeatureToggleController(private val featureToggleService: FeatureToggleService) {

@PostMapping(produces = [MediaType.APPLICATION_JSON_VALUE])
fun hentToggles(@RequestBody toggles: List<String>): ResponseEntity<Ressurs<Map<String, Boolean>>> {
fun hentToggles(
@RequestBody toggles: List<String>,
): ResponseEntity<Ressurs<Map<String, Boolean>>> {
return RessursUtils.ok(
toggles.fold(mutableMapOf()) { acc, toggleId ->
acc[toggleId] = featureToggleService.isEnabled(toggleId)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,9 @@ class FeilutbetaltValutaController(
}

@GetMapping(path = ["/behandlinger/{behandlingId}"], produces = [MediaType.APPLICATION_JSON_VALUE])
fun hentAlleFeilutbetaltValutaForBehandling(@PathVariable behandlingId: Long): ResponseEntity<Ressurs<List<FeilutbetaltValutaDto>?>> {
fun hentAlleFeilutbetaltValutaForBehandling(
@PathVariable behandlingId: Long,
): ResponseEntity<Ressurs<List<FeilutbetaltValutaDto>?>> {
tilgangService.validerTilgangTilHandling(
minimumBehandlerRolle = BehandlerRolle.VEILEDER,
handling = "henter alle feilutbetalt valuta for behandling",
Expand Down
Loading

0 comments on commit b622d67

Please sign in to comment.