[MediaWiki-commits] [Gerrit] Replace deprecated constructor and minor cleanup - change (search/highlighter)

2015-09-23 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Replace deprecated constructor and minor cleanup
..


Replace deprecated constructor and minor cleanup

The deprecated constructor was in
AbstractDocsAndPositionsHitEnumTestBase.englishStemmingAnalyzer().

The rest was some minor cleanup.
I've avoided the X... classes since those are copies from upstream.

Change-Id: I07f2d3efc03a564c944241a14dcea72f708bf614
---
M 
experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/HitEnum.java
M 
experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/snippet/BasicScoreBasedSnippetChooser.java
M 
experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/source/AbstractMultiSourceExtracter.java
M 
experimental-highlighter-elasticsearch-plugin/src/main/java/org/elasticsearch/search/highlight/ExperimentalHighlighter.java
M 
experimental-highlighter-elasticsearch-plugin/src/main/java/org/elasticsearch/search/highlight/FieldWrapper.java
M 
experimental-highlighter-lucene/src/main/java/org/wikimedia/highlighter/experimental/lucene/hit/AutomatonHitEnum.java
M 
experimental-highlighter-lucene/src/test/java/org/wikimedia/highlighter/experimental/lucene/hit/AbstractDocsAndPositionsHitEnumTestBase.java
7 files changed, 11 insertions(+), 12 deletions(-)

Approvals:
  Tjones: Looks good to me, but someone else must approve
  DCausse: Looks good to me, approved
  jenkins-bot: Verified



diff --git 
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/HitEnum.java
 
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/HitEnum.java
index c6d8eb8..0341bed 100644
--- 
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/HitEnum.java
+++ 
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/HitEnum.java
@@ -65,6 +65,6 @@
 }
 return lhs.endOffset() < rhs.endOffset();
 }
-};
+}
 }
 }
diff --git 
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/snippet/BasicScoreBasedSnippetChooser.java
 
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/snippet/BasicScoreBasedSnippetChooser.java
index 6b34c1f..433819e 100644
--- 
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/snippet/BasicScoreBasedSnippetChooser.java
+++ 
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/snippet/BasicScoreBasedSnippetChooser.java
@@ -168,7 +168,7 @@
 }
 return 0;
 }
