From 888b6440b19e13f707e96c80638d409c31de86e9 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Thu, 29 May 2014 09:41:37 +0200 Subject: [PATCH] SONAR-5007 fix quality flaws --- .../org/sonar/server/rule/index/RuleIndex.java | 14 +++++++------- .../java/org/sonar/server/search/BaseIndex.java | 11 +++++------ .../org/sonar/server/search/BaseNormalizer.java | 4 ---- .../java/org/sonar/server/search/IndexField.java | 14 +++++++------- .../java/org/sonar/server/search/Indexable.java | 2 +- 5 files changed, 20 insertions(+), 25 deletions(-) diff --git a/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java b/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java index 351b7753159..b4da7f5bf2f 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java @@ -183,14 +183,14 @@ public class RuleIndex extends BaseIndex { .termFilter(RuleNormalizer.RuleField.STATUS.field(), RuleStatus.REMOVED.toString())); - this.addMultiFieldTermFilter(query.getDebtCharacteristics(), fb, + this.addMultiFieldTermFilter(fb, query.getDebtCharacteristics(), RuleNormalizer.RuleField.SUB_CHARACTERISTIC.field(), RuleNormalizer.RuleField.CHARACTERISTIC.field()); - this.addTermFilter(RuleNormalizer.RuleField.LANGUAGE.field(), query.getLanguages(), fb); - this.addTermFilter(RuleNormalizer.RuleField.REPOSITORY.field(), query.getRepositories(), fb); - this.addTermFilter(RuleNormalizer.RuleField.SEVERITY.field(), query.getSeverities(), fb); - this.addTermFilter(RuleNormalizer.RuleField.KEY.field(), query.getKey(), fb); - this.addTermFilter(RuleNormalizer.RuleField._TAGS.field(), query.getTags(), fb); + this.addTermFilter(fb, RuleNormalizer.RuleField.LANGUAGE.field(), query.getLanguages()); + this.addTermFilter(fb, RuleNormalizer.RuleField.REPOSITORY.field(), query.getRepositories()); + this.addTermFilter(fb, RuleNormalizer.RuleField.SEVERITY.field(), query.getSeverities()); + this.addTermFilter(fb, RuleNormalizer.RuleField.KEY.field(), query.getKey()); + this.addTermFilter(fb, RuleNormalizer.RuleField._TAGS.field(), query.getTags()); if (query.getStatuses() != null && !query.getStatuses().isEmpty()) { @@ -198,7 +198,7 @@ public class RuleIndex extends BaseIndex { for (RuleStatus status : query.getStatuses()) { stringStatus.add(status.name()); } - this.addTermFilter(RuleNormalizer.RuleField.STATUS.field(), stringStatus, fb); + this.addTermFilter(fb, RuleNormalizer.RuleField.STATUS.field(), stringStatus); } /** Implementation of activation query */ 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 d6f93182c13..972eacccc03 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 @@ -36,6 +36,7 @@ import org.slf4j.LoggerFactory; import org.sonar.core.cluster.WorkQueue; import org.sonar.core.persistence.Dto; +import javax.annotation.Nullable; import java.io.IOException; import java.io.Serializable; import java.util.ArrayList; @@ -236,9 +237,7 @@ public abstract class BaseIndex, K extends Serializable> mapping.put("type", "nested"); Map mappings = new HashMap(); for (IndexField nestedField : field.nestedFields()) { - if(nestedField != null) { - mappings.put(nestedField.field(), mapField(nestedField)); - } + mappings.put(nestedField.field(), mapField(nestedField)); } mapping.put("properties", mappings); return mapping; @@ -445,7 +444,7 @@ public abstract class BaseIndex, K extends Serializable> .endObject(); } - protected BoolFilterBuilder addMultiFieldTermFilter(Collection values, BoolFilterBuilder filter, String... fields) { + protected BoolFilterBuilder addMultiFieldTermFilter(BoolFilterBuilder filter, @Nullable Collection values, String... fields) { if (values != null && !values.isEmpty()) { BoolFilterBuilder valuesFilter = FilterBuilders.boolFilter(); for (String value : values) { @@ -461,7 +460,7 @@ public abstract class BaseIndex, K extends Serializable> } - protected BoolFilterBuilder addTermFilter(String field, Collection values, BoolFilterBuilder filter) { + protected BoolFilterBuilder addTermFilter(BoolFilterBuilder filter, String field, @Nullable Collection values) { if (values != null && !values.isEmpty()) { BoolFilterBuilder valuesFilter = FilterBuilders.boolFilter(); for (String value : values) { @@ -473,7 +472,7 @@ public abstract class BaseIndex, K extends Serializable> return filter; } - protected BoolFilterBuilder addTermFilter(String field, String value, BoolFilterBuilder filter) { + protected BoolFilterBuilder addTermFilter(BoolFilterBuilder filter, String field, @Nullable String value) { if (value != null && !value.isEmpty()) { filter.must(FilterBuilders.termFilter(field, value)); } diff --git a/sonar-server/src/main/java/org/sonar/server/search/BaseNormalizer.java b/sonar-server/src/main/java/org/sonar/server/search/BaseNormalizer.java index 0c384f92802..7981e9f3563 100644 --- a/sonar-server/src/main/java/org/sonar/server/search/BaseNormalizer.java +++ b/sonar-server/src/main/java/org/sonar/server/search/BaseNormalizer.java @@ -20,8 +20,6 @@ package org.sonar.server.search; import org.elasticsearch.action.update.UpdateRequest; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.sonar.core.persistence.Dto; import org.sonar.server.db.DbClient; @@ -31,8 +29,6 @@ import java.util.Map; public abstract class BaseNormalizer, K extends Serializable> { - private static final Logger LOG = LoggerFactory.getLogger(BaseNormalizer.class); - protected final DbClient db; protected final IndexDefinition definition; diff --git a/sonar-server/src/main/java/org/sonar/server/search/IndexField.java b/sonar-server/src/main/java/org/sonar/server/search/IndexField.java index 76afcee62e1..73926394d6e 100644 --- a/sonar-server/src/main/java/org/sonar/server/search/IndexField.java +++ b/sonar-server/src/main/java/org/sonar/server/search/IndexField.java @@ -43,7 +43,7 @@ public class IndexField { private boolean searchable = false; IndexField(Type type, String field) { - this(type, field, Collections.EMPTY_LIST); + this(type, field, Collections.emptyList()); } IndexField(Type type, String field, Collection nestedFields) { @@ -56,8 +56,8 @@ public class IndexField { return sortable; } - public IndexField sortable(Boolean sortable) { - this.sortable = sortable; + public IndexField sortable(boolean b) { + this.sortable = b; return this; } @@ -65,8 +65,8 @@ public class IndexField { return searchable; } - public IndexField searchable(Boolean searchable) { - this.searchable = searchable; + public IndexField searchable(boolean b) { + this.searchable = b; return this; } @@ -83,9 +83,9 @@ public class IndexField { } public String sortField() { - if(this.sortable()){ + if (this.sortable()) { return this.field + ((type == IndexField.Type.TEXT - || type == IndexField.Type.STRING)?"."+IndexField.SORT_SUFFIX:""); + || type == IndexField.Type.STRING) ? "." + IndexField.SORT_SUFFIX : ""); } else { throw new IllegalStateException("Cannot sort on field (Field is not sortable)"); } diff --git a/sonar-server/src/main/java/org/sonar/server/search/Indexable.java b/sonar-server/src/main/java/org/sonar/server/search/Indexable.java index c48a3b64386..46846a6d51e 100644 --- a/sonar-server/src/main/java/org/sonar/server/search/Indexable.java +++ b/sonar-server/src/main/java/org/sonar/server/search/Indexable.java @@ -31,7 +31,7 @@ import java.util.Set; */ public class Indexable { - private static Set ALL_FIELDS = new HashSet(); + private static final Set ALL_FIELDS = new HashSet(); public static IndexField add(IndexField.Type type, String field){ IndexField indexField = new IndexField(type, field); -- 2.39.5