style

ligoj · May 12, 2024 · 8c5d6f0 · 8c5d6f0
1 parent 8e766b0
commit 8c5d6f0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 23 deletions.
diff --git a/src/main/java/org/ligoj/app/plugin/qa/sonar/SonarPluginResource.java b/src/main/java/org/ligoj/app/plugin/qa/sonar/SonarPluginResource.java
@@ -309,7 +309,7 @@ private List<SonarBranch> getSonarBranches(final String version, final Map<Strin
 						return 1;
 					}
 					return StringUtils.compare(b2.getAnalysisDate(), b1.getAnalysisDate());
-				}).limit(maxBranches).collect(Collectors.toList());
+				}).limit(maxBranches).toList();
 		final var branchMetrics = getParameter(parameters, PARAMETER_METRICS_BRANCHES, defaultMetrics);
 		if (!branchMetrics.isBlank()) {
 			// Get more metrics from each branch

diff --git a/src/main/resources/META-INF/resources/webjars/service/qa/sonarqube/sonarqube.js b/src/main/resources/META-INF/resources/webjars/service/qa/sonarqube/sonarqube.js
@@ -107,7 +107,7 @@ define(function () {
 		renderDetailsFeatures: function (subscription) {
 		    const result = current.renderMetrics(subscription, subscription.data.project);
 		    const branches = (subscription.data.project?.branches||[]).filter(b => !b.isMain).map(b=> {
-                 var parameter;
+                 let parameter = null;
                  let tooltip=`${b.type}<br>${current.$messages.name}: ${b.name}`
                  if (b.pullRequestKey) {
                      parameter=`pullRequest=${b.pullRequestKey}`;

diff --git a/src/test/java/org/ligoj/app/plugin/qa/sonar/SonarCurlProcessorTest.java b/src/test/java/org/ligoj/app/plugin/qa/sonar/SonarCurlProcessorTest.java
@@ -15,28 +15,27 @@
 /**
  * Test class of {@link SonarCurlProcessor}
  */
-public class SonarCurlProcessorTest extends AbstractServerTest {
-	@Test
-	void sonarCurlProcessorTokenGlobal() {
+class SonarCurlProcessorTest extends AbstractServerTest {
+
+
+	private void sonarCurlProcessorToken(final String version, final String token, final String auth) {
 		// Coverage only
-		final var processor = new SonarCurlProcessor("9.9.3", Map.of( SonarPluginResource.PARAMETER_USER,"sqa_1234567890123456789012345678901234567890",
+		final var processor = new SonarCurlProcessor(version, Map.of( SonarPluginResource.PARAMETER_USER,token,
 				SonarPluginResource.PARAMETER_PASSWORD,""));
 		final var request = Mockito.mock(CurlRequest.class);
 		final var headers = new HashMap<String, String>();
 		Mockito.doReturn(headers).when(request).getHeaders();
 		processor.process(request);
-		Assertions.assertEquals("Basic c3FhXzEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTA6",request.getHeaders().get("Authorization"));
+		Assertions.assertEquals("Basic "+auth,request.getHeaders().get("Authorization"));
+	}
+
+	@Test
+	void sonarCurlProcessorTokenGlobal() {
+		sonarCurlProcessorToken("9.9.3", "sqa_1234567890123456789012345678901234567890", "c3FhXzEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTA6");
 	}
 	@Test
 	void sonarCurlProcessorTokenUser() {
-		// Coverage only
-		final var processor = new SonarCurlProcessor("9.9.3", Map.of( SonarPluginResource.PARAMETER_USER,"squ_1234567890123456789012345678901234567890",
-				SonarPluginResource.PARAMETER_PASSWORD,""));
-		final var request = Mockito.mock(CurlRequest.class);
-		final var headers = new HashMap<String, String>();
-		Mockito.doReturn(headers).when(request).getHeaders();
-		processor.process(request);
-		Assertions.assertEquals("Basic c3F1XzEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTA6",request.getHeaders().get("Authorization"));
+		sonarCurlProcessorToken("9.9.3", "squ_1234567890123456789012345678901234567890", "c3F1XzEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTA6");
 	}
 	@Test
 	void sonarCurlProcessorNoCredentials() {
@@ -50,13 +49,6 @@ void sonarCurlProcessorNoCredentials() {
 	}
 	@Test
 	void sonarCurlProcessorTokenUser92() {
-		// Coverage only
-		final var processor = new SonarCurlProcessor("9.2.1", Map.of( SonarPluginResource.PARAMETER_USER,"1234567890123456789012345678901234567890",
-				SonarPluginResource.PARAMETER_PASSWORD,""));
-		final var request = Mockito.mock(CurlRequest.class);
-		final var headers = new HashMap<String, String>();
-		Mockito.doReturn(headers).when(request).getHeaders();
-		processor.process(request);
-		Assertions.assertEquals("Basic MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDo",request.getHeaders().get("Authorization"));
+		sonarCurlProcessorToken("9.2.1", "1234567890123456789012345678901234567890", "MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDo=");
 	}
 }