Fix Quality flaws

diff --git a/server/sonar-server/src/main/java/org/sonar/server/language/ws/ListAction.java b/server/sonar-server/src/main/java/org/sonar/server/language/ws/ListAction.java
index 0c25e1c3b165cf6d0a12e44e79faf0a07f32b15b..17d900dbe2a9571bb2696c6db125ef05e28b18a3 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/language/ws/ListAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/language/ws/ListAction.java
@@ -22,6 +22,11 @@ package org.sonar.server.language.ws;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.io.Resources;
+import java.util.Collection;
+import java.util.List;
+import java.util.SortedMap;
+import java.util.regex.Pattern;
+import javax.annotation.Nullable;
 import org.sonar.api.resources.Language;
 import org.sonar.api.resources.Languages;
 import org.sonar.api.server.ws.Request;
@@ -32,13 +37,6 @@ import org.sonar.api.server.ws.WebService.NewAction;
 import org.sonar.api.server.ws.WebService.Param;
 import org.sonar.api.utils.text.JsonWriter;
 
-import javax.annotation.Nullable;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.SortedMap;
-import java.util.regex.Pattern;
-
 /**
  * @since 5.1
  */
@@ -56,11 +54,13 @@ public class ListAction implements RequestHandler {
     String query = request.param(Param.TEXT_QUERY);
     int pageSize = request.mandatoryParamAsInt("ps");
 
-    JsonWriter json = response.newJsonWriter().beginObject().name("languages").beginArray();
-    for (Language language : listMatchingLanguages(query, pageSize)) {
-      json.beginObject().prop("key", language.getKey()).prop("name", language.getName()).endObject();
+    try (JsonWriter json = response.newJsonWriter()) {
+      json.beginObject().name("languages").beginArray();
+      for (Language language : listMatchingLanguages(query, pageSize)) {
+        json.beginObject().prop("key", language.getKey()).prop("name", language.getName()).endObject();
+      }
+      json.endArray().endObject();
     }
-    json.endArray().endObject().close();
   }
 
   void define(WebService.NewController controller) {

diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ExportersAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ExportersAction.java
index f64b3b4aec3f7522a18f228b88709b176386607f..5052931ab17c12db3d97a4110db61373f506fdb1 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ExportersAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ExportersAction.java
@@ -51,18 +51,20 @@ public class ExportersAction implements QProfileWsAction {
 
   @Override
   public void handle(Request request, Response response) throws Exception {
-    JsonWriter json = response.newJsonWriter().beginObject().name("exporters").beginArray();
-    for (ProfileExporter exporter : exporters) {
-      json.beginObject()
-        .prop("key", exporter.getKey())
-        .prop("name", exporter.getName());
-      json.name("languages").beginArray();
-      for (String language : exporter.getSupportedLanguages()) {
-        json.value(language);
+    try (JsonWriter json = response.newJsonWriter()) {
+      json.beginObject().name("exporters").beginArray();
+      for (ProfileExporter exporter : exporters) {
+        json.beginObject()
+          .prop("key", exporter.getKey())
+          .prop("name", exporter.getName());
+        json.name("languages").beginArray();
+        for (String language : exporter.getSupportedLanguages()) {
+          json.value(language);
+        }
+        json.endArray().endObject();
       }
       json.endArray().endObject();
     }
-    json.endArray().endObject().close();
   }
 
 }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ImportersAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ImportersAction.java
index 67ccefe79bf1bd39a9683443c69411025f0f44ee..1d820cfca8cc3e0294e71d17745439f6be857a8c 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ImportersAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ImportersAction.java
@@ -48,17 +48,19 @@ public class ImportersAction implements QProfileWsAction {
 
   @Override
   public void handle(Request request, Response response) throws Exception {
-    JsonWriter json = response.newJsonWriter().beginObject().name("importers").beginArray();
-    for (ProfileImporter importer : importers) {
-      json.beginObject()
-        .prop("key", importer.getKey())
-        .prop("name", importer.getName())
-        .name("languages").beginArray();
-      for (String languageKey : importer.getSupportedLanguages()) {
-        json.value(languageKey);
+    try (JsonWriter json = response.newJsonWriter()) {
+      json.beginObject().name("importers").beginArray();
+      for (ProfileImporter importer : importers) {
+        json.beginObject()
+          .prop("key", importer.getKey())
+          .prop("name", importer.getName())
+          .name("languages").beginArray();
+        for (String languageKey : importer.getSupportedLanguages()) {
+          json.value(languageKey);
+        }
+        json.endArray().endObject();
       }
       json.endArray().endObject();
     }
-    json.endArray().endObject().close();
   }
 }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RepositoriesAction.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RepositoriesAction.java
index 1d3f0c7f3191fbbe2694c223b1491593b230aaf6..f817e2271e2bde987761970328e0d3cab9a9a054 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RepositoriesAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RepositoriesAction.java
@@ -71,16 +71,18 @@ public class RepositoriesAction implements RulesWsAction {
     String query = request.param(Param.TEXT_QUERY);
     String languageKey = request.param(LANGUAGE);
 
-    JsonWriter json = response.newJsonWriter().beginObject().name("repositories").beginArray();
-    for (RuleRepositoryDto repo : listMatchingRepositories(query, languageKey)) {
-      json
-        .beginObject()
-        .prop("key", repo.getKey())
-        .prop("name", repo.getName())
-        .prop(LANGUAGE, repo.getLanguage())
-        .endObject();
+    try (JsonWriter json = response.newJsonWriter()) {
+      json.beginObject().name("repositories").beginArray();
+      for (RuleRepositoryDto repo : listMatchingRepositories(query, languageKey)) {
+        json
+          .beginObject()
+          .prop("key", repo.getKey())
+          .prop("name", repo.getName())
+          .prop(LANGUAGE, repo.getLanguage())
+          .endObject();
+      }
+      json.endArray().endObject();
     }
-    json.endArray().endObject().close();
   }
 
   private Collection<RuleRepositoryDto> listMatchingRepositories(@Nullable String query, @Nullable String languageKey) {

diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/TagsAction.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/TagsAction.java
index 77315ccaba4b0733770f4b52198739b1a68df8d5..16f926667de93a6c45bfa903f26a6fa8c38b3174 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/TagsAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/TagsAction.java
@@ -96,9 +96,10 @@ public class TagsAction implements RulesWsAction {
   }
 
   private static void writeResponse(Response response, List<String> tags) {
-    JsonWriter json = response.newJsonWriter().beginObject();
-    json.name("tags").beginArray();
-    tags.forEach(json::value);
-    json.endArray().endObject().close();
+    try (JsonWriter json = response.newJsonWriter()) {
+      json.beginObject().name("tags").beginArray();
+      tags.forEach(json::value);
+      json.endArray().endObject();
+    }
   }
 }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/ws/IndexAction.java b/server/sonar-server/src/main/java/org/sonar/server/source/ws/IndexAction.java
index 819a6da0a9c7ca61bc2181956934b6a00c56d8ab..a43d755a6b4d313ce58b944651aca1d1311cd521 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/source/ws/IndexAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/source/ws/IndexAction.java
@@ -81,15 +81,17 @@ public class IndexAction implements SourcesWsAction {
       ComponentDto component = componentFinder.getByKey(session, fileKey);
       userSession.checkComponentPermission(UserRole.CODEVIEWER, component);
       Optional<Iterable<String>> lines = sourceService.getLinesAsRawText(session, component.uuid(), from, to == null ? Integer.MAX_VALUE : (to - 1));
-      JsonWriter json = response.newJsonWriter().beginArray().beginObject();
-      if (lines.isPresent()) {
-        int lineCounter = from;
-        for (String line : lines.get()) {
-          json.prop(String.valueOf(lineCounter), line);
-          lineCounter++;
+      try (JsonWriter json = response.newJsonWriter()) {
+        json.beginArray().beginObject();
+        if (lines.isPresent()) {
+          int lineCounter = from;
+          for (String line : lines.get()) {
+            json.prop(String.valueOf(lineCounter), line);
+            lineCounter++;
+          }
         }
+        json.endObject().endArray();
       }
-      json.endObject().endArray().close();
     }
   }
 }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/ws/LinesAction.java b/server/sonar-server/src/main/java/org/sonar/server/source/ws/LinesAction.java
index 9165fb0885479e8e8732b65344247c4281b2c2cf..600c53a917ae145dc1cbbc10fbbd4502bb8e3c06 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/source/ws/LinesAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/source/ws/LinesAction.java
@@ -120,9 +120,11 @@ public class LinesAction implements SourcesWsAction {
       int to = MoreObjects.firstNonNull(request.paramAsInt(PARAM_TO), Integer.MAX_VALUE);
 
       Iterable<DbFileSources.Line> lines = checkFoundWithOptional(sourceService.getLines(dbSession, file.uuid(), from, to), "No source found for file '%s'", file.key());
-      JsonWriter json = response.newJsonWriter().beginObject();
-      writeSource(lines, json);
-      json.endObject().close();
+      try (JsonWriter json = response.newJsonWriter()) {
+        json.beginObject();
+        writeSource(lines, json);
+        json.endObject();
+      }
     }
   }
 

diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/ws/ShowAction.java b/server/sonar-server/src/main/java/org/sonar/server/source/ws/ShowAction.java
index 2c4a226a4d303ff7ec9899068cf17166f1467f55..ff425b8bb5d3b187331171facc2b01721e7074c1 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/source/ws/ShowAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/source/ws/ShowAction.java
@@ -91,10 +91,11 @@ public class ShowAction implements SourcesWsAction {
       userSession.checkComponentPermission(UserRole.CODEVIEWER, file);
 
       Iterable<String> linesHtml = checkFoundWithOptional(sourceService.getLinesAsHtml(dbSession, file.uuid(), from, to), "No source found for file '%s'", fileKey);
-      JsonWriter json = response.newJsonWriter().beginObject();
-      writeSource(linesHtml, from, json);
-      json.endObject().close();
-
+      try (JsonWriter json = response.newJsonWriter()) {
+        json.beginObject();
+        writeSource(linesHtml, from, json);
+        json.endObject();
+      }
     }
   }
 

diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalAction.java b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalAction.java
index 05c727707f063510d5e6deccc19169079b920ef9..cc3372f1bf58f65b09e08a77531344ae3eb2e748 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalAction.java
@@ -90,16 +90,18 @@ public class GlobalAction implements NavigationWsAction {
 
   @Override
   public void handle(Request request, Response response) throws Exception {
-    JsonWriter json = response.newJsonWriter().beginObject();
-    writeActions(json);
-    writePages(json);
-    writeSettings(json);
-    writeDeprecatedLogoProperties(json);
-    writeQualifiers(json);
-    writeVersion(json);
-    writeDatabaseProduction(json);
-    writeOrganizationSupport(json);
-    json.endObject().close();
+    try (JsonWriter json = response.newJsonWriter()) {
+      json.beginObject();
+      writeActions(json);
+      writePages(json);
+      writeSettings(json);
+      writeDeprecatedLogoProperties(json);
+      writeQualifiers(json);
+      writeVersion(json);
+      writeDatabaseProduction(json);
+      writeOrganizationSupport(json);
+      json.endObject();
+    }
   }
 
   private void writeActions(JsonWriter json) {

diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/SettingsAction.java b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/SettingsAction.java
index 923affa0c3ba142b8a4c6b3d77d07d30b241565e..a9465bbd0a9a8c3438173f35d6e63302c83513f1 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/SettingsAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/SettingsAction.java
@@ -59,20 +59,20 @@ public class SettingsAction implements NavigationWsAction {
   public void handle(Request request, Response response) throws Exception {
     boolean isSysAdmin = userSession.isSystemAdministrator();
 
-    JsonWriter json = response.newJsonWriter().beginObject();
-    json.prop("showUpdateCenter", isSysAdmin && config.getBoolean(WebConstants.SONAR_UPDATECENTER_ACTIVATE).orElse(false));
+    try (JsonWriter json = response.newJsonWriter()) {
+      json.beginObject();
+      json.prop("showUpdateCenter", isSysAdmin && config.getBoolean(WebConstants.SONAR_UPDATECENTER_ACTIVATE).orElse(false));
 
-    json.name("extensions").beginArray();
-    if (isSysAdmin) {
-      for (Page page : pageRepository.getGlobalPages(true)) {
-        json.beginObject()
-          .prop("key", page.getKey())
-          .prop("name", page.getName())
-          .endObject();
+      json.name("extensions").beginArray();
+      if (isSysAdmin) {
+        for (Page page : pageRepository.getGlobalPages(true)) {
+          json.beginObject()
+            .prop("key", page.getKey())
+            .prop("name", page.getName())
+            .endObject();
+        }
       }
+      json.endArray().endObject();
     }
-    json.endArray();
-
-    json.endObject().close();
   }
 }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/DeactivateAction.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/DeactivateAction.java
index 94ec4c6926ab04f6a913fd6e4f8c4e0652af4880..a3f702db63ffc24bea91bbc32fef1a3aaf00e042 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/DeactivateAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/user/ws/DeactivateAction.java
@@ -115,12 +115,14 @@ public class DeactivateAction implements UsersWsAction {
       // when deactivating user
       checkFound(user, "User '%s' doesn't exist", login);
 
-      JsonWriter json = response.newJsonWriter().beginObject();
-      json.name("user");
-      Set<String> groups = Sets.newHashSet();
-      groups.addAll(dbClient.groupMembershipDao().selectGroupsByLogins(dbSession, singletonList(login)).get(login));
-      userWriter.write(json, user, groups, UserJsonWriter.FIELDS);
-      json.endObject().close();
+      try (JsonWriter json = response.newJsonWriter()) {
+        json.beginObject();
+        json.name("user");
+        Set<String> groups = Sets.newHashSet();
+        groups.addAll(dbClient.groupMembershipDao().selectGroupsByLogins(dbSession, singletonList(login)).get(login));
+        userWriter.write(json, user, groups, UserJsonWriter.FIELDS);
+        json.endObject();
+      }
     }
   }