You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2011/01/30 17:08:35 UTC
svn commit: r1065312 [2/6] - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fa/
lucene/contrib/misc/src/java/org/apache/lucene/index/
lucene/contrib/misc/src/java/org/apache/lucene/stor...
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataConfig.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataConfig.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataConfig.java Sun Jan 30 16:08:25 2011
@@ -214,6 +214,7 @@ public class DataConfig {
public Map<String, String> allAttributes = new HashMap<String, String>() {
+ @Override
public String put(String key, String value) {
if (super.containsKey(key))
return super.get(key);
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java Sun Jan 30 16:08:25 2011
@@ -423,6 +423,7 @@ public class DataImporter {
}
static final ThreadLocal<AtomicLong> QUERY_COUNT = new ThreadLocal<AtomicLong>() {
+ @Override
protected AtomicLong initialValue() {
return new AtomicLong();
}
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DateFormatTransformer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DateFormatTransformer.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DateFormatTransformer.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DateFormatTransformer.java Sun Jan 30 16:08:25 2011
@@ -45,6 +45,7 @@ public class DateFormatTransformer exten
private static final Logger LOG = LoggerFactory
.getLogger(DateFormatTransformer.class);
+ @Override
@SuppressWarnings("unchecked")
public Object transformRow(Map<String, Object> aRow, Context context) {
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DebugLogger.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DebugLogger.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DebugLogger.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DebugLogger.java Sun Jan 30 16:08:25 2011
@@ -60,6 +60,7 @@ class DebugLogger {
output = new NamedList();
debugStack = new Stack<DebugInfo>() {
+ @Override
public DebugInfo pop() {
if (size() == 1)
throw new DataImportHandlerException(
@@ -169,14 +170,17 @@ class DebugLogger {
DataSource wrapDs(final DataSource ds) {
return new DataSource() {
+ @Override
public void init(Context context, Properties initProps) {
ds.init(context, initProps);
}
+ @Override
public void close() {
ds.close();
}
+ @Override
public Object getData(String query) {
writer.log(SolrWriter.ENTITY_META, "query", query);
long start = System.currentTimeMillis();
@@ -203,6 +207,7 @@ class DebugLogger {
Transformer wrapTransformer(final Transformer t) {
return new Transformer() {
+ @Override
public Object transformRow(Map<String, Object> row, Context context) {
writer.log(SolrWriter.PRE_TRANSFORMER_ROW, null, row);
String tName = getTransformerName(t);
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java Sun Jan 30 16:08:25 2011
@@ -139,6 +139,7 @@ public class DocBuilder {
document = dataImporter.getConfig().document;
final AtomicLong startTime = new AtomicLong(System.currentTimeMillis());
statusMessages.put(TIME_ELAPSED, new Object() {
+ @Override
public String toString() {
return getTimeElapsedSince(startTime.get());
}
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EntityProcessorBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EntityProcessorBase.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EntityProcessorBase.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EntityProcessorBase.java Sun Jan 30 16:08:25 2011
@@ -49,6 +49,7 @@ public class EntityProcessorBase extends
protected String onError = ABORT;
+ @Override
public void init(Context context) {
rowIterator = null;
this.context = context;
@@ -86,14 +87,17 @@ public class EntityProcessorBase extends
}
}
+ @Override
public Map<String, Object> nextModifiedRowKey() {
return null;
}
+ @Override
public Map<String, Object> nextDeletedRowKey() {
return null;
}
+ @Override
public Map<String, Object> nextModifiedParentRowKey() {
return null;
}
@@ -105,11 +109,13 @@ public class EntityProcessorBase extends
* @return a row where the key is the name of the field and value can be any Object or a Collection of objects. Return
* null to signal end of rows
*/
+ @Override
public Map<String, Object> nextRow() {
return null;// do not do anything
}
+ @Override
public void destroy() {
/*no op*/
}
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EntityProcessorWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EntityProcessorWrapper.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EntityProcessorWrapper.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EntityProcessorWrapper.java Sun Jan 30 16:08:25 2011
@@ -54,6 +54,7 @@ public class EntityProcessorWrapper exte
this.docBuilder = docBuilder;
}
+ @Override
public void init(Context context) {
rowcache = null;
this.context = context;
@@ -79,6 +80,7 @@ public class EntityProcessorWrapper exte
String[] transArr = transClasses.split(",");
transformers = new ArrayList<Transformer>() {
+ @Override
public boolean add(Transformer transformer) {
if (docBuilder != null && docBuilder.verboseDebug) {
transformer = docBuilder.writer.getDebugLogger().wrapTransformer(transformer);
@@ -135,6 +137,7 @@ public class EntityProcessorWrapper exte
o = clazz.newInstance();
}
+ @Override
public Object transformRow(Map<String, Object> aRow, Context context) {
try {
return meth.invoke(o, aRow);
@@ -223,6 +226,7 @@ public class EntityProcessorWrapper exte
&& Boolean.parseBoolean(oMap.get("$stopTransform").toString());
}
+ @Override
public Map<String, Object> nextRow() {
if (rowcache != null) {
return getFromRowCache();
@@ -252,6 +256,7 @@ public class EntityProcessorWrapper exte
}
}
+ @Override
public Map<String, Object> nextModifiedRowKey() {
Map<String, Object> row = delegate.nextModifiedRowKey();
row = applyTransformer(row);
@@ -259,6 +264,7 @@ public class EntityProcessorWrapper exte
return row;
}
+ @Override
public Map<String, Object> nextDeletedRowKey() {
Map<String, Object> row = delegate.nextDeletedRowKey();
row = applyTransformer(row);
@@ -266,10 +272,12 @@ public class EntityProcessorWrapper exte
return row;
}
+ @Override
public Map<String, Object> nextModifiedParentRowKey() {
return delegate.nextModifiedParentRowKey();
}
+ @Override
public void destroy() {
delegate.destroy();
}
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EvaluatorBag.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EvaluatorBag.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EvaluatorBag.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EvaluatorBag.java Sun Jan 30 16:08:25 2011
@@ -66,6 +66,7 @@ public class EvaluatorBag {
*/
public static Evaluator getSqlEscapingEvaluator() {
return new Evaluator() {
+ @Override
public String evaluate(String expression, Context context) {
List l = parseParams(expression, context.getVariableResolver());
if (l.size() != 1) {
@@ -90,6 +91,7 @@ public class EvaluatorBag {
*/
public static Evaluator getSolrQueryEscapingEvaluator() {
return new Evaluator() {
+ @Override
public String evaluate(String expression, Context context) {
List l = parseParams(expression, context.getVariableResolver());
if (l.size() != 1) {
@@ -109,6 +111,7 @@ public class EvaluatorBag {
*/
public static Evaluator getUrlEvaluator() {
return new Evaluator() {
+ @Override
public String evaluate(String expression, Context context) {
List l = parseParams(expression, context.getVariableResolver());
if (l.size() != 1) {
@@ -138,6 +141,7 @@ public class EvaluatorBag {
*/
public static Evaluator getDateFormatEvaluator() {
return new Evaluator() {
+ @Override
public String evaluate(String expression, Context context) {
List l = parseParams(expression, context.getVariableResolver());
if (l.size() != 2) {
@@ -288,6 +292,7 @@ public class EvaluatorBag {
}
+ @Override
public String toString() {
Object o = vr.resolve(varName);
return o == null ? null : o.toString();
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/FieldReaderDataSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/FieldReaderDataSource.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/FieldReaderDataSource.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/FieldReaderDataSource.java Sun Jan 30 16:08:25 2011
@@ -52,6 +52,7 @@ public class FieldReaderDataSource exten
private String encoding;
private EntityProcessorWrapper entityProcessor;
+ @Override
public void init(Context context, Properties initProps) {
dataField = context.getEntityAttribute("dataField");
encoding = context.getEntityAttribute("encoding");
@@ -59,6 +60,7 @@ public class FieldReaderDataSource exten
/*no op*/
}
+ @Override
public Reader getData(String query) {
Object o = entityProcessor.getVariableResolver().resolve(dataField);
if (o == null) {
@@ -111,6 +113,7 @@ public class FieldReaderDataSource exten
}
}
+ @Override
public void close() {
}
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/FieldStreamDataSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/FieldStreamDataSource.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/FieldStreamDataSource.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/FieldStreamDataSource.java Sun Jan 30 16:08:25 2011
@@ -52,12 +52,14 @@ public class FieldStreamDataSource exten
protected String dataField;
private EntityProcessorWrapper wrapper;
+ @Override
public void init(Context context, Properties initProps) {
dataField = context.getEntityAttribute("dataField");
wrapper = (EntityProcessorWrapper) context.getEntityProcessor();
/*no op*/
}
+ @Override
public InputStream getData(String query) {
Object o = wrapper.getVariableResolver().resolve(dataField);
if (o == null) {
@@ -90,6 +92,7 @@ public class FieldStreamDataSource exten
}
+ @Override
public void close() {
}
}
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/FileDataSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/FileDataSource.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/FileDataSource.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/FileDataSource.java Sun Jan 30 16:08:25 2011
@@ -59,6 +59,7 @@ public class FileDataSource extends Data
private static final Logger LOG = LoggerFactory.getLogger(FileDataSource.class);
+ @Override
public void init(Context context, Properties initProps) {
basePath = initProps.getProperty(BASE_PATH);
if (initProps.get(URLDataSource.ENCODING) != null)
@@ -79,6 +80,7 @@ public class FileDataSource extends Data
* returned Reader</b>
* </p>
*/
+ @Override
public Reader getData(String query) {
File f = getFile(basePath,query);
try {
@@ -130,6 +132,7 @@ public class FileDataSource extends Data
}
}
+ @Override
public void close() {
}
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/FileListEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/FileListEntityProcessor.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/FileListEntityProcessor.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/FileListEntityProcessor.java Sun Jan 30 16:08:25 2011
@@ -106,6 +106,7 @@ public class FileListEntityProcessor ext
private Pattern fileNamePattern, excludesPattern;
+ @Override
public void init(Context context) {
super.init(context);
fileName = context.getEntityAttribute(FILE_NAME);
@@ -195,6 +196,7 @@ public class FileListEntityProcessor ext
return Long.parseLong(sizeStr);
}
+ @Override
public Map<String, Object> nextRow() {
if (rowIterator != null)
return getNext();
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java Sun Jan 30 16:08:25 2011
@@ -54,6 +54,7 @@ public class JdbcDataSource extends
private int maxRows = 0;
+ @Override
public void init(Context context, Properties initProps) {
Object o = initProps.get(CONVERT_TYPE);
if (o != null)
@@ -204,6 +205,7 @@ public class JdbcDataSource extends
}
}
+ @Override
public Iterator<Map<String, Object>> getData(String query) {
ResultSetIterator r = new ResultSetIterator(query);
return r.getIterator();
@@ -370,6 +372,7 @@ public class JdbcDataSource extends
}
}
+ @Override
protected void finalize() throws Throwable {
try {
if(!isClosed){
@@ -383,6 +386,7 @@ public class JdbcDataSource extends
private boolean isClosed = false;
+ @Override
public void close() {
try {
closeConnection();
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/LineEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/LineEntityProcessor.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/LineEntityProcessor.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/LineEntityProcessor.java Sun Jan 30 16:08:25 2011
@@ -64,6 +64,7 @@ public class LineEntityProcessor extends
/**
* Parses each of the entity attributes.
*/
+ @Override
public void init(Context context) {
super.init(context);
String s;
@@ -97,6 +98,7 @@ public class LineEntityProcessor extends
* from the url. However transformers can be used to create as
* many other fields as required.
*/
+ @Override
public Map<String, Object> nextRow() {
if (reader == null) {
reader = new BufferedReader((Reader) context.getDataSource().getData(url));
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/LogTransformer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/LogTransformer.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/LogTransformer.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/LogTransformer.java Sun Jan 30 16:08:25 2011
@@ -35,6 +35,7 @@ import java.util.Map;
public class LogTransformer extends Transformer {
Logger LOG = LoggerFactory.getLogger(LogTransformer.class);
+ @Override
public Object transformRow(Map<String, Object> row, Context ctx) {
String expr = ctx.getEntityAttribute(LOG_TEMPLATE);
String level = ctx.replaceTokens(ctx.getEntityAttribute(LOG_LEVEL));
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/MockDataSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/MockDataSource.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/MockDataSource.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/MockDataSource.java Sun Jan 30 16:08:25 2011
@@ -45,13 +45,16 @@ public class MockDataSource extends
cache.clear();
}
+ @Override
public void init(Context context, Properties initProps) {
}
+ @Override
public Iterator<Map<String, Object>> getData(String query) {
return cache.get(query);
}
+ @Override
public void close() {
cache.clear();
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/NumberFormatTransformer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/NumberFormatTransformer.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/NumberFormatTransformer.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/NumberFormatTransformer.java Sun Jan 30 16:08:25 2011
@@ -49,6 +49,7 @@ public class NumberFormatTransformer ext
private static final Pattern localeRegex = Pattern.compile("^([a-z]{2})-([A-Z]{2})$");
+ @Override
@SuppressWarnings("unchecked")
public Object transformRow(Map<String, Object> row, Context context) {
for (Map<String, String> fld : context.getAllEntityFields()) {
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/PlainTextEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/PlainTextEntityProcessor.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/PlainTextEntityProcessor.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/PlainTextEntityProcessor.java Sun Jan 30 16:08:25 2011
@@ -40,11 +40,13 @@ public class PlainTextEntityProcessor ex
private static final Logger LOG = LoggerFactory.getLogger(PlainTextEntityProcessor.class);
private boolean ended = false;
+ @Override
public void init(Context context) {
super.init(context);
ended = false;
}
+ @Override
public Map<String, Object> nextRow() {
if (ended) return null;
DataSource<Reader> ds = context.getDataSource();
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/RegexTransformer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/RegexTransformer.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/RegexTransformer.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/RegexTransformer.java Sun Jan 30 16:08:25 2011
@@ -43,6 +43,7 @@ import java.util.regex.Pattern;
public class RegexTransformer extends Transformer {
private static final Logger LOG = LoggerFactory.getLogger(RegexTransformer.class);
+ @Override
@SuppressWarnings("unchecked")
public Map<String, Object> transformRow(Map<String, Object> row,
Context ctx) {
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ScriptTransformer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ScriptTransformer.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ScriptTransformer.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ScriptTransformer.java Sun Jan 30 16:08:25 2011
@@ -47,6 +47,7 @@ public class ScriptTransformer extends T
private String functionName;
+ @Override
public Object transformRow(Map<String, Object> row, Context context) {
try {
if (engine == null)
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SqlEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SqlEntityProcessor.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SqlEntityProcessor.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SqlEntityProcessor.java Sun Jan 30 16:08:25 2011
@@ -46,6 +46,7 @@ public class SqlEntityProcessor extends
protected DataSource<Iterator<Map<String, Object>>> dataSource;
+ @Override
@SuppressWarnings("unchecked")
public void init(Context context) {
super.init(context);
@@ -65,6 +66,7 @@ public class SqlEntityProcessor extends
}
}
+ @Override
public Map<String, Object> nextRow() {
if (rowIterator == null) {
String q = getQuery();
@@ -73,6 +75,7 @@ public class SqlEntityProcessor extends
return getNext();
}
+ @Override
public Map<String, Object> nextModifiedRowKey() {
if (rowIterator == null) {
String deltaQuery = context.getEntityAttribute(DELTA_QUERY);
@@ -83,6 +86,7 @@ public class SqlEntityProcessor extends
return getNext();
}
+ @Override
public Map<String, Object> nextDeletedRowKey() {
if (rowIterator == null) {
String deletedPkQuery = context.getEntityAttribute(DEL_PK_QUERY);
@@ -93,6 +97,7 @@ public class SqlEntityProcessor extends
return getNext();
}
+ @Override
public Map<String, Object> nextModifiedParentRowKey() {
if (rowIterator == null) {
String parentDeltaQuery = context.getEntityAttribute(PARENT_DELTA_QUERY);
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TemplateTransformer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TemplateTransformer.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TemplateTransformer.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TemplateTransformer.java Sun Jan 30 16:08:25 2011
@@ -51,6 +51,7 @@ public class TemplateTransformer extends
private static final Logger LOG = LoggerFactory.getLogger(TemplateTransformer.class);
private Map<String ,List<String>> templateVsVars = new HashMap<String, List<String>>();
+ @Override
@SuppressWarnings("unchecked")
public Object transformRow(Map<String, Object> row, Context context) {
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/URLDataSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/URLDataSource.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/URLDataSource.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/URLDataSource.java Sun Jan 30 16:08:25 2011
@@ -56,6 +56,7 @@ public class URLDataSource extends DataS
public URLDataSource() {
}
+ @Override
public void init(Context context, Properties initProps) {
this.context = context;
this.initProps = initProps;
@@ -81,6 +82,7 @@ public class URLDataSource extends DataS
}
}
+ @Override
public Reader getData(String query) {
URL url = null;
try {
@@ -114,6 +116,7 @@ public class URLDataSource extends DataS
}
}
+ @Override
public void close() {
}
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/VariableResolverImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/VariableResolverImpl.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/VariableResolverImpl.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/VariableResolverImpl.java Sun Jan 30 16:08:25 2011
@@ -91,10 +91,12 @@ public class VariableResolverImpl extend
container.remove(name);
}
+ @Override
public String replaceTokens(String template) {
return templateString.replaceTokens(template, this);
}
+ @Override
@SuppressWarnings("unchecked")
public Object resolve(String name) {
if (name == null)
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java Sun Jan 30 16:08:25 2011
@@ -80,6 +80,7 @@ public class XPathEntityProcessor extend
protected Thread publisherThread;
+ @Override
@SuppressWarnings("unchecked")
public void init(Context context) {
super.init(context);
@@ -171,6 +172,7 @@ public class XPathEntityProcessor extend
}
+ @Override
public Map<String, Object> nextRow() {
Map<String, Object> result;
@@ -398,6 +400,7 @@ public class XPathEntityProcessor extend
final AtomicBoolean isEnd = new AtomicBoolean(false);
final AtomicBoolean throwExp = new AtomicBoolean(true);
publisherThread = new Thread() {
+ @Override
public void run() {
try {
xpathReader.streamRecords(data, new XPathRecordReader.Handler() {
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTestCase.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTestCase.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTestCase.java Sun Jan 30 16:08:25 2011
@@ -197,89 +197,110 @@ public abstract class AbstractDataImport
this.root = root;
}
+ @Override
public String getEntityAttribute(String name) {
return entityAttrs == null ? delegate.getEntityAttribute(name) : entityAttrs.get(name);
}
+ @Override
public String getResolvedEntityAttribute(String name) {
return entityAttrs == null ? delegate.getResolvedEntityAttribute(name) :
delegate.getVariableResolver().replaceTokens(entityAttrs.get(name));
}
+ @Override
public List<Map<String, String>> getAllEntityFields() {
return entityFields == null ? delegate.getAllEntityFields()
: entityFields;
}
+ @Override
public VariableResolver getVariableResolver() {
return delegate.getVariableResolver();
}
+ @Override
public DataSource getDataSource() {
return delegate.getDataSource();
}
+ @Override
public boolean isRootEntity() {
return root;
}
+ @Override
public String currentProcess() {
return delegate.currentProcess();
}
+ @Override
public Map<String, Object> getRequestParameters() {
return delegate.getRequestParameters();
}
+ @Override
public EntityProcessor getEntityProcessor() {
return null;
}
+ @Override
public void setSessionAttribute(String name, Object val, String scope) {
delegate.setSessionAttribute(name, val, scope);
}
+ @Override
public Object getSessionAttribute(String name, String scope) {
return delegate.getSessionAttribute(name, scope);
}
+ @Override
public Context getParentContext() {
return delegate.getParentContext();
}
+ @Override
public DataSource getDataSource(String name) {
return delegate.getDataSource(name);
}
+ @Override
public SolrCore getSolrCore() {
return delegate.getSolrCore();
}
+ @Override
public Map<String, Object> getStats() {
return delegate.getStats();
}
+ @Override
public String getScript() {
return script == null ? delegate.getScript() : script;
}
+ @Override
public String getScriptLanguage() {
return scriptlang == null ? delegate.getScriptLanguage() : scriptlang;
}
+ @Override
public void deleteDoc(String id) {
}
+ @Override
public void deleteDocByQuery(String query) {
}
+ @Override
public Object resolve(String var) {
return delegate.resolve(var);
}
+ @Override
public String replaceTokens(String template) {
return delegate.replaceTokens(template);
}
@@ -318,31 +339,37 @@ public abstract class AbstractDataImport
reset();
}
+ @Override
public void finish() throws IOException {
finishCalled = true;
super.finish();
}
+ @Override
public void processAdd(AddUpdateCommand cmd) throws IOException {
processAddCalled = true;
super.processAdd(cmd);
}
+ @Override
public void processCommit(CommitUpdateCommand cmd) throws IOException {
processCommitCalled = true;
super.processCommit(cmd);
}
+ @Override
public void processDelete(DeleteUpdateCommand cmd) throws IOException {
processDeleteCalled = true;
super.processDelete(cmd);
}
+ @Override
public void processMergeIndexes(MergeIndexesCommand cmd) throws IOException {
mergeIndexesCalled = true;
super.processMergeIndexes(cmd);
}
+ @Override
public void processRollback(RollbackUpdateCommand cmd) throws IOException {
rollbackCalled = true;
super.processRollback(cmd);
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestCachedSqlEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestCachedSqlEntityProcessor.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestCachedSqlEntityProcessor.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestCachedSqlEntityProcessor.java Sun Jan 30 16:08:25 2011
@@ -158,6 +158,7 @@ public class TestCachedSqlEntityProcesso
public static class DoubleTransformer extends Transformer {
+ @Override
public Object transformRow(Map<String, Object> row, Context context) {
List<Map<String, Object>> rows = new ArrayList<Map<String, Object>>();
rows.add(row);
@@ -169,6 +170,7 @@ public class TestCachedSqlEntityProcesso
public static class UppercaseTransformer extends Transformer {
+ @Override
public Object transformRow(Map<String, Object> row, Context context) {
for (Map.Entry<String, Object> entry : row.entrySet()) {
Object val = entry.getValue();
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java Sun Jan 30 16:08:25 2011
@@ -43,6 +43,7 @@ public class TestContentStreamDataSource
SolrInstance instance = null;
JettySolrRunner jetty;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
@@ -51,6 +52,7 @@ public class TestContentStreamDataSource
jetty = createJetty(instance);
}
+ @Override
@After
public void tearDown() throws Exception {
jetty.stop();
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder.java Sun Jan 30 16:08:25 2011
@@ -33,6 +33,7 @@ import java.util.*;
*/
public class TestDocBuilder extends AbstractDataImportHandlerTestCase {
+ @Override
@After
public void tearDown() throws Exception {
MockDataSource.clearCache();
@@ -200,22 +201,27 @@ public class TestDocBuilder extends Abst
super(null, ".");
}
+ @Override
public boolean upload(SolrInputDocument doc) {
return docs.add(doc);
}
+ @Override
public void log(int event, String name, Object row) {
// Do nothing
}
+ @Override
public void doDeleteAll() {
deleteAllCalled = Boolean.TRUE;
}
+ @Override
public void commit(boolean b) {
commitCalled = Boolean.TRUE;
}
+ @Override
public void finish() {
finishCalled = Boolean.TRUE;
}
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder2.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder2.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder2.java Sun Jan 30 16:08:25 2011
@@ -252,6 +252,7 @@ public class TestDocBuilder2 extends Abs
}
public static class MockTransformer extends Transformer {
+ @Override
public Object transformRow(Map<String, Object> row, Context context) {
assertTrue("Context gave incorrect data source", context.getDataSource("mockDs") instanceof MockDataSource2);
return row;
@@ -259,6 +260,7 @@ public class TestDocBuilder2 extends Abs
}
public static class AddDynamicFieldTransformer extends Transformer {
+ @Override
public Object transformRow(Map<String, Object> row, Context context) {
// Add a dynamic field
row.put("dynamic_s", "test");
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestEntityProcessorBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestEntityProcessorBase.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestEntityProcessorBase.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestEntityProcessorBase.java Sun Jan 30 16:08:25 2011
@@ -57,6 +57,7 @@ public class TestEntityProcessorBase ext
static class T1 extends Transformer {
+ @Override
public Object transformRow(Map<String, Object> aRow, Context context) {
aRow.put("T1", "T1 called");
return aRow;
@@ -66,6 +67,7 @@ public class TestEntityProcessorBase ext
static class T2 extends Transformer {
+ @Override
public Object transformRow(Map<String, Object> aRow, Context context) {
aRow.put("T2", "T2 called");
return aRow;
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestErrorHandling.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestErrorHandling.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestErrorHandling.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestErrorHandling.java Sun Jan 30 16:08:25 2011
@@ -78,19 +78,23 @@ public class TestErrorHandling extends A
public static class StringDataSource extends DataSource<Reader> {
public static String xml = "";
+ @Override
public void init(Context context, Properties initProps) {
}
+ @Override
public Reader getData(String query) {
return new StringReader(xml);
}
+ @Override
public void close() {
}
}
public static class ExceptionTransformer extends Transformer {
+ @Override
public Object transformRow(Map<String, Object> row, Context context) {
throw new RuntimeException("Test exception");
}
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestEvaluatorBag.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestEvaluatorBag.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestEvaluatorBag.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestEvaluatorBag.java Sun Jan 30 16:08:25 2011
@@ -39,6 +39,7 @@ public class TestEvaluatorBag extends Ab
Map<String, String> urlTests;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestJdbcDataSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestJdbcDataSource.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestJdbcDataSource.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestJdbcDataSource.java Sun Jan 30 16:08:25 2011
@@ -57,6 +57,7 @@ public class TestJdbcDataSource extends
String sysProp = System.getProperty("java.naming.factory.initial");
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
@@ -69,6 +70,7 @@ public class TestJdbcDataSource extends
connection = mockControl.createMock(Connection.class);
}
+ @Override
@After
public void tearDown() throws Exception {
if (sysProp == null) {
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestLineEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestLineEntityProcessor.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestLineEntityProcessor.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestLineEntityProcessor.java Sun Jan 30 16:08:25 2011
@@ -207,12 +207,15 @@ public class TestLineEntityProcessor ext
private DataSource<Reader> getDataSource(final String xml) {
return new DataSource<Reader>() {
+ @Override
public void init(Context context, Properties initProps) {
}
+ @Override
public void close() {
}
+ @Override
public Reader getData(String query) {
return new StringReader(xml);
}
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestPlainTextEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestPlainTextEntityProcessor.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestPlainTextEntityProcessor.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestPlainTextEntityProcessor.java Sun Jan 30 16:08:25 2011
@@ -42,15 +42,18 @@ public class TestPlainTextEntityProcesso
public static class DS extends DataSource {
static String s = "hello world";
+ @Override
public void init(Context context, Properties initProps) {
}
+ @Override
public Object getData(String query) {
return new StringReader(s);
}
+ @Override
public void close() {
}
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor.java Sun Jan 30 16:08:25 2011
@@ -135,19 +135,23 @@ public class TestSqlEntityProcessor exte
private static DataSource<Iterator<Map<String, Object>>> getDs(
final List<Map<String, Object>> rows) {
return new DataSource<Iterator<Map<String, Object>>>() {
+ @Override
public Iterator<Map<String, Object>> getData(String query) {
return rows.iterator();
}
+ @Override
public void init(Context context, Properties initProps) {
}
+ @Override
public void close() {
}
};
}
public static class T extends Transformer {
+ @Override
public Object transformRow(Map<String, Object> aRow, Context context) {
aRow.put("T", "Class T");
return aRow;
@@ -162,6 +166,7 @@ public class TestSqlEntityProcessor exte
}
public static class T2 extends Transformer {
+ @Override
public Object transformRow(Map<String, Object> aRow, Context context) {
Integer count = local.get();
local.set(count + 1);
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor2.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor2.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor2.java Sun Jan 30 16:08:25 2011
@@ -214,6 +214,7 @@ public class TestSqlEntityProcessor2 ext
}
static class DateFormatValidatingEvaluator extends Evaluator {
+ @Override
public String evaluate(String expression, Context context) {
List l = EvaluatorBag.parseParams(expression, context.getVariableResolver());
Object o = l.get(0);
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestVariableResolver.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestVariableResolver.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestVariableResolver.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestVariableResolver.java Sun Jan 30 16:08:25 2011
@@ -169,6 +169,7 @@ public class TestVariableResolver extend
}
public static class E extends Evaluator{
+ @Override
public String evaluate(String expression, Context context) {
return "Hello World";
}
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java Sun Jan 30 16:08:25 2011
@@ -236,12 +236,15 @@ public class TestXPathEntityProcessor ex
private DataSource<Reader> getDataSource(final String xml) {
return new DataSource<Reader>() {
+ @Override
public void init(Context context, Properties initProps) {
}
+ @Override
public void close() {
}
+ @Override
public Reader getData(String query) {
return new StringReader(xml);
}
Modified: lucene/dev/branches/branch_3x/solr/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java Sun Jan 30 16:08:25 2011
@@ -131,6 +131,7 @@ public class ExtractingDocumentLoader ex
* @param stream
* @throws java.io.IOException
*/
+ @Override
public void load(SolrQueryRequest req, SolrQueryResponse rsp, ContentStream stream) throws IOException {
errHeader = "ExtractingDocumentLoader: " + stream.getSourceInfo();
Parser parser = null;
Modified: lucene/dev/branches/branch_3x/solr/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/ExtractingRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/ExtractingRequestHandler.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/ExtractingRequestHandler.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/ExtractingRequestHandler.java Sun Jan 30 16:08:25 2011
@@ -106,6 +106,7 @@ public class ExtractingRequestHandler ex
return new SolrContentHandlerFactory(dateFormats);
}
+ @Override
protected ContentStreamLoader newLoader(SolrQueryRequest req, UpdateRequestProcessor processor) {
return new ExtractingDocumentLoader(req, processor, config, factory);
}
Modified: lucene/dev/branches/branch_3x/solr/contrib/extraction/src/test/java/org/apache/solr/handler/ExtractingRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/extraction/src/test/java/org/apache/solr/handler/ExtractingRequestHandlerTest.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/extraction/src/test/java/org/apache/solr/handler/ExtractingRequestHandlerTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/extraction/src/test/java/org/apache/solr/handler/ExtractingRequestHandlerTest.java Sun Jan 30 16:08:25 2011
@@ -46,6 +46,7 @@ public class ExtractingRequestHandlerTes
initCore("solrconfig.xml", "schema.xml", "solr-extraction");
}
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
Modified: lucene/dev/branches/branch_3x/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java Sun Jan 30 16:08:25 2011
@@ -56,6 +56,7 @@ public class UIMAUpdateRequestProcessor
solrUIMAConfiguration.getAePath(), solrUIMAConfiguration.getRuntimeParameters());
}
+ @Override
public void processAdd(AddUpdateCommand cmd) throws IOException {
try {
/* get Solr document */
Modified: lucene/dev/branches/branch_3x/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorFactory.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorFactory.java Sun Jan 30 16:08:25 2011
@@ -29,6 +29,7 @@ import org.apache.solr.update.processor.
*/
public class UIMAUpdateRequestProcessorFactory extends UpdateRequestProcessorFactory {
+ @Override
public UpdateRequestProcessor getInstance(SolrQueryRequest req, SolrQueryResponse rsp,
UpdateRequestProcessor next) {
return new UIMAUpdateRequestProcessor(next, req.getCore());
Modified: lucene/dev/branches/branch_3x/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java Sun Jan 30 16:08:25 2011
@@ -50,6 +50,7 @@ public class UIMAUpdateRequestProcessorT
initCore("solrconfig.xml", "schema.xml", "solr-uima");
}
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
Modified: lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/SolrDocument.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/SolrDocument.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/SolrDocument.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/SolrDocument.java Sun Jan 30 16:08:25 2011
@@ -220,6 +220,7 @@ public class SolrDocument implements Map
public Collection<Collection<Object>> values() {throw new UnsupportedOperationException();}
public Collection<Object> put(String key, Collection<Object> value) {throw new UnsupportedOperationException();}
public Collection<Object> remove(Object key) {throw new UnsupportedOperationException();}
+ @Override
public String toString() {return _fields.toString();}
};
}
@@ -248,6 +249,7 @@ public class SolrDocument implements Map
public Collection<Object> values() {throw new UnsupportedOperationException();}
public Collection<Object> put(String key, Object value) {throw new UnsupportedOperationException();}
public Collection<Object> remove(Object key) {throw new UnsupportedOperationException();}
+ @Override
public String toString() {return _fields.toString();}
};
}
Modified: lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/SolrDocumentList.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/SolrDocumentList.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/SolrDocumentList.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/SolrDocumentList.java Sun Jan 30 16:08:25 2011
@@ -57,6 +57,7 @@ public class SolrDocumentList extends Ar
this.start = start;
}
+ @Override
public String toString() {
return "{numFound="+numFound
+",start="+start
Modified: lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/params/FacetParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/params/FacetParams.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/params/FacetParams.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/params/FacetParams.java Sun Jan 30 16:08:25 2011
@@ -249,6 +249,7 @@ public interface FacetParams {
*/
public enum FacetRangeOther {
BEFORE, AFTER, BETWEEN, ALL, NONE;
+ @Override
public String toString() { return super.toString().toLowerCase(); }
public static FacetRangeOther get(String label) {
try {
@@ -267,6 +268,7 @@ public interface FacetParams {
@Deprecated
public enum FacetDateOther {
BEFORE, AFTER, BETWEEN, ALL, NONE;
+ @Override
public String toString() { return super.toString().toLowerCase(); }
public static FacetDateOther get(String label) {
try {
@@ -300,6 +302,7 @@ public interface FacetParams {
*/
public enum FacetRangeInclude {
ALL, LOWER, UPPER, EDGE, OUTER;
+ @Override
public String toString() { return super.toString().toLowerCase(); }
public static FacetRangeInclude get(String label) {
try {
Modified: lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/util/ConcurrentLRUCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/util/ConcurrentLRUCache.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/util/ConcurrentLRUCache.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/util/ConcurrentLRUCache.java Sun Jan 30 16:08:25 2011
@@ -131,6 +131,7 @@ public class ConcurrentLRUCache<K,V> {
if (currentSize > upperWaterMark && !isCleaning) {
if (newThreadForCleanup) {
new Thread() {
+ @Override
public void run() {
markAndSweep();
}
@@ -358,6 +359,7 @@ public class ConcurrentLRUCache<K,V> {
Object[] getValues() { return heap; }
+ @Override
protected boolean lessThan(Object a, Object b) {
// reverse the parameter order so that the queue keeps the oldest items
return ((CacheEntry)b).lastAccessedCopy < ((CacheEntry)a).lastAccessedCopy;
@@ -487,14 +489,17 @@ public class ConcurrentLRUCache<K,V> {
return this.lastAccessedCopy < that.lastAccessedCopy ? 1 : -1;
}
+ @Override
public int hashCode() {
return value.hashCode();
}
+ @Override
public boolean equals(Object obj) {
return value.equals(obj);
}
+ @Override
public String toString() {
return "key: " + key + " value: " + value + " lastAccessed:" + lastAccessed;
}
@@ -575,6 +580,7 @@ public class ConcurrentLRUCache<K,V> {
cache = new WeakReference<ConcurrentLRUCache>(c);
}
+ @Override
public void run() {
while (true) {
synchronized (this) {
@@ -604,6 +610,7 @@ public class ConcurrentLRUCache<K,V> {
}
}
+ @Override
protected void finalize() throws Throwable {
try {
if(!isDestroyed){
Modified: lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/util/FastOutputStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/util/FastOutputStream.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/util/FastOutputStream.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/util/FastOutputStream.java Sun Jan 30 16:08:25 2011
@@ -50,6 +50,7 @@ public class FastOutputStream extends Ou
write((byte)b);
}
+ @Override
public void write(byte b[]) throws IOException {
write(b,0,b.length);
}
Modified: lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/util/NamedList.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/util/NamedList.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/util/NamedList.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/util/NamedList.java Sun Jan 30 16:08:25 2011
@@ -243,6 +243,7 @@ public class NamedList<T> implements Clo
return result;
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append('{');
@@ -314,6 +315,7 @@ public class NamedList<T> implements Clo
/**
* Makes a <i>shallow copy</i> of the named list.
*/
+ @Override
public NamedList<T> clone() {
ArrayList newList = new ArrayList(nvPairs.size());
newList.addAll(nvPairs);
@@ -352,6 +354,7 @@ public class NamedList<T> implements Clo
return (T)list.getVal( index );
}
+ @Override
public String toString()
{
return getKey()+"="+getValue();
Modified: lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/util/RegexFileFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/util/RegexFileFilter.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/util/RegexFileFilter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/util/RegexFileFilter.java Sun Jan 30 16:08:25 2011
@@ -37,6 +37,7 @@ public final class RegexFileFilter imple
public boolean accept(File f) {
return pattern.matcher(f.getName()).matches();
}
+ @Override
public String toString() {
return "regex:" + pattern.toString();
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java Sun Jan 30 16:08:25 2011
@@ -29,6 +29,7 @@ import java.util.Map;
@Deprecated
public class ArabicLetterTokenizerFactory extends BaseTokenizerFactory{
+ @Override
public void init(Map<String,String> args) {
super.init(args);
assureMatchVersion();
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/BufferedTokenStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/BufferedTokenStream.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/BufferedTokenStream.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/BufferedTokenStream.java Sun Jan 30 16:08:25 2011
@@ -94,6 +94,7 @@ public abstract class BufferedTokenStrea
*/
protected abstract Token process(Token t) throws IOException;
+ @Override
public final boolean incrementToken() throws IOException {
while (true) {
if (!outQueue.isEmpty()) return writeToken(outQueue.removeFirst());
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ChineseFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ChineseFilterFactory.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ChineseFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ChineseFilterFactory.java Sun Jan 30 16:08:25 2011
@@ -29,6 +29,7 @@ import org.apache.lucene.analysis.cn.Chi
*/
@Deprecated
public class ChineseFilterFactory extends BaseTokenFilterFactory {
+ @Override
public void init(Map<String,String> args) {
super.init(args);
warnDeprecated("Use StopFilterFactory instead.");
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java Sun Jan 30 16:08:25 2011
@@ -30,6 +30,7 @@ import org.apache.lucene.analysis.cn.Chi
*/
@Deprecated
public class ChineseTokenizerFactory extends BaseTokenizerFactory {
+ @Override
public void init(Map<String,String> args) {
super.init(args);
warnDeprecated("Use StandardTokenizerFactory instead.");
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/CommonGramsFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/CommonGramsFilter.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/CommonGramsFilter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/CommonGramsFilter.java Sun Jan 30 16:08:25 2011
@@ -189,6 +189,7 @@ public final class CommonGramsFilter ext
* eliminate the middle bigram "of-the"and save a disk seek and a whole set of
* position lookups.
*/
+ @Override
public boolean incrementToken() throws IOException {
// get the next piece of input
if (savedState != null) {
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/CommonGramsQueryFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/CommonGramsQueryFilter.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/CommonGramsQueryFilter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/CommonGramsQueryFilter.java Sun Jan 30 16:08:25 2011
@@ -62,6 +62,7 @@ public final class CommonGramsQueryFilte
/**
* {@inheritDoc}
*/
+ @Override
public void reset() throws IOException {
super.reset();
previous = null;
@@ -76,6 +77,7 @@ public final class CommonGramsQueryFilte
* <li>output:"the-rain", "rain-in" ,"in-spain", "falls", "mainly"
* </ul>
*/
+ @Override
public boolean incrementToken() throws IOException {
while (input.incrementToken()) {
State current = captureState();
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java Sun Jan 30 16:08:25 2011
@@ -35,6 +35,7 @@ public class DictionaryCompoundWordToken
private int minSubwordSize;
private int maxSubwordSize;
private boolean onlyLongestMatch;
+ @Override
public void init(Map<String, String> args) {
super.init(args);
assureMatchVersion();
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/DutchStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/DutchStemFilterFactory.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/DutchStemFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/DutchStemFilterFactory.java Sun Jan 30 16:08:25 2011
@@ -32,6 +32,7 @@ import org.apache.lucene.analysis.TokenS
@Deprecated
public class DutchStemFilterFactory extends BaseTokenFilterFactory {
+ @Override
public void init(Map<String,String> args) {
super.init(args);
warnDeprecated("use SnowballPorterFilterFactory with 'Dutch' instead");
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/EnglishPorterFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/EnglishPorterFilterFactory.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/EnglishPorterFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/EnglishPorterFilterFactory.java Sun Jan 30 16:08:25 2011
@@ -37,6 +37,7 @@ import java.util.Map;
public class EnglishPorterFilterFactory extends BaseTokenFilterFactory implements ResourceLoaderAware {
public static final String PROTECTED_TOKENS = "protected";
+ @Override
public void init(Map<String,String> args) {
super.init(args);
warnDeprecated("use PorterStemFilterFactory (Porter1) or SnowballPorterFilterFactory with 'English' (Porter2) instead");
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/FrenchStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/FrenchStemFilterFactory.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/FrenchStemFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/FrenchStemFilterFactory.java Sun Jan 30 16:08:25 2011
@@ -31,6 +31,7 @@ import org.apache.lucene.analysis.TokenS
*/
@Deprecated
public class FrenchStemFilterFactory extends BaseTokenFilterFactory {
+ @Override
public void init(Map<String,String> args) {
super.init(args);
warnDeprecated("use SnowballPorterFilterFactory with 'French' instead");
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/HTMLStripCharFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/HTMLStripCharFilter.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/HTMLStripCharFilter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/HTMLStripCharFilter.java Sun Jan 30 16:08:25 2011
@@ -675,6 +675,7 @@ public class HTMLStripCharFilter extends
+ @Override
public int read() throws IOException {
// TODO: Do we ever want to preserve CDATA sections?
// where do we have to worry about them?
@@ -743,6 +744,7 @@ public class HTMLStripCharFilter extends
}
+ @Override
public int read(char cbuf[], int off, int len) throws IOException {
int i=0;
for (i=0; i<len; i++) {
@@ -757,6 +759,7 @@ public class HTMLStripCharFilter extends
return i;
}
+ @Override
public void close() throws IOException {
input.close();
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/HyphenationCompoundWordTokenFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/HyphenationCompoundWordTokenFilterFactory.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/HyphenationCompoundWordTokenFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/HyphenationCompoundWordTokenFilterFactory.java Sun Jan 30 16:08:25 2011
@@ -61,6 +61,7 @@ public class HyphenationCompoundWordToke
private int maxSubwordSize;
private boolean onlyLongestMatch;
+ @Override
public void init(Map<String, String> args) {
super.init(args);
assureMatchVersion();
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ISOLatin1AccentFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ISOLatin1AccentFilterFactory.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ISOLatin1AccentFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ISOLatin1AccentFilterFactory.java Sun Jan 30 16:08:25 2011
@@ -28,6 +28,7 @@ import org.apache.lucene.analysis.TokenS
*/
@Deprecated
public class ISOLatin1AccentFilterFactory extends BaseTokenFilterFactory {
+ @Override
public void init(Map<String,String> args) {
super.init(args);
warnDeprecated("use ASCIIFoldingFilterFactory instead");
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java Sun Jan 30 16:08:25 2011
@@ -26,6 +26,7 @@ import org.apache.lucene.analysis.id.Ind
public class IndonesianStemFilterFactory extends BaseTokenFilterFactory {
private boolean stemDerivational = true;
+ @Override
public void init(Map<String, String> args) {
super.init(args);
stemDerivational = getBoolean("stemDerivational", true);
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/NumericPayloadTokenFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/NumericPayloadTokenFilterFactory.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/NumericPayloadTokenFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/NumericPayloadTokenFilterFactory.java Sun Jan 30 16:08:25 2011
@@ -27,6 +27,7 @@ import java.util.Map;
public class NumericPayloadTokenFilterFactory extends BaseTokenFilterFactory {
private float payload;
private String typeMatch;
+ @Override
public void init(Map<String, String> args) {
super.init(args);
payload = Float.parseFloat(args.get("payload"));
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/PatternReplaceCharFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/PatternReplaceCharFilter.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/PatternReplaceCharFilter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/PatternReplaceCharFilter.java Sun Jan 30 16:08:25 2011
@@ -114,6 +114,7 @@ public class PatternReplaceCharFilter ex
}
}
+ @Override
public int read() throws IOException {
while( prepareReplaceBlock() ){
return replaceBlockBuffer.charAt( replaceBlockBufferOffset++ );
@@ -121,6 +122,7 @@ public class PatternReplaceCharFilter ex
return -1;
}
+ @Override
public int read(char[] cbuf, int off, int len) throws IOException {
char[] tmp = new char[len];
int l = input.read(tmp, 0, len);
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/PatternReplaceCharFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/PatternReplaceCharFilterFactory.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/PatternReplaceCharFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/PatternReplaceCharFilterFactory.java Sun Jan 30 16:08:25 2011
@@ -35,6 +35,7 @@ public class PatternReplaceCharFilterFac
private int maxBlockChars;
private String blockDelimiters;
+ @Override
public void init(Map<String, String> args) {
super.init( args );
try {
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/PositionFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/PositionFilterFactory.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/PositionFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/PositionFilterFactory.java Sun Jan 30 16:08:25 2011
@@ -33,6 +33,7 @@ import java.util.Map;
public class PositionFilterFactory extends BaseTokenFilterFactory {
private int positionIncrement;
+ @Override
public void init(Map<String, String> args) {
super.init(args);
positionIncrement = getInt("positionIncrement", 0);
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/RussianStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/RussianStemFilterFactory.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/RussianStemFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/RussianStemFilterFactory.java Sun Jan 30 16:08:25 2011
@@ -32,6 +32,7 @@ import org.apache.lucene.analysis.snowba
@Deprecated
public class RussianStemFilterFactory extends BaseTokenFilterFactory {
+ @Override
public void init(Map<String,String> args) {
super.init(args);
warnDeprecated("use SnowballPorterFilterFactory with 'Russian' instead");
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ShingleFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ShingleFilterFactory.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ShingleFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ShingleFilterFactory.java Sun Jan 30 16:08:25 2011
@@ -34,6 +34,7 @@ public class ShingleFilterFactory extend
private boolean outputUnigramsIfNoShingles;
private String tokenSeparator;
+ @Override
public void init(Map<String, String> args) {
super.init(args);
maxShingleSize = getInt("maxShingleSize",