-};
+}
 }
 
 private class ProtoSnippetQueue extends PriorityQueue {
diff --git 
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/source/AbstractMultiSourceExtracter.java
 
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/source/AbstractMultiSourceExtracter.java
index e699883..4791da4 100644
--- 
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/source/AbstractMultiSourceExtracter.java
+++ 
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/source/AbstractMultiSourceExtracter.java
@@ -12,16 +12,16 @@
 abstract class AbstractMultiSourceExtracter implements SourceExtracter {
 interface Builder> {
 /**
- * Add a segmenter.
+ * Add an extracter.
  *
- * @param segmenter the segmenter to delegate to
- * @param length the length of the source underlying the segmenter
+ * @param extracter the extracter to delegate to
+ * @param length the length of the source underlying the extracter
  * @return this for chaining
  */
 S add(SourceExtracter extracter, int length);
 
 /**
- * Build the segmenter.
+ * Build the extracter.
  */
 SourceExtracter build();
 }
@@ -37,7 +37,7 @@
 /**
  * Merge all the extracts. Only called when the extracting across 
boundaries
  * in the constituent extracters.
- * 
+ *
  * @param extracts extracts from all constituent extracters
  * @return all extracts, merged
  */
diff --git 
a/experimental-highlighter-elasticsearch-plugin/src/main/java/org/elasticsearch/search/highlight/ExperimentalHighlighter.java
 
b/experimental-highlighter-elasticsearch-plugin/src/main/java/org/elasticsearch/search/highlight/ExperimentalHighlighter.java
index ff24464..a19a4ed 100644
--- 
a/experimental-highlighter-elasticsearch-plugin/src/main/java/org/elasticsearch/search/highlight/ExperimentalHighlighter.java
+++

[MediaWiki-commits] [Gerrit] Replace deprecated constructor and minor cleanup - change (search/highlighter)

2014-12-06 Thread BearND (Code Review) 
BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/177999

Change subject: Replace deprecated constructor and minor cleanup
..

Replace deprecated constructor and minor cleanup

The deprecated constructor was in
AbstractDocsAndPositionsHitEnumTestBase.englishStemmingAnalyzer().

The rest was some minor cleanup.
I've avoided the X... classes since those a copies from upstream.

Change-Id: I07f2d3efc03a564c944241a14dcea72f708bf614
---
M 
experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/HitEnum.java
M 
experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/snippet/BasicScoreBasedSnippetChooser.java
M 
experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/source/AbstractMultiSourceExtracter.java
M 
experimental-highlighter-elasticsearch-plugin/src/main/java/org/elasticsearch/search/highlight/ExperimentalHighlighter.java
M 
experimental-highlighter-elasticsearch-plugin/src/main/java/org/elasticsearch/search/highlight/FieldWrapper.java
M 
experimental-highlighter-lucene/src/main/java/org/wikimedia/highlighter/experimental/lucene/hit/AutomatonHitEnum.java
M 
experimental-highlighter-lucene/src/test/java/org/apache/lucene/util/automaton/AutomatonTestUtil.java
M 
experimental-highlighter-lucene/src/test/java/org/apache/lucene/util/automaton/TestDeterminizeLexicon.java
M 
experimental-highlighter-lucene/src/test/java/org/wikimedia/highlighter/experimental/lucene/hit/AbstractDocsAndPositionsHitEnumTestBase.java
9 files changed, 43 insertions(+), 44 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/highlighter 
refs/changes/99/177999/1

diff --git 
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/HitEnum.java
 
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/HitEnum.java
index 0774458..d01a766 100644
--- 
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/HitEnum.java
+++ 
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/HitEnum.java
@@ -7,7 +7,7 @@
 public interface HitEnum extends Segment {
 /**
  * Move the enum to the next hit.
- * 
+ *
  * @return is there a next hit (true) or was the last one the final hit
  * (false)
  */
@@ -47,7 +47,7 @@
  * of precision is worth the comparison efficiency.
  */
 int source();
-
+
 public static enum LessThans implements LessThanHitEnum {
 /**
  * Sorts ascending by position.
@@ -66,6 +66,6 @@
 }
 return lhs.endOffset()  rhs.endOffset();
 }
-};
+}
 }
 }
diff --git 
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/snippet/BasicScoreBasedSnippetChooser.java
 
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/snippet/BasicScoreBasedSnippetChooser.java
index dbe2dbc..8f6d42d 100644
--- 
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/snippet/BasicScoreBasedSnippetChooser.java
+++ 
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/snippet/BasicScoreBasedSnippetChooser.java
@@ -143,7 +143,7 @@
 }
 return 0;
 }
-};
+}
 }
 
 private class ProtoSnippetQueue extends PriorityQueueProtoSnippet {
diff --git 
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/source/AbstractMultiSourceExtracter.java
 
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/source/AbstractMultiSourceExtracter.java
index e699883..4791da4 100644
--- 
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/source/AbstractMultiSourceExtracter.java
+++ 
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/source/AbstractMultiSourceExtracter.java
@@ -12,16 +12,16 @@
 abstract class AbstractMultiSourceExtracterT implements SourceExtracterT {
 interface BuilderT, S extends BuilderT, S {
 /**
- * Add a segmenter.
+ * Add an extracter.
  *
- * @param segmenter the segmenter to delegate to
- * @param length the length of the source underlying the segmenter
+ * @param extracter the extracter to delegate to
+ * @param length the length of the source underlying the extracter
  * @return this for chaining
  */
 S add(SourceExtracterT extracter, int length);
 
 /**
- * Build the segmenter.
+ * Build the extracter.
  */
 SourceExtracterT build();
 }
@@ -37,7 +37,7 @@
 /**
  *