From: Guillaume Jambet <guillaume.jambet@sonarsource.com>
Date: Thu, 2 Nov 2017 15:38:40 +0000 (+0100)
Subject: SONAR-10040 clean code
X-Git-Tag: 7.0-RC1~360
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f3d255a3ffa4199e30e6956dad52e5e572f0de0d;p=sonarqube.git

SONAR-10040 clean code
---

diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueFieldsSetter.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueFieldsSetter.java
index 1bfdd848ce8..6ee216bf721 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueFieldsSetter.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueFieldsSetter.java
@@ -286,7 +286,7 @@ public class IssueFieldsSetter {
   public boolean setEffort(DefaultIssue issue, @Nullable Duration value, IssueChangeContext context) {
     Duration oldValue = issue.effort();
     if (!Objects.equals(value, oldValue)) {
-      issue.setEffort(value != null ? value : null);
+      issue.setEffort(value);
       issue.setFieldChange(context, TECHNICAL_DEBT, oldValue != null ? oldValue.toMinutes() : null, value != null ? value.toMinutes() : null);
       issue.setUpdateDate(context.date());
       issue.setChanged(true);
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/license/ws/list-example.json b/server/sonar-server/src/main/resources/org/sonar/server/license/ws/list-example.json
deleted file mode 100644
index f8a7526000d..00000000000
--- a/server/sonar-server/src/main/resources/org/sonar/server/license/ws/list-example.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "licenses": [
-    {
-      "key": "sonar.devcockpit.license.secured",
-      "name": "Dev Cockpit",
-      "value": "ABCD",
-      "product": "other",
-      "organization": "Unknown",
-      "expiration": "2010-01-01",
-      "serverId": "54321",
-      "type": "EVALUATION",
-      "invalidProduct": true,
-      "invalidExpiration": true,
-      "invalidServerId": true
-    },
-    {
-      "key": "sonar.governance.license.secured",
-      "name": "Governance",
-      "value": "EFHG",
-      "product": "governance",
-      "organization": "SonarSource",
-      "expiration": "2099-01-01",
-      "serverId": "12345",
-      "type": "PRODUCTION",
-      "additionalProperties": {
-        "other": "value"
-      }
-    }
-  ]
-}