You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2015/06/17 11:56:10 UTC
svn commit: r1685979 - in /lucene/dev/trunk/solr: ./
core/src/java/org/apache/solr/response/transform/
Author: noble
Date: Wed Jun 17 09:56:10 2015
New Revision: 1685979
URL: http://svn.apache.org/r1685979
Log:
SOLR-7665: deprecate the class TransformerWithContext
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/BaseEditorialTransformer.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/DocTransformer.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/ElevatedMarkerFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/ExplainAugmenterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/ScoreAugmenter.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/TransformContext.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/TransformerWithContext.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1685979&r1=1685978&r2=1685979&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed Jun 17 09:56:10 2015
@@ -98,6 +98,8 @@ Upgrading from Solr 5.2
* The zkCredientialsProvider element in solrcloud section of solr.xml is now deprecated.
Use the correct spelling (zkCredentialsProvider) instead.
+* class TransformerWithContext is deprecated . Use DocTransformer directly
+
Detailed Change List
----------------------
@@ -203,6 +205,8 @@ Other Changes
* SOLR-7680: Use POST instead of GET when finding versions for mismatches with
CloudInspectUtil for tests (Ramkumar Aiyengar)
+* SOLR-7665: deprecate the class TransformerWithContext (noble)
+
================== 5.2.1 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/BaseEditorialTransformer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/BaseEditorialTransformer.java?rev=1685979&r1=1685978&r2=1685979&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/BaseEditorialTransformer.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/BaseEditorialTransformer.java Wed Jun 17 09:56:10 2015
@@ -28,7 +28,7 @@ import java.util.Set;
*
*
**/
-public abstract class BaseEditorialTransformer extends TransformerWithContext {
+public abstract class BaseEditorialTransformer extends DocTransformer {
final String name;
final String idFieldName;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/DocTransformer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/DocTransformer.java?rev=1685979&r1=1685978&r2=1685979&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/DocTransformer.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/DocTransformer.java Wed Jun 17 09:56:10 2015
@@ -18,6 +18,7 @@
package org.apache.solr.response.transform;
import java.io.IOException;
+import java.util.Set;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.response.QueryResponseWriter;
@@ -33,8 +34,8 @@ import org.apache.solr.search.SolrIndexS
* @see TransformerFactory
*
*/
-public abstract class DocTransformer
-{
+public abstract class DocTransformer {
+ protected TransformContext context;
/**
*
* @return The name of the transformer
@@ -46,7 +47,10 @@ public abstract class DocTransformer
* @param context The {@link org.apache.solr.response.transform.TransformContext} stores information about the current state of things in Solr that may be
* useful for doing transformations.
*/
- public void setContext( TransformContext context ) {}
+ public void setContext( TransformContext context ) {
+ this.context = context;
+
+ }
/**
* This is where implementations do the actual work
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/ElevatedMarkerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/ElevatedMarkerFactory.java?rev=1685979&r1=1685978&r2=1685979&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/ElevatedMarkerFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/ElevatedMarkerFactory.java Wed Jun 17 09:56:10 2015
@@ -40,8 +40,7 @@ public class ElevatedMarkerFactory exten
}
}
-class MarkTransformer extends BaseEditorialTransformer
-{
+class MarkTransformer extends BaseEditorialTransformer {
MarkTransformer(String name, String idFieldName, FieldType ft) {
super(name, idFieldName, ft);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/ExplainAugmenterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/ExplainAugmenterFactory.java?rev=1685979&r1=1685978&r2=1685979&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/ExplainAugmenterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/ExplainAugmenterFactory.java Wed Jun 17 09:56:10 2015
@@ -70,8 +70,7 @@ public class ExplainAugmenterFactory ext
return new ExplainAugmenter( field, style );
}
- static class ExplainAugmenter extends TransformerWithContext
- {
+ static class ExplainAugmenter extends DocTransformer {
final String name;
final Style style;
@@ -89,9 +88,9 @@ public class ExplainAugmenterFactory ext
@Override
public void transform(SolrDocument doc, int docid) {
- if( context != null && context.query != null ) {
+ if( context != null && context.getQuery() != null ) {
try {
- Explanation exp = context.searcher.explain(context.query, docid);
+ Explanation exp = context.getSearcher().explain(context.getQuery(), docid);
if( style == Style.nl ) {
doc.setField( name, SolrPluginUtils.explanationToNamedList(exp) );
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/ScoreAugmenter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/ScoreAugmenter.java?rev=1685979&r1=1685978&r2=1685979&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/ScoreAugmenter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/ScoreAugmenter.java Wed Jun 17 09:56:10 2015
@@ -25,8 +25,7 @@ import org.apache.solr.request.SolrQuery
*
* @since solr 4.0
*/
-public class ScoreAugmenter extends TransformerWithContext
-{
+public class ScoreAugmenter extends DocTransformer {
final String name;
public ScoreAugmenter( String display )
@@ -42,9 +41,9 @@ public class ScoreAugmenter extends Tran
@Override
public void transform(SolrDocument doc, int docid) {
- if( context != null && context.wantsScores ) {
- if( context.iterator != null ) {
- doc.setField( name, context.iterator.score() );
+ if( context != null && context.wantsScores() ) {
+ if( context.getDocIterator() != null ) {
+ doc.setField( name, context.getDocIterator().score() );
}
}
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/TransformContext.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/TransformContext.java?rev=1685979&r1=1685978&r2=1685979&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/TransformContext.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/TransformContext.java Wed Jun 17 09:56:10 2015
@@ -27,11 +27,30 @@ import org.apache.solr.search.SolrIndexS
*
* @since solr 4.0
*/
-public class TransformContext
-{
+public class TransformContext {
public Query query;
public boolean wantsScores = false;
public DocIterator iterator;
public SolrIndexSearcher searcher;
public SolrQueryRequest req;
+
+ public Query getQuery() {
+ return query;
+ }
+
+ public boolean wantsScores() {
+ return wantsScores;
+ }
+
+ public DocIterator getDocIterator() {
+ return iterator;
+ }
+
+ public SolrIndexSearcher getSearcher() {
+ return searcher;
+ }
+
+ public SolrQueryRequest getRequest() {
+ return req;
+ }
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/TransformerWithContext.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/TransformerWithContext.java?rev=1685979&r1=1685978&r2=1685979&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/TransformerWithContext.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/TransformerWithContext.java Wed Jun 17 09:56:10 2015
@@ -21,10 +21,9 @@ package org.apache.solr.response.transfo
*
* @since solr 4.0
*/
+@Deprecated
public abstract class TransformerWithContext extends DocTransformer
{
- protected TransformContext context = null;
-
@Override
public void setContext( TransformContext context ) {
this.context = context;