Skip to content

Commit 78f92a3

Browse files
oyvind-wedoeoyvind-wedoe
committed
Move search criteria to secureLogger.
1 parent 553d11c commit 78f92a3

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

‎src/main/kotlin/no/nav/klage/search/service/ElasticsearchService.kt

+18-18
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ open class ElasticsearchService(private val esBehandlingRepository: EsBehandling
381381
}
382382

383383
private fun OppgaverOmPersonSearchCriteria.toEsQuery(): QueryBuilder {
384-
logger.debug("Search criteria: {}", this)
384+
secureLogger.debug("Search criteria: {}", this)
385385
val baseQuery: BoolQueryBuilder = QueryBuilders.boolQuery()
386386
baseQuery.addSecurityFilters(this)
387387

@@ -392,7 +392,7 @@ open class ElasticsearchService(private val esBehandlingRepository: EsBehandling
392392
}
393393

394394
private fun SaksbehandlereAndMedunderskrivereByEnhetSearchCriteria.toEsQuery(): QueryBuilder {
395-
logger.debug("Search criteria: {}", this)
395+
secureLogger.debug("Search criteria: {}", this)
396396
val baseQuery: BoolQueryBuilder = QueryBuilders.boolQuery()
397397
baseQuery.addSecurityFilters(this)
398398

@@ -411,7 +411,7 @@ open class ElasticsearchService(private val esBehandlingRepository: EsBehandling
411411
}
412412

413413
private fun ROLListSearchCriteria.toEsQuery(): QueryBuilder {
414-
logger.debug("Search criteria: {}", this)
414+
secureLogger.debug("Search criteria: {}", this)
415415
val baseQuery: BoolQueryBuilder = QueryBuilders.boolQuery()
416416
baseQuery.addSecurityFilters(this)
417417

@@ -426,7 +426,7 @@ open class ElasticsearchService(private val esBehandlingRepository: EsBehandling
426426
}
427427

428428
private fun LedigeOppgaverSearchCriteria.toEsQuery(): QueryBuilder {
429-
logger.debug("Search criteria: {}", this)
429+
secureLogger.debug("Search criteria: {}", this)
430430
val baseQuery: BoolQueryBuilder = QueryBuilders.boolQuery()
431431
baseQuery.addSecurityFilters(this)
432432
baseQuery.addBasicFilters(this)
@@ -440,7 +440,7 @@ open class ElasticsearchService(private val esBehandlingRepository: EsBehandling
440440
}
441441

442442
private fun LedigeOppgaverSearchCriteria.toROLEsQuery(): QueryBuilder {
443-
logger.debug("Search criteria: {}", this)
443+
secureLogger.debug("Search criteria: {}", this)
444444
val baseQuery: BoolQueryBuilder = QueryBuilders.boolQuery()
445445
baseQuery.addSecurityFilters(this)
446446
baseQuery.addBasicFilters(this)
@@ -456,7 +456,7 @@ open class ElasticsearchService(private val esBehandlingRepository: EsBehandling
456456
}
457457

458458
private fun CountLedigeOppgaverMedUtgaattFristSearchCriteria.toEsQuery(): QueryBuilder {
459-
logger.debug("Search criteria: {}", this)
459+
secureLogger.debug("Search criteria: {}", this)
460460
val baseQuery: BoolQueryBuilder = QueryBuilders.boolQuery()
461461
baseQuery.addSecurityFilters(this)
462462
baseQuery.addBasicFilters(this)
@@ -470,7 +470,7 @@ open class ElasticsearchService(private val esBehandlingRepository: EsBehandling
470470
}
471471

472472
private fun FerdigstilteOppgaverSearchCriteria.toEsQuery(): QueryBuilder {
473-
logger.debug("Search criteria: {}", this)
473+
secureLogger.debug("Search criteria: {}", this)
474474
val baseQuery: BoolQueryBuilder = QueryBuilders.boolQuery()
475475
baseQuery.addSecurityFilters(this)
476476
baseQuery.addBasicFilters(this)
@@ -487,7 +487,7 @@ open class ElasticsearchService(private val esBehandlingRepository: EsBehandling
487487
}
488488

489489
private fun FerdigstilteOppgaverSearchCriteria.toROLEsQuery(): QueryBuilder {
490-
logger.debug("Search criteria: {}", this)
490+
secureLogger.debug("Search criteria: {}", this)
491491
val baseQuery: BoolQueryBuilder = QueryBuilders.boolQuery()
492492
baseQuery.addSecurityFilters(this)
493493
baseQuery.addBasicFilters(this)
@@ -503,7 +503,7 @@ open class ElasticsearchService(private val esBehandlingRepository: EsBehandling
503503
}
504504

505505
private fun ReturnerteROLOppgaverSearchCriteria.toROLEsQuery(): QueryBuilder {
506-
logger.debug("Search criteria: {}", this)
506+
secureLogger.debug("Search criteria: {}", this)
507507
val baseQuery: BoolQueryBuilder = QueryBuilders.boolQuery()
508508
baseQuery.addSecurityFilters(this)
509509
baseQuery.addBasicFilters(this)
@@ -520,7 +520,7 @@ open class ElasticsearchService(private val esBehandlingRepository: EsBehandling
520520
}
521521

522522
private fun BehandlingIdSearchCriteria.toEsQuery(): QueryBuilder {
523-
logger.debug("Search criteria: {}", this)
523+
secureLogger.debug("Search criteria: {}", this)
524524
val baseQuery: BoolQueryBuilder = QueryBuilders.boolQuery()
525525
baseQuery.addSecurityFilters(this)
526526
baseQuery.must(QueryBuilders.idsQuery().addIds(behandlingId))
@@ -530,7 +530,7 @@ open class ElasticsearchService(private val esBehandlingRepository: EsBehandling
530530
}
531531

532532
private fun UferdigeOppgaverSearchCriteria.toEsQuery(): QueryBuilder {
533-
logger.debug("Search criteria: {}", this)
533+
secureLogger.debug("Search criteria: {}", this)
534534
val baseQuery: BoolQueryBuilder = QueryBuilders.boolQuery()
535535
baseQuery.addSecurityFilters(this)
536536
baseQuery.addBasicFilters(this)
@@ -546,7 +546,7 @@ open class ElasticsearchService(private val esBehandlingRepository: EsBehandling
546546
}
547547

548548
private fun UferdigeOppgaverSearchCriteria.toROLEsQuery(): QueryBuilder {
549-
logger.debug("Search criteria: {}", this)
549+
secureLogger.debug("Search criteria: {}", this)
550550
val baseQuery: BoolQueryBuilder = QueryBuilders.boolQuery()
551551
baseQuery.addSecurityFilters(this)
552552
baseQuery.addBasicFilters(this)
@@ -562,7 +562,7 @@ open class ElasticsearchService(private val esBehandlingRepository: EsBehandling
562562
}
563563

564564
private fun OppgaverPaaVentSearchCriteria.toEsQuery(): QueryBuilder {
565-
logger.debug("Search criteria: {}", this)
565+
secureLogger.debug("Search criteria: {}", this)
566566
val baseQuery: BoolQueryBuilder = QueryBuilders.boolQuery()
567567
baseQuery.addSecurityFilters(this)
568568
baseQuery.addBasicFilters(this)
@@ -578,7 +578,7 @@ open class ElasticsearchService(private val esBehandlingRepository: EsBehandling
578578
}
579579

580580
private fun EnhetensFerdigstilteOppgaverSearchCriteria.toEsQuery(): QueryBuilder {
581-
logger.debug("Search criteria: {}", this)
581+
secureLogger.debug("Search criteria: {}", this)
582582
val baseQuery: BoolQueryBuilder = QueryBuilders.boolQuery()
583583
baseQuery.addSecurityFilters(this)
584584
baseQuery.addBasicFilters(this)
@@ -598,7 +598,7 @@ open class ElasticsearchService(private val esBehandlingRepository: EsBehandling
598598
}
599599

600600
private fun EnhetensOppgaverPaaVentSearchCriteria.toEsQuery(): QueryBuilder {
601-
logger.debug("Search criteria: {}", this)
601+
secureLogger.debug("Search criteria: {}", this)
602602
val baseQuery: BoolQueryBuilder = QueryBuilders.boolQuery()
603603
baseQuery.addSecurityFilters(this)
604604
baseQuery.addBasicFilters(this)
@@ -631,7 +631,7 @@ open class ElasticsearchService(private val esBehandlingRepository: EsBehandling
631631
}
632632

633633
private fun EnhetensUferdigeOppgaverSearchCriteria.toEsQuery(): QueryBuilder {
634-
logger.debug("Search criteria: {}", this)
634+
secureLogger.debug("Search criteria: {}", this)
635635
val baseQuery: BoolQueryBuilder = QueryBuilders.boolQuery()
636636
baseQuery.addSecurityFilters(this)
637637
baseQuery.addBasicFilters(this)
@@ -664,7 +664,7 @@ open class ElasticsearchService(private val esBehandlingRepository: EsBehandling
664664
}
665665

666666
private fun KrolsUferdigeOppgaverSearchCriteria.toEsQuery(): QueryBuilder {
667-
logger.debug("Search criteria: {}", this)
667+
secureLogger.debug("Search criteria: {}", this)
668668
val baseQuery: BoolQueryBuilder = QueryBuilders.boolQuery()
669669
baseQuery.addSecurityFilters(this)
670670
baseQuery.addBasicFilters(this)
@@ -683,7 +683,7 @@ open class ElasticsearchService(private val esBehandlingRepository: EsBehandling
683683
}
684684

685685
private fun KrolsReturnerteOppgaverSearchCriteria.toEsQuery(): QueryBuilder {
686-
logger.debug("Search criteria: {}", this)
686+
secureLogger.debug("Search criteria: {}", this)
687687
val baseQuery: BoolQueryBuilder = QueryBuilders.boolQuery()
688688
baseQuery.addSecurityFilters(this)
689689
baseQuery.addBasicFilters(this)

0 commit comments

Comments
 (0)