SONAR-5007 RuleIndex#toDoc must be protected

diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/index/RuleIndex.java b/sonar-server/src/main/java/org/sonar/server/rule2/index/RuleIndex.java
index 5f66ed3b49bb50484ebd303e71982e318ba721e4..61ab11ef7161e1fd26c51e27062f48e4a7291ec8 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/rule2/index/RuleIndex.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule2/index/RuleIndex.java
@@ -337,7 +337,8 @@ public class RuleIndex extends BaseIndex<Rule, RuleDto, RuleKey> {
   }
 
 
-  public Rule toDoc(GetResponse response) {
+  @Override
+  protected Rule toDoc(GetResponse response) {
     Preconditions.checkArgument(response != null, "Cannot construct Rule with null response!!!");
     return new RuleDoc(response.getSource());
   }

diff --git a/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java b/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java
index 1aa166b059e712d22d985af010eab89cc02a4165..0d4141da0579a86cfcfc55a0cee4c18fe3deb349 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java
+++ b/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java
@@ -146,7 +146,7 @@ public abstract class BaseIndex<D, E extends Dto<K>, K extends Serializable>
 
   /* Base CRUD methods */
 
-  public abstract D toDoc(GetResponse response);
+  protected abstract D toDoc(GetResponse response);
 
   public D getByKey(K key) {
     GetResponse response = getClient().prepareGet()

diff --git a/sonar-server/src/main/java/org/sonar/server/search/QueryOptions.java b/sonar-server/src/main/java/org/sonar/server/search/QueryOptions.java
index 197b7ae0d30ad23a3313f9d8f0db255af0c5e87b..1604aa13ed4790bc5f3c31baf895fcd63e76123c 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/search/QueryOptions.java
+++ b/sonar-server/src/main/java/org/sonar/server/search/QueryOptions.java
@@ -60,7 +60,6 @@ public class QueryOptions {
 
   /**
    * Sets whether or not the search returns facets for the domain.
-   * @param facet
    */
   public QueryOptions setFacet(boolean facet) {
     this.facet = facet;