Fix quality flaws

diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/IsQueueEmptyWs.java b/server/sonar-server/src/main/java/org/sonar/server/ce/ws/IsQueueEmptyWs.java
index 75b40d780b61e39a7145e649960ad81e7c0434f4..7ae95f8dd9d2e9a80d9c2acf9542bd5d161a1143 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/IsQueueEmptyWs.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/ce/ws/IsQueueEmptyWs.java
@@ -27,6 +27,8 @@ import org.sonar.api.server.ws.WebService;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 /**
  * Internal WebService with one action
  */
@@ -69,7 +71,7 @@ public class IsQueueEmptyWs implements WebService {
     public void handle(Request request, Response response) throws Exception {
       try (DbSession dbSession = dbClient.openSession(false)) {
         boolean isQueueEmpty = dbClient.ceQueueDao().selectAllInAscOrder(dbSession).isEmpty();
-        IOUtils.write(String.valueOf(isQueueEmpty), response.stream().output());
+        IOUtils.write(String.valueOf(isQueueEmpty), response.stream().output(), UTF_8);
       }
     }
   }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/UserUpdater.java b/server/sonar-server/src/main/java/org/sonar/server/user/UserUpdater.java
index c5787560dc7b0255f030499aaaf7dc83b38bfbba..9c253a275c25be774c521ff81847897f7cfc99b7 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/user/UserUpdater.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/user/UserUpdater.java
@@ -401,7 +401,7 @@ public class UserUpdater {
     dbClient.userGroupDao().insert(dbSession, new UserGroupDto().setUserId(userDto.getId()).setGroupId(groupDto.get().getId()));
   }
 
-  private boolean isUserAlreadyMemberOfDefaultGroup(String defaultGroupName, String defOrgUuid, List<GroupDto> userGroups) {
+  private static boolean isUserAlreadyMemberOfDefaultGroup(String defaultGroupName, String defOrgUuid, List<GroupDto> userGroups) {
     return userGroups.stream().anyMatch(g -> defOrgUuid.equals(g.getOrganizationUuid()) && g.getName().equals(defaultGroupName));
   }
 

diff --git a/server/sonar-server/src/main/java/org/sonar/server/ws/DeprecatedPropertiesWsFilter.java b/server/sonar-server/src/main/java/org/sonar/server/ws/DeprecatedPropertiesWsFilter.java
index 4555cf42ca929de83e340960f1a2719cbde631f4..9500b1c307a5d4f69aa398348f8b53db3a01a674 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/ws/DeprecatedPropertiesWsFilter.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/ws/DeprecatedPropertiesWsFilter.java
@@ -57,6 +57,7 @@ import static org.sonarqube.ws.client.setting.SettingsWsParameters.PARAM_VALUES;
 public class DeprecatedPropertiesWsFilter extends ServletFilter {
 
   private static final Splitter VALUE_SPLITTER = Splitter.on(",").omitEmptyStrings();
+  private static final String SEPARATOR = "/";
 
   private final WebServiceEngine webServiceEngine;
 
@@ -67,7 +68,7 @@ public class DeprecatedPropertiesWsFilter extends ServletFilter {
   @Override
   public UrlPattern doGetPattern() {
     return UrlPattern.builder()
-      .includes("/" + CONTROLLER_PROPERTIES + "/*")
+      .includes(SEPARATOR + CONTROLLER_PROPERTIES + "/*")
       .build();
   }
 
@@ -181,10 +182,10 @@ public class DeprecatedPropertiesWsFilter extends ServletFilter {
     }
 
     private Optional<String> getKey() {
-      if (originalPath.equals("/" + CONTROLLER_PROPERTIES)) {
+      if (originalPath.equals(SEPARATOR + CONTROLLER_PROPERTIES)) {
         return Optional.empty();
       }
-      String key = originalPath.replace("/" + CONTROLLER_PROPERTIES + "/", "");
+      String key = originalPath.replace(SEPARATOR + CONTROLLER_PROPERTIES + SEPARATOR, "");
       return key.isEmpty() ? Optional.empty() : Optional.of(key);
     }
 
@@ -229,14 +230,14 @@ public class DeprecatedPropertiesWsFilter extends ServletFilter {
         additionalMultiParams.putAll(PARAM_VALUES, values);
       }
       addParameterIfPresent(PARAM_COMPONENT, component);
-      redirectedPath = CONTROLLER_SETTINGS + "/" + ACTION_SET;
+      redirectedPath = CONTROLLER_SETTINGS + SEPARATOR + ACTION_SET;
       redirectedMethod = "POST";
     }
 
     private void redirectToReset(Optional<String> key, Optional<String> component) {
       addParameterIfPresent(PARAM_KEYS, key);
       addParameterIfPresent(PARAM_COMPONENT, component);
-      redirectedPath = CONTROLLER_SETTINGS + "/" + ACTION_RESET;
+      redirectedPath = CONTROLLER_SETTINGS + SEPARATOR + ACTION_RESET;
       redirectedMethod = "POST";
     }
 

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/internal/SimpleGetRequest.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/internal/SimpleGetRequest.java
index f38adc5591dce775b9e1bd120021422be23fffa9..f35960dd1a23e584820164b46aa0b08051d08721 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/internal/SimpleGetRequest.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/internal/SimpleGetRequest.java
@@ -29,6 +29,7 @@ import org.sonar.api.server.ws.LocalConnector;
 import org.sonar.api.server.ws.Request;
 
 import static com.google.common.base.Preconditions.checkNotNull;
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
 
@@ -78,7 +79,7 @@ public class SimpleGetRequest extends Request {
 
   @Override
   public InputStream paramAsInputStream(String key) {
-    return IOUtils.toInputStream(param(key));
+    return IOUtils.toInputStream(param(key), UTF_8);
   }
 
   public SimpleGetRequest setParam(String key, @Nullable String value) {