From 77cc1d1e0db19c2b135313381328fc4f2545a67a Mon Sep 17 00:00:00 2001 From: "antoine.vinot" Date: Mon, 21 Oct 2024 13:50:34 +0200 Subject: [PATCH] NO-JIRA Fix SQ Issues --- .../dependency/package-info.java | 23 +++++++++++++++++++ .../server/log/ServerProcessLoggingTest.java | 8 +++++-- .../server/http/JavaxHttpResponseTest.java | 4 ++-- .../QGChangeEventListenersImplTest.java | 8 +++---- .../platform/web/MasterServletFilterTest.java | 4 ++-- 5 files changed, 37 insertions(+), 10 deletions(-) create mode 100644 server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/dependency/package-info.java diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/dependency/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/dependency/package-info.java new file mode 100644 index 00000000000..c590954bf7b --- /dev/null +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/dependency/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2024 SonarSource SA + * mailto:info AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.ce.task.projectanalysis.dependency; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/log/ServerProcessLoggingTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/log/ServerProcessLoggingTest.java index b0118faee73..663ef65f5dc 100644 --- a/server/sonar-server-common/src/test/java/org/sonar/server/log/ServerProcessLoggingTest.java +++ b/server/sonar-server-common/src/test/java/org/sonar/server/log/ServerProcessLoggingTest.java @@ -50,10 +50,14 @@ public class ServerProcessLoggingTest { private ServerProcessLogging getServerProcessLoggingFakeImpl(ProcessId processId, String threadIdFieldPattern) { return new ServerProcessLogging(processId, threadIdFieldPattern) { @Override - protected void extendLogLevelConfiguration(LogLevelConfig.Builder logLevelConfigBuilder) {} + protected void extendLogLevelConfiguration(LogLevelConfig.Builder logLevelConfigBuilder) { + //Not needed for this test + } @Override - protected void extendConfigure(Props props) {} + protected void extendConfigure(Props props) { + //Not needed for this test + } }; } } diff --git a/server/sonar-webserver-api/src/test/java/org/sonar/server/http/JavaxHttpResponseTest.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/http/JavaxHttpResponseTest.java index 999ec74c99f..a936cfcddd2 100644 --- a/server/sonar-webserver-api/src/test/java/org/sonar/server/http/JavaxHttpResponseTest.java +++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/http/JavaxHttpResponseTest.java @@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletResponse; import org.junit.Test; import org.sonar.api.server.http.Cookie; -import static org.assertj.core.api.AssertionsForClassTypes.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -50,7 +50,7 @@ public class JavaxHttpResponseTest { assertThat(underTest.getDelegate()).isSameAs(responseMock); assertThat(underTest.getHeader("h1")).isEqualTo("hvalue1"); - assertThat(underTest.getHeaders("h1")).asList().containsExactly("hvalue1"); + assertThat(underTest.getHeaders("h1")).containsExactly("hvalue1"); assertThat(underTest.getStatus()).isEqualTo(200); assertThat(underTest.getWriter()).isEqualTo(writer); assertThat(underTest.getOutputStream()).isEqualTo(outputStream); diff --git a/server/sonar-webserver-api/src/test/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListenersImplTest.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListenersImplTest.java index d447dc22165..4c203432ef8 100644 --- a/server/sonar-webserver-api/src/test/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListenersImplTest.java +++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListenersImplTest.java @@ -167,9 +167,9 @@ public class QGChangeEventListenersImplTest { @Test public void broadcastOnIssueChange_passes_immutable_set_of_ChangedIssues() { - QGChangeEventListenersImpl underTest = new QGChangeEventListenersImpl(Set.of(listener1)); + var qgChangeEventListeners = new QGChangeEventListenersImpl(Set.of(listener1)); - underTest.broadcastOnIssueChange(oneIssueOnComponent1, singletonList(component1QGChangeEvent), false); + qgChangeEventListeners.broadcastOnIssueChange(oneIssueOnComponent1, singletonList(component1QGChangeEvent), false); ArgumentCaptor> changedIssuesCaptor = newSetCaptor(); inOrder.verify(listener1).onIssueChanges(same(component1QGChangeEvent), changedIssuesCaptor.capture()); @@ -178,9 +178,9 @@ public class QGChangeEventListenersImplTest { @Test public void broadcastOnIssueChange_has_no_effect_when_no_listener() { - QGChangeEventListenersImpl underTest = new QGChangeEventListenersImpl(Set.of()); + var qgChangeEventListeners = new QGChangeEventListenersImpl(Set.of()); - underTest.broadcastOnIssueChange(oneIssueOnComponent1, singletonList(component1QGChangeEvent), false); + qgChangeEventListeners.broadcastOnIssueChange(oneIssueOnComponent1, singletonList(component1QGChangeEvent), false); verifyNoInteractions(listener1, listener2, listener3); } diff --git a/server/sonar-webserver/src/test/java/org/sonar/server/platform/web/MasterServletFilterTest.java b/server/sonar-webserver/src/test/java/org/sonar/server/platform/web/MasterServletFilterTest.java index f35be421384..f8d63216c39 100644 --- a/server/sonar-webserver/src/test/java/org/sonar/server/platform/web/MasterServletFilterTest.java +++ b/server/sonar-webserver/src/test/java/org/sonar/server/platform/web/MasterServletFilterTest.java @@ -214,8 +214,8 @@ public class MasterServletFilterTest { } @Override - public void doFilter(HttpRequest request, HttpResponse response, org.sonar.api.web.FilterChain chain) throws IOException { - + public void doFilter(HttpRequest request, HttpResponse response, org.sonar.api.web.FilterChain chain) { + //Not needed for this test } @Override -- 2.39.5