From 1457934dc1e472cfd7d22fe098ee8bc2a1141511 Mon Sep 17 00:00:00 2001
From: Pierre <pierre.guillot@sonarsource.com>
Date: Tue, 22 Feb 2022 16:00:47 +0100
Subject: SONAR-7496 drop unused columns on Issues table

---
 .../java/org/sonar/core/issue/DefaultIssue.java    | 36 ++++++----------------
 .../org/sonar/core/issue/DefaultIssueTest.java     | 23 --------------
 2 files changed, 10 insertions(+), 49 deletions(-)

(limited to 'sonar-core/src')

diff --git a/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssue.java b/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssue.java
index 6ea5ecbde85..198bc25d418 100644
--- a/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssue.java
+++ b/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssue.java
@@ -22,7 +22,6 @@ package org.sonar.core.issue;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -75,7 +74,6 @@ public class DefaultIssue implements Issue, Trackable, org.sonar.api.ce.measure.
   private String resolution;
   private String assigneeUuid;
   private String checksum;
-  private Map<String, String> attributes = null;
   private String authorLogin = null;
   private List<DefaultIssueComment> comments = null;
   private Set<String> tags = null;
@@ -475,37 +473,23 @@ public class DefaultIssue implements Issue, Trackable, org.sonar.api.ce.measure.
     return this;
   }
 
+  /**
+   * @deprecated since 9.4, attribute was already not returning any element since 5.2
+   */
+  @Deprecated
   @Override
   @CheckForNull
   public String attribute(String key) {
-    return attributes == null ? null : attributes.get(key);
-  }
-
-  public DefaultIssue setAttribute(String key, @Nullable String value) {
-    if (attributes == null) {
-      attributes = new HashMap<>();
-    }
-    if (value == null) {
-      attributes.remove(key);
-    } else {
-      attributes.put(key, value);
-    }
-    return this;
+    return null;
   }
 
+  /**
+   * @deprecated since 9.4, attribute was already not returning any element since 5.2
+   */
+  @Deprecated
   @Override
   public Map<String, String> attributes() {
-    return attributes == null ? Collections.emptyMap() : ImmutableMap.copyOf(attributes);
-  }
-
-  public DefaultIssue setAttributes(@Nullable Map<String, String> map) {
-    if (map != null) {
-      if (attributes == null) {
-        attributes = new HashMap<>();
-      }
-      attributes.putAll(map);
-    }
-    return this;
+    return new HashMap<>();
   }
 
   @Override
diff --git a/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueTest.java b/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueTest.java
index 1d0eebe493a..97797a5a496 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueTest.java
@@ -116,29 +116,6 @@ public class DefaultIssueTest {
     assertThat(issue.selectedAt()).isNull();
   }
 
-  @Test
-  public void test_attributes() {
-    assertThat(issue.attribute("foo")).isNull();
-    issue.setAttribute("foo", "bar");
-    assertThat(issue.attribute("foo")).isEqualTo("bar");
-    issue.setAttribute("foo", "newbar");
-    assertThat(issue.attribute("foo")).isEqualTo("newbar");
-    issue.setAttribute("foo", null);
-    assertThat(issue.attribute("foo")).isNull();
-  }
-
-  @Test
-  public void setAttributes_should_not_clear_existing_values() {
-    issue.setAttributes(ImmutableMap.of("1", "one"));
-    assertThat(issue.attribute("1")).isEqualTo("one");
-
-    issue.setAttributes(ImmutableMap.of("2", "two"));
-    assertThat(issue.attributes()).containsOnly(entry("1", "one"), entry("2", "two"));
-
-    issue.setAttributes(null);
-    assertThat(issue.attributes()).containsOnly(entry("1", "one"), entry("2", "two"));
-  }
-
   @Test
   public void fail_on_empty_status() {
     try {
-- 
cgit v1.2.3