From 6351e39c12e50cb143618e9a308f0286f3e4a5cd Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Wed, 21 Aug 2019 16:46:50 +0200 Subject: [PATCH] fix some code smells reported by SonarQube --- scm-ui/src/admin/plugins/components/InstallPendingAction.js | 2 +- .../scm/api/v2/resources/PluginDtoCollectionMapper.java | 6 ++---- .../src/main/java/sonia/scm/plugin/PluginInstaller.java | 1 + 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/scm-ui/src/admin/plugins/components/InstallPendingAction.js b/scm-ui/src/admin/plugins/components/InstallPendingAction.js index b46b3fba53..49a444de11 100644 --- a/scm-ui/src/admin/plugins/components/InstallPendingAction.js +++ b/scm-ui/src/admin/plugins/components/InstallPendingAction.js @@ -1,6 +1,6 @@ // @flow import React from "react"; -import { Button, ButtonGroup, Modal } from "@scm-manager/ui-components"; +import { Button } from "@scm-manager/ui-components"; import type { PluginCollection } from "@scm-manager/ui-types"; import { translate } from "react-i18next"; import InstallPendingModal from "./InstallPendingModal"; diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PluginDtoCollectionMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PluginDtoCollectionMapper.java index d04f34ce4a..7c1ee3d5a6 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PluginDtoCollectionMapper.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PluginDtoCollectionMapper.java @@ -50,10 +50,8 @@ public class PluginDtoCollectionMapper { Links.Builder linksBuilder = linkingTo() .with(Links.linkingTo().self(baseUrl).build()); - if (PluginPermissions.manage().isPermitted()) { - if (containsPending(plugins)) { - linksBuilder.single(Link.link("installPending", resourceLinks.availablePluginCollection().installPending())); - } + if (PluginPermissions.manage().isPermitted() && containsPending(plugins)) { + linksBuilder.single(Link.link("installPending", resourceLinks.availablePluginCollection().installPending())); } return linksBuilder.build(); diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/PluginInstaller.java b/scm-webapp/src/main/java/sonia/scm/plugin/PluginInstaller.java index 88b1a469ba..6f003c1e31 100644 --- a/scm-webapp/src/main/java/sonia/scm/plugin/PluginInstaller.java +++ b/scm-webapp/src/main/java/sonia/scm/plugin/PluginInstaller.java @@ -26,6 +26,7 @@ class PluginInstaller { this.client = client; } + @SuppressWarnings("squid:S4790") // hashing should be safe public PendingPluginInstallation install(AvailablePlugin plugin) { Path file = null; try (HashingInputStream input = new HashingInputStream(Hashing.sha256(), download(plugin))) {