From b0076e14dc51ccb9304063b1d4f108041f2cc6a0 Mon Sep 17 00:00:00 2001 From: Matteo Mara Date: Thu, 30 Mar 2023 16:16:34 +0200 Subject: [PATCH] [NO-JIRA] Remove generic code smells --- .../src/main/java/org/sonar/auth/saml/SamlSettings.java | 3 ++- .../src/main/java/org/sonar/db/issue/IssueTesting.java | 2 -- .../org/sonar/server/platform/monitoring/SettingsSection.java | 2 +- .../org/sonar/server/permission/ws/RemoveGroupActionIT.java | 3 ++- .../main/java/org/sonar/server/ce/queue/CeQueueCleaner.java | 1 - 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/server/sonar-auth-saml/src/main/java/org/sonar/auth/saml/SamlSettings.java b/server/sonar-auth-saml/src/main/java/org/sonar/auth/saml/SamlSettings.java index d4a71907f60..3da572ea2af 100644 --- a/server/sonar-auth-saml/src/main/java/org/sonar/auth/saml/SamlSettings.java +++ b/server/sonar-auth-saml/src/main/java/org/sonar/auth/saml/SamlSettings.java @@ -188,7 +188,8 @@ public class SamlSettings { .build(), PropertyDefinition.builder(GROUP_NAME_ATTRIBUTE) .name("SAML group attribute") - .description("Attribute defining the user groups in SAML, used to synchronize group memberships. If you leave this field empty, group memberships are managed locally by SonarQube administrators.") + .description("Attribute defining the user groups in SAML, used to synchronize group memberships. If you leave this field empty, " + + "group memberships are managed locally by SonarQube administrators.") .category(CATEGORY) .subCategory(SUBCATEGORY) .index(10) diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/issue/IssueTesting.java b/server/sonar-db-dao/src/main/java/org/sonar/db/issue/IssueTesting.java index b4bce20d4cc..88f6520476c 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/issue/IssueTesting.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/issue/IssueTesting.java @@ -24,8 +24,6 @@ import org.apache.commons.lang.math.RandomUtils; import org.sonar.api.issue.Issue; import org.sonar.api.resources.Qualifiers; import org.sonar.api.rule.Severity; -import org.sonar.api.rules.RuleType; -import org.sonar.api.utils.DateUtils; import org.sonar.core.util.UuidFactoryFast; import org.sonar.core.util.Uuids; import org.sonar.db.component.ComponentDto; diff --git a/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/SettingsSection.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/SettingsSection.java index 5ba82ce3154..8ed2a63d597 100644 --- a/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/SettingsSection.java +++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/SettingsSection.java @@ -91,7 +91,7 @@ public class SettingsSection implements SystemInfoSection, Global { return protobuf.build(); } - private void includeSetting(Builder protobuf, PropertyDefinitions definitions, Entry prop) { + private static void includeSetting(Builder protobuf, PropertyDefinitions definitions, Entry prop) { String key = prop.getKey(); String value = obfuscateValue(definitions, key, prop.getValue()); setAttribute(protobuf, key, value); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/ws/RemoveGroupActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/ws/RemoveGroupActionIT.java index c8c4419e439..c82e1e50026 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/ws/RemoveGroupActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/permission/ws/RemoveGroupActionIT.java @@ -153,8 +153,9 @@ public class RemoveGroupActionIT extends BasePermissionWsIT { db.users().insertPermissionOnGroup(aGroup, GlobalPermission.PROVISION_PROJECTS); loginAsAdmin(); + String administerPermission = GlobalPermission.ADMINISTER.getKey(); assertThatThrownBy(() -> { - executeRequest(aGroup, GlobalPermission.ADMINISTER.getKey()); + executeRequest(aGroup, administerPermission); }) .isInstanceOf(BadRequestException.class) .hasMessage("Last group with permission 'admin'. Permission cannot be removed."); diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/queue/CeQueueCleaner.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/queue/CeQueueCleaner.java index f59d99d528e..4d0400b2833 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/queue/CeQueueCleaner.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/queue/CeQueueCleaner.java @@ -21,7 +21,6 @@ package org.sonar.server.ce.queue; import java.util.List; import org.sonar.api.Startable; -import org.sonar.api.config.Configuration; import org.sonar.api.platform.ServerUpgradeStatus; import org.sonar.api.server.ServerSide; import org.sonar.api.utils.log.Logger; -- 2.39.5