diff --git a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/consumer/AzureAdProfileConsumer.java b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/consumer/AzureAdProfileConsumer.java index c04d1c7b48d..7f5a0341fc3 100644 --- a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/consumer/AzureAdProfileConsumer.java +++ b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/consumer/AzureAdProfileConsumer.java @@ -41,7 +41,7 @@ public AzureAdProfileConsumer( .build()); if (proxyHost != null) { - log.info("Setter opp proxy host {} for Azure Ad", proxyHost); + log.trace("Setter opp proxy host {} for Azure Ad", proxyHost); var uri = URI.create(proxyHost); builder.clientConnector(new ReactorClientHttpConnector( HttpClient diff --git a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/service/AzureAdTokenService.java b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/service/AzureAdTokenService.java index 05437f60338..07cbc158beb 100644 --- a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/service/AzureAdTokenService.java +++ b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/service/AzureAdTokenService.java @@ -40,7 +40,7 @@ public AzureAdTokenService( .defaultHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_FORM_URLENCODED_VALUE); if (proxyHost != null) { - log.info("Setter opp proxy host {} for Client Credentials", proxyHost); + log.trace("Setter opp proxy host {} for Client Credentials", proxyHost); var uri = URI.create(proxyHost); builder.clientConnector(new ReactorClientHttpConnector( HttpClient diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/decoder/JwtDecoder.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/decoder/JwtDecoder.java index 335f81e629d..061985f9b41 100644 --- a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/decoder/JwtDecoder.java +++ b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/decoder/JwtDecoder.java @@ -46,7 +46,7 @@ public ReactiveJwtDecoder jwtDecoder() { private WebClient buildProxyWebClient(String proxyHost) { var builder = WebClient.builder(); if (proxyHost != null) { - log.info("Setter opp proxy host {} for jwt decoder.", proxyHost); + log.trace("Setter opp proxy host {} for jwt decoder.", proxyHost); var uri = URI.create(proxyHost); builder.clientConnector(new ReactorClientHttpConnector( HttpClient diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/exchange/azuread/AzureAdTokenService.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/exchange/azuread/AzureAdTokenService.java index 7568c51cf61..e65534dcfde 100644 --- a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/exchange/azuread/AzureAdTokenService.java +++ b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/exchange/azuread/AzureAdTokenService.java @@ -50,7 +50,7 @@ public AzureAdTokenService( .defaultHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_FORM_URLENCODED_VALUE); if (proxyHost != null) { - log.info("Setter opp proxy host {} for Client Credentials", proxyHost); + log.trace("Setter opp proxy host {} for Client Credentials", proxyHost); var uri = URI.create(proxyHost); builder.clientConnector(new ReactorClientHttpConnector( HttpClient diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/exchange/azuread/NavAzureAdTokenService.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/exchange/azuread/NavAzureAdTokenService.java index fbc95f64d17..2800db0654c 100644 --- a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/exchange/azuread/NavAzureAdTokenService.java +++ b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/exchange/azuread/NavAzureAdTokenService.java @@ -39,7 +39,7 @@ public NavAzureAdTokenService( .defaultHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_FORM_URLENCODED_VALUE); if (proxyHost != null) { - log.info("Setter opp proxy host {} for Client Credentials", proxyHost); + log.trace("Setter opp proxy host {} for Client Credentials", proxyHost); var uri = URI.create(proxyHost); HttpClient httpClient = HttpClient .create() diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/exchange/azuread/TrygdeetatenAzureAdTokenService.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/exchange/azuread/TrygdeetatenAzureAdTokenService.java index 4fbaf171d02..c1a8adb73b2 100644 --- a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/exchange/azuread/TrygdeetatenAzureAdTokenService.java +++ b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/exchange/azuread/TrygdeetatenAzureAdTokenService.java @@ -56,7 +56,7 @@ public TrygdeetatenAzureAdTokenService( .defaultHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_FORM_URLENCODED_VALUE); if (nonNull(proxyHost)) { - log.info("Setter opp proxy host {} for Client Credentials", proxyHost); + log.trace("Setter opp proxy host {} for Client Credentials", proxyHost); var uri = URI.create(proxyHost); builder.clientConnector(new ReactorClientHttpConnector( HttpClient diff --git a/libs/servlet-insecure-security/src/main/java/no/nav/testnav/libs/standalone/servletsecurity/exchange/AzureAdTokenService.java b/libs/servlet-insecure-security/src/main/java/no/nav/testnav/libs/standalone/servletsecurity/exchange/AzureAdTokenService.java index adc99f711f6..00696ba6667 100644 --- a/libs/servlet-insecure-security/src/main/java/no/nav/testnav/libs/standalone/servletsecurity/exchange/AzureAdTokenService.java +++ b/libs/servlet-insecure-security/src/main/java/no/nav/testnav/libs/standalone/servletsecurity/exchange/AzureAdTokenService.java @@ -37,7 +37,7 @@ public AzureAdTokenService( .defaultHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_FORM_URLENCODED_VALUE); if (proxyHost != null) { - log.info("Setter opp proxy host {} for Client Credentials", proxyHost); + log.trace("Setter opp proxy host {} for Client Credentials", proxyHost); var uri = URI.create(proxyHost); builder.clientConnector(new ReactorClientHttpConnector( HttpClient diff --git a/libs/servlet-security/src/main/java/no/nav/testnav/libs/servletsecurity/exchange/AzureAdTokenService.java b/libs/servlet-security/src/main/java/no/nav/testnav/libs/servletsecurity/exchange/AzureAdTokenService.java index 1c2924e99ae..f6323dcb5fc 100644 --- a/libs/servlet-security/src/main/java/no/nav/testnav/libs/servletsecurity/exchange/AzureAdTokenService.java +++ b/libs/servlet-security/src/main/java/no/nav/testnav/libs/servletsecurity/exchange/AzureAdTokenService.java @@ -45,7 +45,7 @@ public AzureAdTokenService( .defaultHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_FORM_URLENCODED_VALUE); if (proxyHost != null) { - log.info("Setter opp proxy host {} for Client Credentials", proxyHost); + log.trace("Setter opp proxy host {} for Client Credentials", proxyHost); var uri = URI.create(proxyHost); builder.clientConnector(new ReactorClientHttpConnector( HttpClient diff --git a/libs/slack/src/main/java/no/nav/testnav/libs/slack/consumer/SlackConsumer.java b/libs/slack/src/main/java/no/nav/testnav/libs/slack/consumer/SlackConsumer.java index 33766e4735e..6f15c0edbfa 100644 --- a/libs/slack/src/main/java/no/nav/testnav/libs/slack/consumer/SlackConsumer.java +++ b/libs/slack/src/main/java/no/nav/testnav/libs/slack/consumer/SlackConsumer.java @@ -28,7 +28,7 @@ public SlackConsumer( this.token = token; this.applicationName = applicationName; if (proxyHost != null) { - log.info("Setter opp proxy host {} for Slack api", proxyHost); + log.trace("Setter opp proxy host {} for Slack api", proxyHost); var uri = URI.create(proxyHost); webClientBuilder.clientConnector(new ReactorClientHttpConnector( HttpClient @@ -47,7 +47,7 @@ public SlackConsumer( public void publish(Message message) { log.info("Publiserer melding til slack."); SlackResponse response = new PublishMessageCommand(webClient, token, message).call(); - if (!response.getOk()) { + if (!Boolean.TRUE.equals(response.getOk())) { throw new SlackConsumerException("Klarer ikke aa opprette slack melding", response); } } @@ -55,7 +55,7 @@ public void publish(Message message) { public void uploadFile(byte[] file, String fileName, String channel) { log.info("Publiserer fil til slack."); SlackResponse response = new UploadFileCommand(webClient, token, file, fileName, channel, applicationName).call(); - if (!response.getOk()) { + if (!Boolean.TRUE.equals(response.getOk())) { throw new SlackConsumerException("Klarer ikke aa opprette slack melding", response); } }