Apply openrewrite UpgradeToJava17

jenkinsci · Feb 2, 2025 · 6b8e142 · 6b8e142
1 parent e02c874
commit 6b8e142
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/main/java/org/quality/gates/sonar/api/SonarHttpRequester.java b/src/main/java/org/quality/gates/sonar/api/SonarHttpRequester.java
@@ -1,6 +1,5 @@
 package org.quality.gates.sonar.api;
 
-import static java.lang.String.format;
 import static java.net.URLEncoder.encode;
 
 import com.google.gson.GsonBuilder;
@@ -149,7 +148,7 @@ String getAPITaskInfo(JobConfigData configData, SonarInstance sonarInstance) thr
         var sonarProjectTaskInfoPath = getSonarApiTaskInfoUrl();
         var sonarHostUrl = sonarInstance.getUrl();
         var taskInfoUri =
-                sonarHostUrl + format(sonarProjectTaskInfoPath, encode(sonarProjectKey, StandardCharsets.UTF_8));
+                sonarHostUrl + sonarProjectTaskInfoPath.formatted(encode(sonarProjectKey, StandardCharsets.UTF_8));
         var request = new HttpGet(taskInfoUri);
 
         return executeGetRequest(httpClient, request);
@@ -163,8 +162,8 @@ String getAPIInfo(JobConfigData configData, SonarInstance sonarInstance) throws
         checkLogged(sonarInstance);
 
         var sonarApiQualityGates =
-                sonarInstance.getUrl() + format(getSonarApiQualityGatesStatusUrl(), configData.getProjectKey());
-        var request = new HttpGet(format(sonarApiQualityGates, configData.getProjectKey()));
+                sonarInstance.getUrl() + getSonarApiQualityGatesStatusUrl().formatted(configData.getProjectKey());
+        var request = new HttpGet(sonarApiQualityGates.formatted(configData.getProjectKey()));
 
         return executeGetRequest(httpClient, request);
     }
@@ -175,7 +174,7 @@ protected String getComponentId(JobConfigData configData, SonarInstance sonarIns
         checkLogged(sonarInstance);
 
         var sonarApiQualityGates =
-                sonarInstance.getUrl() + format(getSonarApiComponentShow(), configData.getProjectKey());
+                sonarInstance.getUrl() + getSonarApiComponentShow().formatted(configData.getProjectKey());
         var request = new HttpGet(sonarApiQualityGates);
         var result = executeGetRequest(httpClient, request);
         var gson = new GsonBuilder().create();

diff --git a/src/test/java/org/quality/gates/sonar/api/QualityGateResponseParserTest.java b/src/test/java/org/quality/gates/sonar/api/QualityGateResponseParserTest.java
@@ -74,7 +74,12 @@ public void testCreateJSONArrayFromStringWhenStringNotInJSONFormatShouldThrowQGE
     @Test(expected = QGException.class)
     public void testCreateJSONArrayFromStringThrowsExceptionWhenStringISAJSONObjectShouldThrowQGException() {
         qualityGateResponseParser.createJSONArrayFromString(
-                "{\n" + "err_code: 404,\n" + "err_msg: \"Resource not found: wrongProjectKey\"\n" + "}");
+                """
+                {
+                err_code: 404,
+                err_msg: "Resource not found: wrongProjectKey"
+                }\
+                """);
     }
 
     @Test