Fix Quality flaws

diff --git a/it/it-tests/src/test/java/it/user/SsoAuthenticationTest.java b/it/it-tests/src/test/java/it/user/SsoAuthenticationTest.java
index a9313f087d468b07682c404f2533f3e16a8328b5..50d25bcb3b617ed20d4bd2b12ece70896b8716d0 100644 (file)
--- a/it/it-tests/src/test/java/it/user/SsoAuthenticationTest.java
+++ b/it/it-tests/src/test/java/it/user/SsoAuthenticationTest.java
@@ -24,14 +24,13 @@ import java.net.URLEncoder;
 import java.util.List;
 import javax.annotation.Nullable;
 import okhttp3.Response;
-import org.apache.commons.io.Charsets;
 import org.apache.commons.io.FileUtils;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Test;
 import util.user.UserRule;
 
-import static com.google.common.base.Charsets.UTF_8;
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
 import static util.ItUtils.call;
 
@@ -130,7 +129,7 @@ public class SsoAuthenticationTest {
     assertThat(response.code()).isEqualTo(200);
     assertThat(response.request().url().toString()).contains("sessions/unauthorized");
 
-    List<String> logsLines = FileUtils.readLines(orchestrator.getServer().getWebLogs(), Charsets.UTF_8);
+    List<String> logsLines = FileUtils.readLines(orchestrator.getServer().getWebLogs(), UTF_8);
     assertThat(logsLines).doesNotContain("org.sonar.server.exceptions.BadRequestException: Use only letters, numbers, and .-_@ please.");
     USER_RULE.verifyUserDoesNotExist(USER_LOGIN);
   }
