SONAR-8798 arbitrary types like RuleType cannot be serialized by ES 5

diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java b/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java
index e1669812974795da0ac60543af45324f195abc0e..7fd7069deda9568827b802010f27b90456122737 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java
@@ -263,9 +263,11 @@ public class RuleIndex {
       filters.put(FIELD_RULE_EXTENSION_TAGS, q);
     }
 
-    if (isNotEmpty(query.getTypes())) {
+    Collection<RuleType> types = query.getTypes();
+    if (isNotEmpty(types)) {
+      List<String> typeNames = types.stream().map(RuleType::toString).collect(MoreCollectors.toList());
       filters.put(FIELD_RULE_TYPE,
-        QueryBuilders.termsQuery(FIELD_RULE_TYPE, query.getTypes()));
+        QueryBuilders.termsQuery(FIELD_RULE_TYPE, typeNames));
     }
 
     if (query.getAvailableSinceLong() != null) {