Fix SonarQube quality issues

3 files changed, 4 insertions, 22 deletions

diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SearchResponseLoader.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SearchResponseLoader.java
index 19dbf4ff7ca..27f29fe0978 100644
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SearchResponseLoader.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SearchResponseLoader.java
@@ -19,7 +19,6 @@
  */
 package org.sonar.server.issue.ws;
 
-import com.google.common.base.Function;
 import com.google.common.collect.ImmutableSet;
 import java.util.Collection;
 import java.util.Collections;
@@ -30,6 +29,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 import org.sonar.api.rule.RuleKey;
@@ -286,12 +286,6 @@ public class SearchResponseLoader {
       }
     }
 
-    void addComponentUuids(@Nullable Collection<String> uuids) {
-      if (uuids != null) {
-        this.componentUuids.addAll(uuids);
-      }
-    }
-
     void addProjectUuid(String uuid) {
       this.projectUuids.add(uuid);
     }
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/PermissionTemplateDtoToPermissionTemplateResponse.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/PermissionTemplateDtoToPermissionTemplateResponse.java
index 2ffd9bbff3c..724c9d47605 100644
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/PermissionTemplateDtoToPermissionTemplateResponse.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ws/template/PermissionTemplateDtoToPermissionTemplateResponse.java
@@ -19,8 +19,7 @@
  */
 package org.sonar.server.permission.ws.template;
 
-import com.google.common.base.Function;
-import javax.annotation.Nonnull;
+import java.util.function.Function;
 import org.sonar.api.utils.DateUtils;
 import org.sonar.db.permission.template.PermissionTemplateDto;
 import org.sonarqube.ws.Permissions.PermissionTemplate;
@@ -40,7 +39,7 @@ public class PermissionTemplateDtoToPermissionTemplateResponse {
   private enum Singleton implements Function<PermissionTemplateDto, PermissionTemplate> {
     INSTANCE;
     @Override
-    public PermissionTemplate apply(@Nonnull PermissionTemplateDto permissionTemplate) {
+    public PermissionTemplate apply(PermissionTemplateDto permissionTemplate) {
       PermissionTemplate.Builder permissionTemplateBuilder = PermissionTemplate.newBuilder()
         .setId(permissionTemplate.getUuid())
         .setName(permissionTemplate.getName())
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileComparison.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileComparison.java
index fdff832b6be..7a3c7698b92 100644
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileComparison.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileComparison.java
@@ -19,7 +19,6 @@
  */
 package org.sonar.server.qualityprofile;
 
-import com.google.common.base.Function;
 import com.google.common.collect.MapDifference;
 import com.google.common.collect.Maps;
 import java.util.Collection;
@@ -28,7 +27,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.annotation.Nonnull;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.server.ServerSide;
 import org.sonar.db.DbClient;
@@ -86,7 +84,7 @@ public class QProfileComparison {
   }
 
   private Map<RuleKey, OrgActiveRuleDto> loadActiveRules(DbSession dbSession, QProfileDto profile) {
-    return Maps.uniqueIndex(dbClient.activeRuleDao().selectByProfile(dbSession, profile), ActiveRuleToRuleKey.INSTANCE);
+    return Maps.uniqueIndex(dbClient.activeRuleDao().selectByProfile(dbSession, profile), ActiveRuleDto::getRuleKey);
   }
 
   public static class QProfileComparisonResult {
@@ -155,15 +153,6 @@ public class QProfileComparison {
     }
   }
 
-  private enum ActiveRuleToRuleKey implements Function<ActiveRuleDto, RuleKey> {
-    INSTANCE;
-
-    @Override
-    public RuleKey apply(@Nonnull ActiveRuleDto input) {
-      return input.getRuleKey();
-    }
-  }
-
   private static Map<String, String> paramDtoToMap(List<ActiveRuleParamDto> params) {
     Map<String, String> map = new HashMap<>();
     for (ActiveRuleParamDto dto : params) {