From 67119ef3a9c60b626bfcbf7375b2f42994d5412a Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Mon, 19 May 2014 17:59:01 +0200 Subject: [PATCH] SONAR-5007 RuleIndex#toDoc must be protected --- .../src/main/java/org/sonar/server/rule2/index/RuleIndex.java | 3 ++- .../src/main/java/org/sonar/server/search/BaseIndex.java | 2 +- .../src/main/java/org/sonar/server/search/QueryOptions.java | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) 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 5f66ed3b49b..61ab11ef716 100644 --- 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 { } - 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 1aa166b059e..0d4141da057 100644 --- 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, 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 197b7ae0d30..1604aa13ed4 100644 --- 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; -- 2.39.5