Gehel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/381803 )
Change subject: Fix spotbugs warnings on ...-core module
......................................................................
Fix spotbugs warnings on ...-core module
Change-Id: I40687080ed6abb2cd0bd660ed1909a510a8e7a72
---
M
experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/extern/PriorityQueue.java
M
experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/hit/OverlapMergingHitEnumWrapper.java
M
experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/hit/PhraseHitEnumWrapper.java
M
experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/snippet/ExponentialSnippetWeigher.java
M
experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/source/StringSourceExtracter.java
M
experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/tools/GraphvizHitEnumGenerator.java
M
experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/tools/GraphvizSnippetFormatter.java
7 files changed, 21 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/search/highlighter
refs/changes/03/381803/1
diff --git
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/extern/PriorityQueue.java
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/extern/PriorityQueue.java
index 3908766..c969be1 100644
---
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/extern/PriorityQueue.java
+++
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/extern/PriorityQueue.java
@@ -17,6 +17,8 @@
* limitations under the License.
*/
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
/**
* This is Lucene's PriorityQueue copied here to prevent the core from
depending
* on Lucene. It is too good not to have though.
@@ -50,6 +52,9 @@
}
@SuppressWarnings("unchecked")
+ @SuppressFBWarnings(
+ value = {"PCOA_PARTIALLY_CONSTRUCTED_OBJECT_ACCESS",
"PRMC_POSSIBLY_REDUNDANT_METHOD_CALLS"},
+ justification = "Constructor escape is required here.")
public PriorityQueue(int maxSize, boolean prepopulate) {
size = 0;
int heapSize;
diff --git
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/hit/OverlapMergingHitEnumWrapper.java
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/hit/OverlapMergingHitEnumWrapper.java
index 40dddbc..fc0cf39 100644
---
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/hit/OverlapMergingHitEnumWrapper.java
+++
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/hit/OverlapMergingHitEnumWrapper.java
@@ -115,6 +115,6 @@
@Override
public String toString() {
// Union symbol - close enought to merge, right?
- return "\u222A" + delegate.toString();
+ return "\u222A" + delegate;
}
}
diff --git
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/hit/PhraseHitEnumWrapper.java
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/hit/PhraseHitEnumWrapper.java
index 9cc916f..8595d43 100644
---
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/hit/PhraseHitEnumWrapper.java
+++
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/hit/PhraseHitEnumWrapper.java
@@ -189,7 +189,7 @@
StringBuilder b = new StringBuilder(100).append('[');
for (int p = 0; p < phrase.length; p++) {
if (p != 0) {
- b.append(":");
+ b.append(':');
}
b.append(Arrays.toString(phrase[p]));
}
diff --git
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/snippet/ExponentialSnippetWeigher.java
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/snippet/ExponentialSnippetWeigher.java
index 81d9ab9..c6d6cab 100644
---
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/snippet/ExponentialSnippetWeigher.java
+++
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/snippet/ExponentialSnippetWeigher.java
@@ -8,6 +8,8 @@
import org.wikimedia.search.highlighter.experimental.Snippet.Hit;
import org.wikimedia.search.highlighter.experimental.SnippetWeigher;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
/**
* Weighs snippets by weighing hits from the same source on an exponential
* scale. Picking a base just over 1 will make more hits on the same source
@@ -21,6 +23,9 @@
}
@Override
+ @SuppressFBWarnings(
+ value = "USBR_UNNECESSARY_STORE_BEFORE_RETURN",
+ justification = "More readable with return on its own.")
public float weigh(List<Hit> hits) {
// Bail out quickly on some simple corner cases
switch (hits.size()) {
@@ -36,10 +41,7 @@
// pack them into a sorted array and walk it then build some kind of
// hash thing. Maybe there is a better way to do this, but this works
// for now.
- Hit[] sorted = new Hit[hits.size()];
- for (int i = 0; i < hits.size(); i++) {
- sorted[i] = hits.get(i);
- }
+ Hit[] sorted = hits.toArray(new Hit[hits.size()]);
Arrays.sort(sorted, new SourceComparator());
float weight = 0;
int lastSource = sorted[0].source();
diff --git
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/source/StringSourceExtracter.java
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/source/StringSourceExtracter.java
index e19f891..df62032 100644
---
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/source/StringSourceExtracter.java
+++
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/source/StringSourceExtracter.java
@@ -2,9 +2,12 @@
import org.wikimedia.search.highlighter.experimental.SourceExtracter;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
/**
* Extracts strings from a String source.
*/
+@SuppressFBWarnings(value = "STT_STRING_PARSING_A_FIELD", justification =
"This class IS a parser.")
public final class StringSourceExtracter implements SourceExtracter<String> {
private final String source;
diff --git
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/tools/GraphvizHitEnumGenerator.java
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/tools/GraphvizHitEnumGenerator.java
index 7b9f244..7d5bd9c 100644
---
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/tools/GraphvizHitEnumGenerator.java
+++
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/tools/GraphvizHitEnumGenerator.java
@@ -30,7 +30,7 @@
hitEnum.toGraph(this);
graph.append(" }\n");
writeLinks();
- graph.append("}");
+ graph.append('}');
return graph.toString();
}
@@ -62,8 +62,8 @@
.append("|{")
.append("pos: ").append(hitEnum.position())
.append(", offsets: ")
- .append("[").append(hitEnum.startOffset())
- .append(", ").append(hitEnum.endOffset()).append("]")
+ .append('[').append(hitEnum.startOffset())
+ .append(", ").append(hitEnum.endOffset()).append(']')
.append("\\l}")
.append("|{corpusW:").append(hitEnum.corpusWeight())
.append(", queryW:").append(hitEnum.queryWeight())
@@ -86,7 +86,7 @@
private void writeLinks() {
for (Link link : links) {
- graph.append(" ").append(link.from).append(" ->
").append(link.to).append("\n");
+ graph.append(' ').append(link.from).append(" ->
").append(link.to).append('\n');
}
}
diff --git
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/tools/GraphvizSnippetFormatter.java
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/tools/GraphvizSnippetFormatter.java
index 88d7af1..974c85d 100644
---
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/tools/GraphvizSnippetFormatter.java
+++
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/tools/GraphvizSnippetFormatter.java
@@ -33,7 +33,7 @@
b.append(extracter.extract(hit.startOffset(), hit.endOffset()))
.append(" => \n")
.append(hitGraph.getGraph())
- .append("\n");
+ .append('\n');
}
return b.toString();
}
--
To view, visit https://gerrit.wikimedia.org/r/381803
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I40687080ed6abb2cd0bd660ed1909a510a8e7a72
Gerrit-PatchSet: 1
Gerrit-Project: search/highlighter
Gerrit-Branch: master
Gerrit-Owner: Gehel <guillaume.leder...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
