Drop org.sonar.api.check.IsoCategory

3 files changed, 2 insertions, 40 deletions

diff --git a/sonar-check-api/src/main/java/org/sonar/check/IsoCategory.java b/sonar-check-api/src/main/java/org/sonar/check/IsoCategory.java
deleted file mode 100644
index 23defd0fb66..00000000000
--- a/sonar-check-api/src/main/java/org/sonar/check/IsoCategory.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2013 SonarSource
- * mailto:contact AT sonarsource DOT com
- *
- * SonarQube is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * SonarQube is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.sonar.check;
-
-/**
- * @deprecated since 2.5. See http://jira.codehaus.org/browse/SONAR-2007
- */
-@Deprecated
-public enum IsoCategory {
-
-  Reliability, Efficiency, Portability, Usability, Maintainability, NONE
-  
-}
diff --git a/sonar-check-api/src/main/java/org/sonar/check/Rule.java b/sonar-check-api/src/main/java/org/sonar/check/Rule.java
index c87d9386379..5da530f5aa8 100644
--- a/sonar-check-api/src/main/java/org/sonar/check/Rule.java
+++ b/sonar-check-api/src/main/java/org/sonar/check/Rule.java
@@ -51,14 +51,6 @@ public @interface Rule {
    */
   Priority priority() default Priority.MAJOR;
 
-  /**
-   * Will probably be deprecated and replaced by tags
-   * 
-   * @deprecated since 2.5. See http://jira.codehaus.org/browse/SONAR-2007
-   */
-  @Deprecated
-  IsoCategory isoCategory() default IsoCategory.NONE;
-
   Cardinality cardinality() default Cardinality.SINGLE;
 
   /**
diff --git a/sonar-ws-client/src/test/java/org/sonar/wsclient/issue/IssueQueryTest.java b/sonar-ws-client/src/test/java/org/sonar/wsclient/issue/IssueQueryTest.java
index cffe192920d..f6dbdf3d84f 100644
--- a/sonar-ws-client/src/test/java/org/sonar/wsclient/issue/IssueQueryTest.java
+++ b/sonar-ws-client/src/test/java/org/sonar/wsclient/issue/IssueQueryTest.java
@@ -44,7 +44,7 @@ public class IssueQueryTest {
       .statuses("OPEN", "CLOSED")
       .severities("BLOCKER", "INFO")
       .userLogins("login1", "login2")
-      .sort("assignee")
+      .sort("ASSIGNEE")
       .asc(false)
       .pageSize(5)
       .pageIndex(4);
@@ -59,7 +59,7 @@ public class IssueQueryTest {
     assertThat(query.urlParams()).includes(entry("statuses", "OPEN,CLOSED"));
     assertThat(query.urlParams()).includes(entry("severities", "BLOCKER,INFO"));
     assertThat(query.urlParams()).includes(entry("userLogins", "login1,login2"));
-    assertThat(query.urlParams()).includes(entry("sort", "assignee"));
+    assertThat(query.urlParams()).includes(entry("sort", "ASSIGNEE"));
     assertThat(query.urlParams()).includes(entry("asc", false));
     assertThat(query.urlParams()).includes(entry("pageSize", 5));
     assertThat(query.urlParams()).includes(entry("pageIndex", 4));