From fcfc7aad79f500ceec15ad170e055ebebb04a2c7 Mon Sep 17 00:00:00 2001 From: Stephane Gamard Date: Mon, 19 May 2014 15:29:24 +0200 Subject: [PATCH] SONAR-5007 - Fixed list of fields in ES for WS --- .../main/java/org/sonar/server/rule2/index/RuleIndex.java | 7 ++++--- .../org/sonar/server/rule2/index/RuleIndexMediumTest.java | 2 -- 2 files changed, 4 insertions(+), 5 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 bb7dec369f5..05a28ea0748 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 @@ -246,9 +246,7 @@ public class RuleIndex extends BaseIndex { fields = RuleNormalizer.RuleField.ALL_KEYS; } - //TODO limit source for available fields. - //esSearch.addFields(fields.toArray(new String[fields.size()])); - //esSearch.setSource(StringUtils.join(fields, ',')); + esSearch.setFetchSource(fields.toArray(new String[fields.size()]),null); return esSearch; } @@ -333,8 +331,11 @@ public class RuleIndex extends BaseIndex { esSearch.setQuery(QueryBuilders.filteredQuery(qb, fb)); + System.out.println("esSearch = " + esSearch); + SearchResponse esResult = esSearch.get(); + System.out.println("esResult = " + esResult); return new RuleResult(esResult); } diff --git a/sonar-server/src/test/java/org/sonar/server/rule2/index/RuleIndexMediumTest.java b/sonar-server/src/test/java/org/sonar/server/rule2/index/RuleIndexMediumTest.java index 8f275606247..21876400ca3 100644 --- a/sonar-server/src/test/java/org/sonar/server/rule2/index/RuleIndexMediumTest.java +++ b/sonar-server/src/test/java/org/sonar/server/rule2/index/RuleIndexMediumTest.java @@ -25,7 +25,6 @@ import com.google.common.collect.Sets; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; -import org.junit.Ignore; import org.junit.Test; import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.RuleStatus; @@ -137,7 +136,6 @@ public class RuleIndexMediumTest { } @Test - @Ignore public void select_doc_fields_to_return() { dao.insert(newRuleDto(RuleKey.of("javascript", "S001")), dbSession); dbSession.commit(); -- 2.39.5