From df0b00429b7cbc47c1a06facc6d175dc216ab2b8 Mon Sep 17 00:00:00 2001 From: Stephane Gamard Date: Thu, 10 Apr 2014 09:46:19 +0200 Subject: [PATCH] Code Quality (cleaning & format) --- .../org/sonar/server/rule/RuleRegistry.java | 54 +++++++++---------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistry.java b/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistry.java index 15b32ffad79..2c228636ec1 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistry.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistry.java @@ -185,7 +185,7 @@ public class RuleRegistry { Integer effectiveSubCharacteristicId = rule.getSubCharacteristicId() != null ? rule.getSubCharacteristicId() : rule.getDefaultSubCharacteristicId(); CharacteristicDto subCharacteristic = effectiveSubCharacteristicId != null ? characteristicDao.selectById(effectiveSubCharacteristicId, session) : null; // The parent id of the sub-characteristic should never be null - Integer parentId = subCharacteristic!= null ? subCharacteristic.getParentId() : null; + Integer parentId = subCharacteristic != null ? subCharacteristic.getParentId() : null; CharacteristicDto characteristic = (subCharacteristic != null && parentId != null) ? characteristicDao.selectById(parentId, session) : null; searchIndex.putSynchronous(INDEX_RULES, TYPE_RULE, Long.toString(ruleId), ruleDocument(rule, @@ -198,7 +198,7 @@ public class RuleRegistry { } private String[] bulkIndexRules(Collection rules, Map characteristicsById, Multimap paramsByRule, - Multimap tagsByRule) { + Multimap tagsByRule) { try { String[] ids = new String[rules.size()]; BytesStream[] docs = new BytesStream[rules.size()]; @@ -236,7 +236,7 @@ public class RuleRegistry { } private XContentBuilder ruleDocument(RuleDto rule, @Nullable CharacteristicDto characteristicDto, @Nullable CharacteristicDto subCharacteristicDto, - Collection params, Collection tags) throws IOException { + Collection params, Collection tags) throws IOException { XContentBuilder document = XContentFactory.jsonBuilder() .startObject() .field(RuleDocument.FIELD_ID, rule.getId()) @@ -318,7 +318,6 @@ public class RuleRegistry { } } - /** *

Find rule IDs matching the given criteria.

* @@ -365,7 +364,7 @@ public class RuleRegistry { Builder rulesBuilder = ImmutableList.builder(); SearchRequestBuilder searchRequestBuilder = searchIndex.client().prepareSearch(INDEX_RULES).setTypes(TYPE_RULE) - .setQuery(mainQuery) + .setQuery(mainQuery) .addSort(RuleDocument.FIELD_NAME, SortOrder.ASC); if (RuleQuery.NO_PAGINATION == query.pageSize()) { @@ -374,13 +373,13 @@ public class RuleRegistry { .setSearchType(SearchType.SCAN) .setScroll(new TimeValue(scrollTime)) .setSize(50).execute().actionGet(); - //Scroll until no hits are returned + // Scroll until no hits are returned while (true) { scrollResp = searchIndex.client().prepareSearchScroll(scrollResp.getScrollId()).setScroll(new TimeValue(scrollTime)).execute().actionGet(); for (SearchHit hit : scrollResp.getHits()) { rulesBuilder.add(RuleDocumentParser.parse(hit.sourceAsMap())); } - //Break condition: No hits are returned + // Break condition: No hits are returned if (scrollResp.getHits().getHits().length == 0) { break; } @@ -393,7 +392,7 @@ public class RuleRegistry { searchRequestBuilder .setSize(paging.pageSize()) .setFrom(paging.offset()) - ); + ); for (SearchHit hit : hits.hits()) { rulesBuilder.add(RuleDocumentParser.parse(hit.sourceAsMap())); @@ -402,37 +401,36 @@ public class RuleRegistry { } } - private static QueryBuilder convertRuleQueryToFilterBuilder(RuleQuery query){ - - //Execute the main query (defaults to matchAll - QueryBuilder mainQuery = QueryBuilders.matchAllQuery(); - if (StringUtils.isNotBlank(query.searchQuery())) { - mainQuery= QueryBuilders.multiMatchQuery(query.searchQuery(), - RuleDocument.FIELD_KEY, - RuleDocument.FIELD_NAME, + private static QueryBuilder convertRuleQueryToFilterBuilder(RuleQuery query) { + + // Execute the main query (defaults to matchAll + QueryBuilder mainQuery = QueryBuilders.matchAllQuery(); + if (StringUtils.isNotBlank(query.searchQuery())) { + mainQuery = QueryBuilders.multiMatchQuery(query.searchQuery(), + RuleDocument.FIELD_KEY, RuleDocument.FIELD_NAME, RuleDocument.FIELD_NAME + ".search").operator(Operator.AND); - } - - //Execute all filters + } + + // Execute all filters BoolFilterBuilder mainFilter = boolFilter().mustNot(termFilter(RuleDocument.FIELD_STATUS, STATUS_REMOVED)); - + addMustTermOrTerms(mainFilter, RuleDocument.FIELD_LANGUAGE, query.languages()); addMustTermOrTerms(mainFilter, RuleDocument.FIELD_REPOSITORY_KEY, query.repositories()); addMustTermOrTerms(mainFilter, RuleDocument.FIELD_SEVERITY, query.severities()); addMustTermOrTerms(mainFilter, RuleDocument.FIELD_STATUS, query.statuses()); - + if (!query.tags().isEmpty()) { mainFilter.must(FilterBuilders.queryFilter( - QueryBuilders.multiMatchQuery(query.tags(), RuleDocument.FIELD_ADMIN_TAGS, RuleDocument.FIELD_SYSTEM_TAGS).operator(Operator.OR)) - ); + QueryBuilders.multiMatchQuery(query.tags(), RuleDocument.FIELD_ADMIN_TAGS, RuleDocument.FIELD_SYSTEM_TAGS).operator(Operator.OR)) + ); } - + if (!query.debtCharacteristics().isEmpty()) { mainFilter.must(FilterBuilders.queryFilter( - QueryBuilders.multiMatchQuery(query.debtCharacteristics(), RuleDocument.FIELD_CHARACTERISTIC_KEY, RuleDocument.FIELD_SUB_CHARACTERISTIC_KEY).operator(Operator.OR)) - ); + QueryBuilders.multiMatchQuery(query.debtCharacteristics(), RuleDocument.FIELD_CHARACTERISTIC_KEY, RuleDocument.FIELD_SUB_CHARACTERISTIC_KEY).operator(Operator.OR)) + ); } - + if (query.hasDebtCharacteristic() != null) { if (Boolean.TRUE.equals(query.hasDebtCharacteristic())) { mainFilter.must(FilterBuilders.existsFilter(RuleDocument.FIELD_CHARACTERISTIC_KEY)); @@ -440,7 +438,7 @@ public class RuleRegistry { mainFilter.mustNot(FilterBuilders.existsFilter(RuleDocument.FIELD_CHARACTERISTIC_KEY)); } } - + return QueryBuilders.filteredQuery(mainQuery, mainFilter); } -- 2.39.5