Deprecate some classes from org.sonar.api.web.gwt.client.webservices

15 files changed, 82 insertions, 22 deletions

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/AbstractResourceQuery.java b/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/AbstractResourceQuery.java
index 9c2e6c2de8a..59eb1744f83 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/AbstractResourceQuery.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/AbstractResourceQuery.java
@@ -19,7 +19,10 @@
  */
 package org.sonar.api.web.gwt.client.webservices;
 
-
+/**
+ * @deprecated since 2.5
+ */
+@Deprecated
 public abstract class AbstractResourceQuery<R extends ResponsePOJO> extends Query<R> {
 
   private String resourceKey;
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/FileSource.java b/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/FileSource.java
index 82224296a97..395687c84da 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/FileSource.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/FileSource.java
@@ -21,6 +21,10 @@ package org.sonar.api.web.gwt.client.webservices;
 
 import java.util.Map;
 
+/**
+ * @deprecated since 2.5, use {@link org.sonar.wsclient.services.Source} instead.
+ */
+@Deprecated
 public class FileSource extends ResponsePOJO {
 
   private Map<Integer, String> sourceLines;
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/Measure.java b/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/Measure.java
index 40f32459096..36a72215de4 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/Measure.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/Measure.java
@@ -23,6 +23,10 @@ import java.util.Date;
 import java.util.Map;
 import java.util.TreeMap;
 
+/**
+ * @deprecated since 2.5, use {@link org.sonar.wsclient.services.Measure} instead.
+ */
+@Deprecated
 public class Measure {
   private String metric;
   private String metricName;
@@ -33,7 +37,7 @@ public class Measure {
   private String ruleKey;
   private String ruleName;
   private String rulePriority;
-  
+
   private Date date;
 
   public Measure() {
@@ -129,7 +133,7 @@ public class Measure {
   public void setRulePriority(String rulePriority) {
     this.rulePriority = rulePriority;
   }
-  
+
   public Date getDate() {
     return date;
   }
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/MetricsQuery.java b/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/MetricsQuery.java
index b63268842a8..7499c0e9a14 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/MetricsQuery.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/MetricsQuery.java
@@ -19,18 +19,21 @@
  */
 package org.sonar.api.web.gwt.client.webservices;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.sonar.api.web.gwt.client.Utils;
-import org.sonar.api.web.gwt.client.webservices.WSMetrics.MetricsList;
-
 import com.google.gwt.core.client.JavaScriptObject;
 import com.google.gwt.json.client.JSONArray;
 import com.google.gwt.json.client.JSONObject;
+import org.sonar.api.web.gwt.client.Utils;
+import org.sonar.api.web.gwt.client.webservices.WSMetrics.MetricsList;
 
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @deprecated since 2.5, use {@link org.sonar.wsclient.services.MetricQuery} instead.
+ */
+@Deprecated
 public final class MetricsQuery extends Query<MetricsList> {
-  
+
   private Boolean userManaged;
   private List<WSMetrics.Metric.ValueType> excludedTypes = new ArrayList<WSMetrics.Metric.ValueType>();
 
@@ -41,7 +44,7 @@ public final class MetricsQuery extends Query<MetricsList> {
   private MetricsQuery() {
     super();
   }
-  
+
   public Boolean isUserManaged() {
     return userManaged;
   }
@@ -50,7 +53,7 @@ public final class MetricsQuery extends Query<MetricsList> {
     this.userManaged = userManaged;
     return this;
   }
-  
+
   public MetricsQuery excludeTypes(WSMetrics.Metric.ValueType... types) {
     for (WSMetrics.Metric.ValueType valueType : types) {
       excludedTypes.add(valueType);
@@ -98,7 +101,8 @@ public final class MetricsQuery extends Query<MetricsList> {
     boolean qualitative = JsonUtils.getBoolean(json, "qualitative");
     boolean userManaged = JsonUtils.getBoolean(json, "user_managed");
     Integer direction = JsonUtils.getInteger(json, "direction");
-    return new WSMetrics.Metric(key, name, description, domain, qualitative, userManaged, direction, WSMetrics.Metric.ValueType.valueOf(type));
+    return new WSMetrics.Metric(key, name, description, domain, qualitative, userManaged, direction,
+        WSMetrics.Metric.ValueType.valueOf(type));
   }
 
 }
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/Properties.java b/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/Properties.java
index a31ea97ff62..0dea1ab0c78 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/Properties.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/Properties.java
@@ -21,6 +21,10 @@ package org.sonar.api.web.gwt.client.webservices;
 
 import java.util.List;
 
+/**
+ * @deprecated since 2.5
+ */
+@Deprecated
 public class Properties extends ResponsePOJO {
 
   private List<Property> properties;
@@ -32,10 +36,10 @@ public class Properties extends ResponsePOJO {
   public List<Property> getProperties() {
     return properties;
   }
-  
+
   public String get(String key, String defaultValue) {
     for (Property property : properties) {
-      if( property.getKey().equals(key)) {
+      if (property.getKey().equals(key)) {
         return property.getValue();
       }
     }
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/PropertiesQuery.java b/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/PropertiesQuery.java
index 0b8b5df53dc..e71ecb9cdba 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/PropertiesQuery.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/PropertiesQuery.java
@@ -27,6 +27,10 @@ import org.sonar.api.web.gwt.client.Utils;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * @deprecated since 2.5, use {@link org.sonar.wsclient.services.PropertyQuery} instead.
+ */
+@Deprecated
 public final class PropertiesQuery extends Query<Properties> {
 
   private String key;
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/Property.java b/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/Property.java
index 21167df4688..4ceebc39cbd 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/Property.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/Property.java
@@ -19,6 +19,10 @@
  */
 package org.sonar.api.web.gwt.client.webservices;
 
+/**
+ * @deprecated since 2.5, use {@link org.sonar.wsclient.services.Property} instead
+ */
+@Deprecated
 public class Property extends ResponsePOJO {
 
   private String key;
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/Resource.java b/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/Resource.java
index 6389fc6aa9c..01814aed111 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/Resource.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/Resource.java
@@ -21,6 +21,10 @@ package org.sonar.api.web.gwt.client.webservices;
 
 import java.util.List;
 
+/**
+ * @deprecated since 2.5, use {@link org.sonar.wsclient.services.Resource} instead.
+ */
+@Deprecated
 public class Resource extends ResponsePOJO {
   public static final String SCOPE_SET = "PRJ";
   public static final String SCOPE_SPACE = "DIR";
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/Resources.java b/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/Resources.java
index b3a91971a88..dbbd9f84fe5 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/Resources.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/Resources.java
@@ -21,6 +21,10 @@ package org.sonar.api.web.gwt.client.webservices;
 
 import java.util.List;
 
+/**
+ * @deprecated since 2.5
+ */
+@Deprecated
 public class Resources extends ResponsePOJO {
 
   private List<Resource> resources;
@@ -33,7 +37,7 @@ public class Resources extends ResponsePOJO {
   public List<Resource> getResources() {
     return resources;
   }
-  
+
   public Resource firstResource() {
     return resources.size() > 0 ? resources.get(0) : null;
   }
@@ -55,7 +59,7 @@ public class Resources extends ResponsePOJO {
     }
     return true;
   }
-  
+
   public boolean isEmpty() {
     return resources == null || resources.isEmpty();
   }
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/ResourcesQuery.java b/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/ResourcesQuery.java
index c2cc2052ec4..16035d61847 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/ResourcesQuery.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/ResourcesQuery.java
@@ -29,6 +29,10 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+/**
+ * @deprecated since 2.5, use {@link org.sonar.wsclient.services.ResourceQuery} instead
+ */
+@Deprecated
 public final class ResourcesQuery extends AbstractResourceQuery<Resources> {
 
   public final static int DEPTH_UNLIMITED = -1;
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/Rule.java b/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/Rule.java
index 4838c5ee67d..08bff405efe 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/Rule.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/Rule.java
@@ -19,6 +19,10 @@
  */
 package org.sonar.api.web.gwt.client.webservices;
 
+/**
+ * @deprecated since 2.5
+ */
+@Deprecated
 public class Rule extends ResponsePOJO {
   private String key;
   private String name;
@@ -28,7 +32,6 @@ public class Rule extends ResponsePOJO {
     this.name = name;
   }
 
-
   public String getKey() {
     return key;
   }
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/SourcesQuery.java b/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/SourcesQuery.java
index 1d1b0498df2..ce0d71fcfa8 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/SourcesQuery.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/SourcesQuery.java
@@ -28,6 +28,10 @@ import org.sonar.api.web.gwt.client.Utils;
 import java.util.Map;
 import java.util.TreeMap;
 
+/**
+ * @deprecated since 2.5, use {@link org.sonar.wsclient.services.SourceQuery} instead
+ */
+@Deprecated
 public final class SourcesQuery extends AbstractResourceQuery<FileSource> {
 
   private Integer from;
@@ -83,9 +87,11 @@ public final class SourcesQuery extends AbstractResourceQuery<FileSource> {
     Map<Integer, String> sourceLines = new TreeMap<Integer, String>();
     FileSource src = new FileSource(sourceLines);
     JSONArray jsonArray = new JSONArray(obj);
-    if (jsonArray.size() == 0) return src;
+    if (jsonArray.size() == 0)
+      return src;
     JSONObject sources = jsonArray.get(0).isObject();
-    if (sources.size() == 0) return src;
+    if (sources.size() == 0)
+      return src;
     int maxSize = new Double(Math.pow(2, 16)).intValue();
     int currentLine = from == 0 ? 1 : from;
     while (currentLine < maxSize) {
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/Violation.java b/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/Violation.java
index 6c9eae2ea87..a21ae80717e 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/Violation.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/Violation.java
@@ -19,6 +19,10 @@
  */
 package org.sonar.api.web.gwt.client.webservices;
 
+/**
+ * @deprecated since 2.5, use {@link org.sonar.wsclient.services.Violation} instead.
+ */
+@Deprecated
 public class Violation {
 
   private String message;
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/Violations.java b/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/Violations.java
index d525c5bf634..e1101ff5f93 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/Violations.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/Violations.java
@@ -24,6 +24,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+/**
+ * @deprecated since 2.5
+ */
+@Deprecated
 public class Violations extends ResponsePOJO {
   private List<Violation> violations;
   private Map<Integer, List<Violation>> byLines;
@@ -45,7 +49,6 @@ public class Violations extends ResponsePOJO {
     return violations;
   }
 
-
   public Map<Integer, List<Violation>> getByLines() {
     if (byLines == null) {
       byLines = new HashMap<Integer, List<Violation>>();
@@ -66,7 +69,8 @@ public class Violations extends ResponsePOJO {
     String level = "";
     if (lineViolations != null) {
       for (Violation lineViolation : lineViolations) {
-        if ("BLOCKER".equals(lineViolation.getPriority()) || "CRITICAL".equals(lineViolation.getPriority()) || "MAJOR".equals(lineViolation.getPriority())) {
+        if ("BLOCKER".equals(lineViolation.getPriority()) || "CRITICAL".equals(lineViolation.getPriority())
+            || "MAJOR".equals(lineViolation.getPriority())) {
           level = "error";
 
         } else if (!"error".equals(level)) {
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/ViolationsQuery.java b/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/ViolationsQuery.java
index 2faac389e0f..4314aa19050 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/ViolationsQuery.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/web/gwt/client/webservices/ViolationsQuery.java
@@ -26,6 +26,10 @@ import com.google.gwt.json.client.JSONString;
 import com.google.gwt.json.client.JSONValue;
 import org.sonar.api.web.gwt.client.Utils;
 
+/**
+ * @deprecated since 2.5, use {@link org.sonar.wsclient.services.ViolationQuery} instead.
+ */
+@Deprecated
 public final class ViolationsQuery extends AbstractResourceQuery<Violations> {
 
   private String scopes;