Fix sonar

InseeFrLab · Sep 27, 2024 · 2e2f08e · 2e2f08e
1 parent 525fba7
commit 2e2f08e
Showing 1 changed file with 8 additions and 11 deletions.
diff --git a/onyxia-api/src/main/java/fr/insee/onyxia/api/events/WebhookEventListener.java b/onyxia-api/src/main/java/fr/insee/onyxia/api/events/WebhookEventListener.java
@@ -2,9 +2,6 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -19,6 +16,10 @@
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.stereotype.Component;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
 @EnableAsync
 @Component
 @ConditionalOnProperty(name = "event.webhook.enabled", havingValue = "true")
@@ -50,15 +51,11 @@ public WebhookEventListener(ObjectMapper objectMapper, OkHttpClient okHttpClient
     @Async
     @EventListener
     public void onOnyxiaEvent(OnyxiaEvent onyxiaEvent) throws JsonProcessingException {
-        if (!includes.isEmpty()) {
-            if (!includes.contains(onyxiaEvent.getType())) {
-                return;
-            }
+        if (!includes.isEmpty() && !includes.contains(onyxiaEvent.getType())) {
+            return;
         }
-        if (!excludes.isEmpty()) {
-            if (excludes.contains(onyxiaEvent.getType())) {
-                return;
-            }
+        if (!excludes.isEmpty() && excludes.contains(onyxiaEvent.getType())) {
+            return;
         }
         RequestBody body = RequestBody.create(objectMapper.writeValueAsString(onyxiaEvent), JSON);
         Request request = new Request.Builder().url(url).post(body).build();