@@ -144,7 +143,7 @@ public class SsoAuthenticationTest {
     String expectedError = "You can't sign up because email 'tester@email.com' is already used by an existing user. This means that you probably already registered with another account";
     assertThat(response.code()).isEqualTo(200);
     assertThat(response.request().url().toString()).contains(URLEncoder.encode(expectedError, UTF_8.name()));
-    assertThat(FileUtils.readLines(orchestrator.getServer().getWebLogs(), Charsets.UTF_8)).doesNotContain(expectedError);
+    assertThat(FileUtils.readLines(orchestrator.getServer().getWebLogs(), UTF_8)).doesNotContain(expectedError);
   }
 
   private static Response doCall(String login, @Nullable String name, @Nullable String email, @Nullable String groups) {

diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/AuthenticationError.java b/server/sonar-server/src/main/java/org/sonar/server/authentication/AuthenticationError.java
index 2d22aebc7e7a75db03b7799a67f4c4192a5c0558..89f728a67876551febe208665aa7859c745d248b 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/AuthenticationError.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/authentication/AuthenticationError.java
@@ -19,7 +19,6 @@
  */
 package org.sonar.server.authentication;
 
-import com.google.common.base.Charsets;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import javax.servlet.http.HttpServletResponse;
@@ -29,6 +28,7 @@ import org.sonar.server.authentication.event.AuthenticationException;
 
 import static java.lang.String.format;
 import static java.net.URLEncoder.encode;
+import static java.nio.charset.StandardCharsets.UTF_8;
 
 final class AuthenticationError {
 
@@ -64,7 +64,7 @@ final class AuthenticationError {
 
   private static String encodeMessage(String message) {
     try {
-      return encode(message, Charsets.UTF_8.name());
+      return encode(message, UTF_8.name());
     } catch (UnsupportedEncodingException e) {
       throw new IllegalStateException(format("Fail to encode %s", message), e);
     }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/BasicAuthenticator.java b/server/sonar-server/src/main/java/org/sonar/server/authentication/BasicAuthenticator.java
index ea87bddd990b43bbe32a30e40417bceb4f79e83d..f13d0f378e42d90ae52125191f5ac8dac811ad3b 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/BasicAuthenticator.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/authentication/BasicAuthenticator.java
@@ -19,7 +19,6 @@
  */
 package org.sonar.server.authentication;
 
-import com.google.common.base.Charsets;
 import java.util.Base64;
 import java.util.Optional;
 import javax.servlet.http.HttpServletRequest;
@@ -30,6 +29,7 @@ import org.sonar.server.authentication.event.AuthenticationEvent;
 import org.sonar.server.authentication.event.AuthenticationException;
 import org.sonar.server.usertoken.UserTokenAuthenticator;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Locale.ENGLISH;
 import static org.apache.commons.lang.StringUtils.isEmpty;
 import static org.sonar.server.authentication.event.AuthenticationEvent.Method;
@@ -86,7 +86,7 @@ public class BasicAuthenticator {
 
   private static String getDecodedBasicAuth(String basicAuthEncoded) {
     try {
-      return new String(BASE64_DECODER.decode(basicAuthEncoded.getBytes(Charsets.UTF_8)), Charsets.UTF_8);
+      return new String(BASE64_DECODER.decode(basicAuthEncoded.getBytes(UTF_8)), UTF_8);
     } catch (Exception e) {
       throw AuthenticationException.newBuilder()
         .setSource(Source.local(Method.BASIC))

diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/UserIdentityAuthenticator.java b/server/sonar-server/src/main/java/org/sonar/server/authentication/UserIdentityAuthenticator.java
index 8ddb2154bd5ba4806b1c86c363bb57f145b0b7b7..d679ac9c78396e5bb1eb378d36b8a4f08239aebf 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/UserIdentityAuthenticator.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/authentication/UserIdentityAuthenticator.java
@@ -19,7 +19,6 @@
  */
 package org.sonar.server.authentication;
 
-import com.google.common.base.Function;
 import com.google.common.collect.Sets;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -27,7 +26,6 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
-import javax.annotation.Nonnull;
 import org.sonar.api.server.authentication.IdentityProvider;
 import org.sonar.api.server.authentication.UserIdentity;
 import org.sonar.api.utils.log.Logger;
@@ -46,9 +44,9 @@ import org.sonar.server.user.NewUser;
 import org.sonar.server.user.UpdateUser;
 import org.sonar.server.user.UserUpdater;
 
-import static com.google.common.collect.FluentIterable.from;
 import static java.lang.String.format;
 import static java.util.Collections.singletonList;
+import static org.sonar.core.util.stream.Collectors.uniqueIndex;
 
 public class UserIdentityAuthenticator {
 
@@ -69,8 +67,7 @@ public class UserIdentityAuthenticator {
   }
 
   private UserDto register(UserIdentity user, IdentityProvider provider, AuthenticationEvent.Source source) {
-    DbSession dbSession = dbClient.openSession(false);
-    try {
+    try (DbSession dbSession = dbClient.openSession(false)) {
       String userLogin = user.getLogin();
       UserDto userDto = dbClient.userDao().selectByLogin(dbSession, userLogin);
       if (userDto != null && userDto.isActive()) {
@@ -78,8 +75,6 @@ public class UserIdentityAuthenticator {
         return userDto;
       }
       return registerNewUser(dbSession, user, provider, source);
-    } finally {
-      dbClient.closeSession(dbSession);
     }
   }
 
@@ -88,7 +83,7 @@ public class UserIdentityAuthenticator {
       throw AuthenticationException.newBuilder()
         .setSource(source)
         .setLogin(user.getLogin())
-        .setMessage("User signup disabled for provider '" + provider.getKey() + "'")
+        .setMessage(format("User signup disabled for provider '%s'", provider.getKey()))
         .setPublicMessage(format("'%s' users are not allowed to sign up", provider.getKey()))
         .build();
     }
@@ -138,7 +133,9 @@ public class UserIdentityAuthenticator {
       Collection<String> allGroups = new ArrayList<>(groupsToAdd);
       allGroups.addAll(groupsToRemove);
       DefaultOrganization defaultOrganization = defaultOrganizationProvider.get();
-      Map<String, GroupDto> groupsByName = from(dbClient.groupDao().selectByNames(dbSession, defaultOrganization.getUuid(), allGroups)).uniqueIndex(GroupDtoToName.INSTANCE);
+      Map<String, GroupDto> groupsByName = dbClient.groupDao().selectByNames(dbSession, defaultOrganization.getUuid(), allGroups)
+        .stream()
+        .collect(uniqueIndex(GroupDto::getName));
 
       addGroups(dbSession, userDto, groupsToAdd, groupsByName);
       removeGroups(dbSession, userDto, groupsToRemove, groupsByName);
@@ -162,13 +159,4 @@ public class UserIdentityAuthenticator {
         dbClient.userGroupDao().delete(dbSession, groupDto.getId(), userDto.getId());
       });
   }
-
-  private enum GroupDtoToName implements Function<GroupDto, String> {
-    INSTANCE;
-
-    @Override
-    public String apply(@Nonnull GroupDto input) {
-      return input.getName();
-    }
-  }
 }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/OrganizationFlagsImpl.java b/server/sonar-server/src/main/java/org/sonar/server/organization/OrganizationFlagsImpl.java
index d4f6540af8c9329a96cf8ed2063d449daa8b5fb8..d0d674f5f8bb106ef99d30d972a9b4b36c7339ac 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/organization/OrganizationFlagsImpl.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/organization/OrganizationFlagsImpl.java
@@ -39,7 +39,7 @@ public class OrganizationFlagsImpl implements OrganizationFlags {
   @Override
   public boolean isEnabled(DbSession dbSession) {
     Optional<String> value = dbClient.internalPropertiesDao().selectByKey(dbSession, InternalProperties.ORGANIZATION_ENABLED);
-    return value.map(s -> "true".equals(s)).orElse(false);
+    return value.map("true"::equals).orElse(false);
   }
 
   @Override

diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/BasicAuthenticatorTest.java b/server/sonar-server/src/test/java/org/sonar/server/authentication/BasicAuthenticatorTest.java
index 614b50ec0bbae2045e1ed8f1a6a6fed43b038068..b5a83947d1b33c29dbfe4e042e46cbe317f0ee21 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/BasicAuthenticatorTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/authentication/BasicAuthenticatorTest.java
@@ -34,7 +34,7 @@ import org.sonar.db.user.UserTesting;
 import org.sonar.server.authentication.event.AuthenticationEvent;
 import org.sonar.server.usertoken.UserTokenAuthenticator;
 
-import static com.google.common.base.Charsets.UTF_8;
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.junit.rules.ExpectedException.none;
 import static org.mockito.Mockito.mock;

diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/TreeActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/TreeActionTest.java
index 5354124ede27ae45c3397d5e524289eca37bfd13..cefec3d211722ae90511ca2f03bdb40cb838de0d 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/TreeActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/component/ws/TreeActionTest.java
@@ -19,7 +19,6 @@
  */
 package org.sonar.server.component.ws;
 
-import com.google.common.base.Charsets;
 import com.google.common.base.Throwables;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
@@ -59,6 +58,7 @@ import org.sonar.test.JsonAssert;
 import org.sonarqube.ws.MediaTypes;
 import org.sonarqube.ws.WsComponents.TreeWsResponse;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.sonar.db.component.ComponentTesting.newDevProjectCopy;
 import static org.sonar.db.component.ComponentTesting.newDeveloper;
@@ -411,7 +411,7 @@ public class TreeActionTest {
     SnapshotDto projectSnapshot = componentDb.insertProjectAndSnapshot(project);
     Date now = new Date();
     JsonParser jsonParser = new JsonParser();
-    JsonElement jsonTree = jsonParser.parse(IOUtils.toString(getClass().getResource("tree-example.json"), Charsets.UTF_8));
+    JsonElement jsonTree = jsonParser.parse(IOUtils.toString(getClass().getResource("tree-example.json"), UTF_8));
     JsonArray components = jsonTree.getAsJsonObject().getAsJsonArray("components");
     for (JsonElement componentAsJsonElement : components) {
       JsonObject componentAsJsonObject = componentAsJsonElement.getAsJsonObject();

diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileExportersTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileExportersTest.java
index ea206182f34bfa99b3eb78205cac7cfb02a5f2e6..a95f0e80661af8159fa4e1c009c94d8a6534452d 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileExportersTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileExportersTest.java
@@ -49,7 +49,7 @@ import org.sonar.server.rule.index.RuleQuery;
 import org.sonar.server.tester.ServerTester;
 import org.sonar.server.tester.UserSessionRule;
 
-import static com.google.common.base.Charsets.UTF_8;
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.apache.commons.io.IOUtils.toInputStream;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;