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 [6/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/src/test/org/apache/solr/BaseDistributedSearchTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/BaseDistributedSearchTestCase.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/BaseDistributedSearchTestCase.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/BaseDistributedSearchTestCase.java Sun Jan 30 16:08:25 2011
@@ -84,24 +84,28 @@ public abstract class BaseDistributedSea
public static Logger log = LoggerFactory.getLogger(BaseDistributedSearchTestCase.class);
public static RandVal rint = new RandVal() {
+ @Override
public Object val() {
return r.nextInt();
}
};
public static RandVal rlong = new RandVal() {
+ @Override
public Object val() {
return r.nextLong();
}
};
public static RandVal rfloat = new RandVal() {
+ @Override
public Object val() {
return r.nextFloat();
}
};
public static RandVal rdouble = new RandVal() {
+ @Override
public Object val() {
return r.nextDouble();
}
@@ -278,6 +282,7 @@ public abstract class BaseDistributedSea
Thread[] threads = new Thread[nThreads];
for (int i = 0; i < threads.length; i++) {
threads[i] = new Thread() {
+ @Override
public void run() {
for (int j = 0; j < stress; j++) {
int which = r.nextInt(clients.size());
@@ -564,6 +569,7 @@ public abstract class BaseDistributedSea
public static class RandDate extends RandVal {
public static TrieDateField df = new TrieDateField();
+ @Override
public Object val() {
long v = r.nextLong();
Date d = new Date(v);
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/BasicFunctionalityTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/BasicFunctionalityTest.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/BasicFunctionalityTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/BasicFunctionalityTest.java Sun Jan 30 16:08:25 2011
@@ -223,10 +223,15 @@ public class BasicFunctionalityTest exte
public void testRequestHandlerBaseException() {
final String tmp = "BOO! ignore_exception";
SolrRequestHandler handler = new RequestHandlerBase() {
+ @Override
public String getDescription() { return tmp; }
+ @Override
public String getSourceId() { return tmp; }
+ @Override
public String getSource() { return tmp; }
+ @Override
public String getVersion() { return tmp; }
+ @Override
public void handleRequestBody
( SolrQueryRequest req, SolrQueryResponse rsp ) {
throw new RuntimeException(tmp);
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/SolrTestCaseJ4.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/SolrTestCaseJ4.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/SolrTestCaseJ4.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/SolrTestCaseJ4.java Sun Jan 30 16:08:25 2011
@@ -595,6 +595,7 @@ public abstract class SolrTestCaseJ4 ext
/** Neccessary to make method signatures un-ambiguous */
public static class Doc {
public String xml;
+ @Override
public String toString() { return xml; }
}
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/TestTrie.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/TestTrie.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/TestTrie.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/TestTrie.java Sun Jan 30 16:08:25 2011
@@ -41,6 +41,7 @@ public class TestTrie extends SolrTestCa
initCore("solrconfig.xml","schema-trie.xml");
}
+ @Override
@After
public void tearDown() throws Exception {
clearIndex();
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestBufferedTokenStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestBufferedTokenStream.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestBufferedTokenStream.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestBufferedTokenStream.java Sun Jan 30 16:08:25 2011
@@ -34,6 +34,7 @@ public class TestBufferedTokenStream ext
/** Example of a class implementing the rule "A" "B" => "Q" "B" */
public static class AB_Q_Stream extends BufferedTokenStream {
public AB_Q_Stream(TokenStream input) {super(input);}
+ @Override
protected Token process(Token t) throws IOException {
if ("A".equals(new String(t.buffer(), 0, t.length()))) {
Token t2 = read();
@@ -47,6 +48,7 @@ public class TestBufferedTokenStream ext
/** Example of a class implementing "A" "B" => "A" "A" "B" */
public static class AB_AAB_Stream extends BufferedTokenStream {
public AB_AAB_Stream(TokenStream input) {super(input);}
+ @Override
protected Token process(Token t) throws IOException {
if ("A".equals(new String(t.buffer(), 0, t.length())) &&
"B".equals(new String(peek(1).buffer(), 0, peek(1).length())))
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestRemoveDuplicatesTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestRemoveDuplicatesTokenFilter.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestRemoveDuplicatesTokenFilter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestRemoveDuplicatesTokenFilter.java Sun Jan 30 16:08:25 2011
@@ -47,6 +47,7 @@ public class TestRemoveDuplicatesTokenFi
CharTermAttribute termAtt = addAttribute(CharTermAttribute.class);
OffsetAttribute offsetAtt = addAttribute(OffsetAttribute.class);
PositionIncrementAttribute posIncAtt = addAttribute(PositionIncrementAttribute.class);
+ @Override
public boolean incrementToken() {
if (toks.hasNext()) {
clearAttributes();
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestReversedWildcardFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestReversedWildcardFilterFactory.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestReversedWildcardFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestReversedWildcardFilterFactory.java Sun Jan 30 16:08:25 2011
@@ -47,6 +47,7 @@ public class TestReversedWildcardFilterF
initCore("solrconfig.xml","schema-reversed.xml");
}
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestSynonymFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestSynonymFilter.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestSynonymFilter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestSynonymFilter.java Sun Jan 30 16:08:25 2011
@@ -399,6 +399,7 @@ public class TestSynonymFilter extends B
this(tokens.toArray(new Token[tokens.size()]));
}
+ @Override
public boolean incrementToken() throws IOException {
if (index >= tokens.length)
return false;
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestTrimFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestTrimFilter.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestTrimFilter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestTrimFilter.java Sun Jan 30 16:08:25 2011
@@ -98,6 +98,7 @@ public class TestTrimFilter extends Base
this(tokens.toArray(new Token[tokens.size()]));
}
+ @Override
public boolean incrementToken() throws IOException {
if (index >= tokens.length)
return false;
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestWordDelimiterFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestWordDelimiterFilter.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestWordDelimiterFilter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestWordDelimiterFilter.java Sun Jan 30 16:08:25 2011
@@ -424,6 +424,7 @@ public class TestWordDelimiterFilter ext
/* analyzer that uses whitespace + wdf */
Analyzer a = new Analyzer() {
+ @Override
public TokenStream tokenStream(String field, Reader reader) {
return new WordDelimiterFilter(
new WhitespaceTokenizer(DEFAULT_VERSION, reader),
@@ -450,6 +451,7 @@ public class TestWordDelimiterFilter ext
/* analyzer that will consume tokens with large position increments */
Analyzer a2 = new Analyzer() {
+ @Override
public TokenStream tokenStream(String field, Reader reader) {
return new WordDelimiterFilter(
new LargePosIncTokenFilter(
@@ -482,6 +484,7 @@ public class TestWordDelimiterFilter ext
new int[] { 1, 11, 1 });
Analyzer a3 = new Analyzer() {
+ @Override
public TokenStream tokenStream(String field, Reader reader) {
StopFilter filter = new StopFilter(DEFAULT_VERSION,
new WhitespaceTokenizer(DEFAULT_VERSION, reader), StandardAnalyzer.STOP_WORDS_SET);
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/SolrExampleTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/SolrExampleTestBase.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/SolrExampleTestBase.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/SolrExampleTestBase.java Sun Jan 30 16:08:25 2011
@@ -30,6 +30,7 @@ import org.apache.solr.util.AbstractSolr
*/
abstract public class SolrExampleTestBase extends AbstractSolrTestCase
{
+ @Override
public String getSolrHome() { return "../../../example/solr/"; }
@Override public String getSchemaFile() { return getSolrHome()+"conf/schema.xml"; }
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java Sun Jan 30 16:08:25 2011
@@ -48,6 +48,7 @@ public class TestLBHttpSolrServer extend
SolrInstance[] solr = new SolrInstance[3];
HttpClient httpClient;
+ @Override
public void setUp() throws Exception {
super.setUp();
httpClient = new HttpClient(new MultiThreadedHttpConnectionManager());
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java Sun Jan 30 16:08:25 2011
@@ -67,6 +67,7 @@ public class TestSolrProperties extends
return "solr.xml";
}
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
@@ -78,6 +79,7 @@ public class TestSolrProperties extends
cores = new CoreContainer(home.getAbsolutePath(), solrXml);
}
+ @Override
@After
public void tearDown() throws Exception {
if (cores != null)
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/AlternateDirectoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/AlternateDirectoryTest.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/AlternateDirectoryTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/AlternateDirectoryTest.java Sun Jan 30 16:08:25 2011
@@ -48,6 +48,7 @@ public class AlternateDirectoryTest exte
public static volatile boolean openCalled = false;
public static volatile Directory dir;
+ @Override
public Directory open(String path) throws IOException {
openCalled = true;
// need to close the directory, or otherwise the test fails.
@@ -63,6 +64,7 @@ public class AlternateDirectoryTest exte
static public class TestIndexReaderFactory extends IndexReaderFactory {
static volatile boolean newReaderCalled = false;
+ @Override
public IndexReader newReader(Directory indexDir, boolean readOnly)
throws IOException {
TestIndexReaderFactory.newReaderCalled = true;
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/DummyValueSourceParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/DummyValueSourceParser.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/DummyValueSourceParser.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/DummyValueSourceParser.java Sun Jan 30 16:08:25 2011
@@ -32,17 +32,21 @@ import org.apache.solr.search.function.V
public class DummyValueSourceParser extends ValueSourceParser {
private NamedList args;
+ @Override
public void init(NamedList args) {
this.args = args;
}
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
ValueSource source = fp.parseValueSource();
ValueSource result = new SimpleFloatFunction(source) {
+ @Override
protected String name() {
return "foo";
}
+ @Override
protected float func(int doc, DocValues vals) {
float result = 0;
return result;
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/IndexReaderFactoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/IndexReaderFactoryTest.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/IndexReaderFactoryTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/IndexReaderFactoryTest.java Sun Jan 30 16:08:25 2011
@@ -20,10 +20,12 @@ import org.apache.solr.util.AbstractSolr
public class IndexReaderFactoryTest extends AbstractSolrTestCase {
+ @Override
public String getSchemaFile() {
return "schema.xml";
}
+ @Override
public String getSolrConfigFile() {
return "solrconfig-termindex.xml";
}
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/MockQuerySenderListenerReqHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/MockQuerySenderListenerReqHandler.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/MockQuerySenderListenerReqHandler.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/MockQuerySenderListenerReqHandler.java Sun Jan 30 16:08:25 2011
@@ -34,36 +34,43 @@ public class MockQuerySenderListenerReqH
AtomicInteger initCounter = new AtomicInteger(0);
+ @Override
public void init(NamedList args) {
initCounter.incrementAndGet();
super.init(args);
}
+ @Override
public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws Exception {
this.req = req;
this.rsp = rsp;
}
+ @Override
public String getDescription() {
String result = null;
return result;
}
+ @Override
public String getSourceId() {
String result = null;
return result;
}
+ @Override
public String getSource() {
String result = null;
return result;
}
+ @Override
public String getVersion() {
String result = null;
return result;
}
+ @Override
public NamedList<Object> getStatistics() {
NamedList<Object> lst = super.getStatistics();
lst.add("initCount", initCounter.intValue());
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/TestArbitraryIndexDir.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/TestArbitraryIndexDir.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/TestArbitraryIndexDir.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/TestArbitraryIndexDir.java Sun Jan 30 16:08:25 2011
@@ -41,6 +41,7 @@ import org.xml.sax.SAXException;
*/
public class TestArbitraryIndexDir extends AbstractSolrTestCase{
+ @Override
public void setUp() throws Exception {
super.setUp();
@@ -57,6 +58,7 @@ public class TestArbitraryIndexDir exten
("standard",0,20,"version","2.2");
}
+ @Override
public void tearDown() throws Exception {
super.tearDown();
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/TestBadConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/TestBadConfig.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/TestBadConfig.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/TestBadConfig.java Sun Jan 30 16:08:25 2011
@@ -21,9 +21,12 @@ import org.apache.solr.util.AbstractSolr
public class TestBadConfig extends AbstractSolrTestCase {
+ @Override
public String getSchemaFile() { return "schema.xml"; }
+ @Override
public String getSolrConfigFile() { return "bad_solrconfig.xml"; }
+ @Override
public void setUp() throws Exception {
ignoreException("unset.sys.property");
try {
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/TestJmxIntegration.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/TestJmxIntegration.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/TestJmxIntegration.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/TestJmxIntegration.java Sun Jan 30 16:08:25 2011
@@ -46,6 +46,7 @@ public class TestJmxIntegration extends
return "solrconfig.xml";
}
+ @Override
@Before
public void setUp() throws Exception {
// Make sure that at least one MBeanServer is available
@@ -53,6 +54,7 @@ public class TestJmxIntegration extends
super.setUp();
}
+ @Override
@After
public void tearDown() throws Exception {
super.tearDown();
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/TestJmxMonitoredMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/TestJmxMonitoredMap.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/TestJmxMonitoredMap.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/TestJmxMonitoredMap.java Sun Jan 30 16:08:25 2011
@@ -51,6 +51,7 @@ public class TestJmxMonitoredMap extends
private JmxMonitoredMap<String, SolrInfoMBean> monitoredMap;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
@@ -84,6 +85,7 @@ public class TestJmxMonitoredMap extends
}
}
+ @Override
@After
public void tearDown() throws Exception {
try {
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/TestPropInject.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/TestPropInject.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/TestPropInject.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/TestPropInject.java Sun Jan 30 16:08:25 2011
@@ -26,10 +26,12 @@ import org.apache.solr.update.DirectUpda
import org.apache.solr.util.AbstractSolrTestCase;
public class TestPropInject extends AbstractSolrTestCase {
+ @Override
public String getSchemaFile() {
return "schema.xml";
}
+ @Override
public String getSolrConfigFile() {
return "solrconfig-propinject.xml";
}
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java Sun Jan 30 16:08:25 2011
@@ -34,6 +34,7 @@ public class TestSolrDeletionPolicy1 ext
initCore("solrconfig-delpolicy1.xml","schema.xml");
}
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/TestXIncludeConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/TestXIncludeConfig.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/TestXIncludeConfig.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/TestXIncludeConfig.java Sun Jan 30 16:08:25 2011
@@ -33,11 +33,13 @@ import javax.xml.parsers.DocumentBuilder
public class TestXIncludeConfig extends AbstractSolrTestCase {
protected boolean supports;
+ @Override
public String getSchemaFile() {
return "schema.xml";
}
//public String getSolrConfigFile() { return "solrconfig.xml"; }
+ @Override
public String getSolrConfigFile() {
return "solrconfig-xinclude.xml";
}
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/handler/JsonLoaderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/handler/JsonLoaderTest.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/handler/JsonLoaderTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/handler/JsonLoaderTest.java Sun Jan 30 16:08:25 2011
@@ -136,23 +136,28 @@ class BufferingRequestProcessor extends
super(next);
}
+ @Override
public void processAdd(AddUpdateCommand cmd) throws IOException {
addCommands.add( cmd );
}
+ @Override
public void processDelete(DeleteUpdateCommand cmd) throws IOException {
deleteCommands.add( cmd );
}
+ @Override
public void processCommit(CommitUpdateCommand cmd) throws IOException {
commitCommands.add( cmd );
}
+ @Override
public void processRollback(RollbackUpdateCommand cmd) throws IOException
{
rollbackCommands.add( cmd );
}
+ @Override
public void finish() throws IOException {
// nothing?
}
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/handler/TestCSVLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/handler/TestCSVLoader.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/handler/TestCSVLoader.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/handler/TestCSVLoader.java Sun Jan 30 16:08:25 2011
@@ -41,6 +41,7 @@ public class TestCSVLoader extends SolrT
String def_charset = "UTF-8";
File file = new File(filename);
+ @Override
@Before
public void setUp() throws Exception {
// if you override setUp or tearDown, you better call
@@ -49,6 +50,7 @@ public class TestCSVLoader extends SolrT
cleanup();
}
+ @Override
@After
public void tearDown() throws Exception {
// if you override setUp or tearDown, you better call
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/handler/TestReplicationHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/handler/TestReplicationHandler.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/handler/TestReplicationHandler.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/handler/TestReplicationHandler.java Sun Jan 30 16:08:25 2011
@@ -623,6 +623,7 @@ public class TestReplicationHandler exte
class BackupThread extends Thread {
volatile String fail = null;
+ @Override
public void run() {
String masterUrl = "http://localhost:" + masterJetty.getLocalPort() + "/solr/replication?command=" + ReplicationHandler.CMD_BACKUP;
URL url;
@@ -647,6 +648,7 @@ public class TestReplicationHandler exte
volatile String fail = null;
volatile String response = null;
volatile boolean success = false;
+ @Override
public void run() {
String masterUrl = "http://localhost:" + masterJetty.getLocalPort() + "/solr/replication?command=" + ReplicationHandler.CMD_DETAILS;
URL url;
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/request/TestBinaryResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/request/TestBinaryResponseWriter.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/request/TestBinaryResponseWriter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/request/TestBinaryResponseWriter.java Sun Jan 30 16:08:25 2011
@@ -38,10 +38,12 @@ import java.util.UUID;
*/
public class TestBinaryResponseWriter extends AbstractSolrTestCase {
+ @Override
public String getSchemaFile() {
return "schema12.xml";
}
+ @Override
public String getSolrConfigFile() {
return "solrconfig.xml";
}
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/request/TestWriterPerf.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/request/TestWriterPerf.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/request/TestWriterPerf.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/request/TestWriterPerf.java Sun Jan 30 16:08:25 2011
@@ -30,15 +30,19 @@ import java.io.*;
public class TestWriterPerf extends AbstractSolrTestCase {
+ @Override
public String getSchemaFile() { return "schema11.xml"; }
+ @Override
public String getSolrConfigFile() { return "solrconfig-functionquery.xml"; }
public String getCoreName() { return "basic"; }
+ @Override
public void setUp() throws Exception {
// if you override setUp or tearDown, you better call
// the super classes version
super.setUp();
}
+ @Override
public void tearDown() throws Exception {
// if you override setUp or tearDown, you better call
// the super classes version
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/schema/CustomSimilarityFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/schema/CustomSimilarityFactory.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/schema/CustomSimilarityFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/schema/CustomSimilarityFactory.java Sun Jan 30 16:08:25 2011
@@ -19,6 +19,7 @@ package org.apache.solr.schema;
import org.apache.lucene.search.Similarity;
public class CustomSimilarityFactory extends SimilarityFactory {
+ @Override
public Similarity getSimilarity() {
return new MockConfigurableSimilarity(params.get("echo"));
}
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/schema/DateFieldTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/schema/DateFieldTest.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/schema/DateFieldTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/schema/DateFieldTest.java Sun Jan 30 16:08:25 2011
@@ -22,11 +22,13 @@ import java.util.Date;
public class DateFieldTest extends LegacyDateFieldTest {
+ @Override
public void setUp() throws Exception {
super.setUp();
f = new DateField();
}
+ @Override
public void testToInternal() throws Exception {
assertToI("1995-12-31T23:59:59.999", "1995-12-31T23:59:59.999666Z");
assertToI("1995-12-31T23:59:59.999", "1995-12-31T23:59:59.999Z");
@@ -51,6 +53,7 @@ public class DateFieldTest extends Legac
assertToI("1995-12-31T00:00:00", "1995-12-31T23:59:59.123999Z/DAY");
}
+ @Override
public void testToInternalObj() throws Exception {
assertToI("1995-12-31T23:59:59.999", 820454399999l);
assertToI("1995-12-31T23:59:59.99", 820454399990l);
@@ -90,6 +93,7 @@ public class DateFieldTest extends Legac
assertToObject(820454399000l, "1995-12-31T23:59:59Z");
}
+ @Override
public void testFormatter() {
assertEquals("1970-01-01T00:00:00.005", f.formatDate(new Date(5)));
assertEquals("1970-01-01T00:00:00", f.formatDate(new Date(0)));
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/schema/LegacyDateFieldTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/schema/LegacyDateFieldTest.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/schema/LegacyDateFieldTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/schema/LegacyDateFieldTest.java Sun Jan 30 16:08:25 2011
@@ -33,6 +33,7 @@ public class LegacyDateFieldTest extends
protected DateField f = null;
protected DateMathParser p = null;
+ @Override
public void setUp() throws Exception {
super.setUp();
p = new DateMathParser(UTC, Locale.US);
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/schema/TestBinaryField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/schema/TestBinaryField.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/schema/TestBinaryField.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/schema/TestBinaryField.java Sun Jan 30 16:08:25 2011
@@ -174,6 +174,7 @@ public class TestBinaryField extends Luc
}
+ @Override
public void tearDown() throws Exception {
jetty.stop();
super.tearDown();
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/FooQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/FooQParserPlugin.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/FooQParserPlugin.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/FooQParserPlugin.java Sun Jan 30 16:08:25 2011
@@ -27,6 +27,7 @@ import org.apache.lucene.index.Term;
public class FooQParserPlugin extends QParserPlugin {
+ @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new FooQParser(qstr, localParams, params, req);
}
@@ -40,6 +41,7 @@ class FooQParser extends QParser {
super(qstr, localParams, params, req);
}
+ @Override
public Query parse() throws ParseException {
return new TermQuery(new Term(localParams.get(QueryParsing.F), localParams.get(QueryParsing.V)));
}
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/TestExtendedDismaxParser.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/TestExtendedDismaxParser.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/TestExtendedDismaxParser.java Sun Jan 30 16:08:25 2011
@@ -20,15 +20,19 @@ package org.apache.solr.search;
import org.apache.solr.util.AbstractSolrTestCase;
public class TestExtendedDismaxParser extends AbstractSolrTestCase {
+ @Override
public String getSchemaFile() { return "schema12.xml"; }
+ @Override
public String getSolrConfigFile() { return "solrconfig.xml"; }
// public String getCoreName() { return "collection1"; }
+ @Override
public void setUp() throws Exception {
// if you override setUp or tearDown, you better call
// the super classes version
super.setUp();
}
+ @Override
public void tearDown() throws Exception {
// if you override setUp or tearDown, you better call
// the super classes version
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/TestFastLRUCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/TestFastLRUCache.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/TestFastLRUCache.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/TestFastLRUCache.java Sun Jan 30 16:08:25 2011
@@ -188,6 +188,7 @@ public class TestFastLRUCache extends Lu
for (int i=0; i<threads.length; i++) {
final int seed=random.nextInt();
threads[i] = new Thread() {
+ @Override
public void run() {
int ret = useCache(sc, numGets/nThreads, maxKey, seed);
puts.addAndGet(ret);
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/TestIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/TestIndexSearcher.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/TestIndexSearcher.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/TestIndexSearcher.java Sun Jan 30 16:08:25 2011
@@ -26,16 +26,20 @@ import java.io.IOException;
public class TestIndexSearcher extends AbstractSolrTestCase {
+ @Override
public String getSchemaFile() { return "schema11.xml"; }
+ @Override
public String getSolrConfigFile() { return "solrconfig.xml"; }
public String getCoreName() { return "basic"; }
+ @Override
public void setUp() throws Exception {
// if you override setUp or tearDown, you better call
// the super classes version
super.setUp();
}
+ @Override
public void tearDown() throws Exception {
// if you override setUp or tearDown, you better call
// the super classes version
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/TestQueryTypes.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/TestQueryTypes.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/TestQueryTypes.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/TestQueryTypes.java Sun Jan 30 16:08:25 2011
@@ -20,16 +20,20 @@ import org.apache.solr.util.AbstractSolr
public class TestQueryTypes extends AbstractSolrTestCase {
+ @Override
public String getSchemaFile() { return "schema11.xml"; }
+ @Override
public String getSolrConfigFile() { return "solrconfig.xml"; }
public String getCoreName() { return "basic"; }
+ @Override
public void setUp() throws Exception {
// if you override setUp or tearDown, you better call
// the super classes version
super.setUp();
}
+ @Override
public void tearDown() throws Exception {
// if you override setUp or tearDown, you better call
// the super classes version
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/TestQueryUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/TestQueryUtils.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/TestQueryUtils.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/TestQueryUtils.java Sun Jan 30 16:08:25 2011
@@ -31,12 +31,16 @@ import java.util.List;
*/
public class TestQueryUtils extends AbstractSolrTestCase {
+ @Override
public String getSchemaFile() { return "schema.xml"; }
+ @Override
public String getSolrConfigFile() { return "solrconfig.xml"; }
+ @Override
public void setUp() throws Exception {
super.setUp();
}
+ @Override
public void tearDown() throws Exception {
super.tearDown();
}
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/TestRangeQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/TestRangeQuery.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/TestRangeQuery.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/TestRangeQuery.java Sun Jan 30 16:08:25 2011
@@ -33,6 +33,7 @@ public class TestRangeQuery extends Solr
initCore("solrconfig.xml", "schema11.xml");
}
+ @Override
@Before
public void setUp() throws Exception {
// if you override setUp or tearDown, you better call
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/TestSearchPerf.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/TestSearchPerf.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/TestSearchPerf.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/TestSearchPerf.java Sun Jan 30 16:08:25 2011
@@ -35,12 +35,16 @@ import java.io.IOException;
*/
public class TestSearchPerf extends AbstractSolrTestCase {
+ @Override
public String getSchemaFile() { return "schema11.xml"; }
+ @Override
public String getSolrConfigFile() { return "solrconfig.xml"; }
+ @Override
public void setUp() throws Exception {
super.setUp();
}
+ @Override
public void tearDown() throws Exception {
super.tearDown();
}
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/function/NvlValueSourceParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/function/NvlValueSourceParser.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/function/NvlValueSourceParser.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/function/NvlValueSourceParser.java Sun Jan 30 16:08:25 2011
@@ -42,16 +42,19 @@ public class NvlValueSourceParser extend
*/
private float nvlFloatValue = 0.0f;
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
ValueSource source = fp.parseValueSource();
final float nvl = fp.parseFloat();
return new SimpleFloatFunction(source) {
- protected String name() {
+ @Override
+ protected String name() {
return "nvl";
}
- protected float func(int doc, DocValues vals) {
+ @Override
+ protected float func(int doc, DocValues vals) {
float v = vals.floatVal(doc);
if (v == nvlFloatValue) {
return nvl;
@@ -62,6 +65,7 @@ public class NvlValueSourceParser extend
};
}
+ @Override
public void init(NamedList args) {
/* initialize the value to consider as null */
Float nvlFloatValueArg = (Float) args.get("nvlFloatValue");
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/function/SortByFunctionTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/function/SortByFunctionTest.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/function/SortByFunctionTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/function/SortByFunctionTest.java Sun Jan 30 16:08:25 2011
@@ -24,10 +24,12 @@ import org.apache.solr.util.AbstractSolr
*
**/
public class SortByFunctionTest extends AbstractSolrTestCase {
+ @Override
public String getSchemaFile() {
return "schema.xml";
}
+ @Override
public String getSolrConfigFile() {
return "solrconfig.xml";
}
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/servlet/CacheHeaderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/servlet/CacheHeaderTest.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/servlet/CacheHeaderTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/servlet/CacheHeaderTest.java Sun Jan 30 16:08:25 2011
@@ -85,6 +85,7 @@ public class CacheHeaderTest extends Cac
}
}
+ @Override
protected void doLastModified(String method) throws Exception {
// We do a first request to get the last modified
// This must result in a 200 OK response
@@ -140,6 +141,7 @@ public class CacheHeaderTest extends Cac
}
// test ETag
+ @Override
protected void doETag(String method) throws Exception {
HttpMethodBase get = getSelectMethod(method);
getClient().executeMethod(get);
@@ -211,6 +213,7 @@ public class CacheHeaderTest extends Cac
.getStatusCode());
}
+ @Override
protected void doCacheControl(String method) throws Exception {
if ("POST".equals(method)) {
HttpMethodBase m = getSelectMethod(method);
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/servlet/DirectSolrConnectionTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/servlet/DirectSolrConnectionTest.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/servlet/DirectSolrConnectionTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/servlet/DirectSolrConnectionTest.java Sun Jan 30 16:08:25 2011
@@ -24,7 +24,9 @@ import org.apache.solr.util.AbstractSolr
public class DirectSolrConnectionTest extends AbstractSolrTestCase
{
+ @Override
public String getSchemaFile() { return "solr/crazy-path-to-schema.xml"; }
+ @Override
public String getSolrConfigFile() { return "solr/crazy-path-to-config.xml"; }
DirectSolrConnection direct;
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java Sun Jan 30 16:08:25 2011
@@ -35,18 +35,21 @@ public class NoCacheHeaderTest extends C
}
// The tests
+ @Override
@Test
public void testLastModified() throws Exception {
doLastModified("GET");
doLastModified("HEAD");
}
+ @Override
@Test
public void testEtag() throws Exception {
doETag("GET");
doETag("HEAD");
}
+ @Override
@Test
public void testCacheControl() throws Exception {
doCacheControl("GET");
@@ -54,6 +57,7 @@ public class NoCacheHeaderTest extends C
doCacheControl("POST");
}
+ @Override
protected void doLastModified(String method) throws Exception {
// We do a first request to get the last modified
// This must result in a 200 OK response
@@ -105,6 +109,7 @@ public class NoCacheHeaderTest extends C
}
// test ETag
+ @Override
protected void doETag(String method) throws Exception {
HttpMethodBase get = getSelectMethod(method);
getClient().executeMethod(get);
@@ -153,6 +158,7 @@ public class NoCacheHeaderTest extends C
.getStatusCode());
}
+ @Override
protected void doCacheControl(String method) throws Exception {
HttpMethodBase m = getSelectMethod(method);
getClient().executeMethod(m);
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java Sun Jan 30 16:08:25 2011
@@ -227,6 +227,7 @@ public class IndexBasedSpellCheckerTest
}
private class TestSpellChecker extends IndexBasedSpellChecker{
+ @Override
public SpellChecker getSpellChecker(){
return spellChecker;
}
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/update/AutoCommitTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/update/AutoCommitTest.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/update/AutoCommitTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/update/AutoCommitTest.java Sun Jan 30 16:08:25 2011
@@ -78,7 +78,9 @@ class CommitListener implements SolrEven
public class AutoCommitTest extends AbstractSolrTestCase {
+ @Override
public String getSchemaFile() { return "schema.xml"; }
+ @Override
public String getSolrConfigFile() { return "solrconfig.xml"; }
/**
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java Sun Jan 30 16:08:25 2011
@@ -31,10 +31,12 @@ import java.io.FileFilter;
**/
public class DirectUpdateHandlerOptimizeTest extends AbstractSolrTestCase {
+ @Override
public String getSchemaFile() {
return "schema12.xml";
}
+ @Override
public String getSolrConfigFile() {
return "solrconfig-duh-optimize.xml";
}
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java Sun Jan 30 16:08:25 2011
@@ -49,6 +49,7 @@ public class DirectUpdateHandlerTest ext
initCore("solrconfig.xml", "schema12.xml");
}
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/update/TestIndexingPerformance.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/update/TestIndexingPerformance.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/update/TestIndexingPerformance.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/update/TestIndexingPerformance.java Sun Jan 30 16:08:25 2011
@@ -34,7 +34,9 @@ import java.util.Arrays;
*/
public class TestIndexingPerformance extends AbstractSolrTestCase {
+ @Override
public String getSchemaFile() { return "schema12.xml"; }
+ @Override
public String getSolrConfigFile() { return "solrconfig_perf.xml"; }
public void testIndexingPerf() throws IOException {
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java Sun Jan 30 16:08:25 2011
@@ -124,6 +124,7 @@ public class SignatureUpdateProcessorFac
for (int i = 0; i < threads.length; i++) {
threads[i] = new Thread() {
+ @Override
public void run() {
for (int i = 0; i < 30; i++) {
// h.update(adoc("id", Integer.toString(1+ i), "v_t",
@@ -145,6 +146,7 @@ public class SignatureUpdateProcessorFac
for (int i = 0; i < threads2.length; i++) {
threads2[i] = new Thread() {
+ @Override
public void run() {
for (int i = 0; i < 10; i++) {
// h.update(adoc("id" , Integer.toString(1+ i + 10000), "v_t",
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/util/AbstractSolrTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/util/AbstractSolrTestCase.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/util/AbstractSolrTestCase.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/util/AbstractSolrTestCase.java Sun Jan 30 16:08:25 2011
@@ -111,6 +111,7 @@ public abstract class AbstractSolrTestCa
public static Logger log = LoggerFactory.getLogger(AbstractSolrTestCase.class);
private String factoryProp;
+ @Override
public void setUp() throws Exception {
super.setUp();
log.info("####SETUP_START " + getName());
@@ -170,6 +171,7 @@ public abstract class AbstractSolrTestCa
* to delete dataDir, unless the system property "solr.test.leavedatadir"
* is set.
*/
+ @Override
public void tearDown() throws Exception {
log.info("####TEARDOWN_START " + getName());
if (factoryProp == null) {
@@ -403,6 +405,7 @@ public abstract class AbstractSolrTestCa
/** Neccessary to make method signatures un-ambiguous */
public static class Doc {
public String xml;
+ @Override
public String toString() { return xml; }
}
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/util/TestNumberUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/util/TestNumberUtils.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/util/TestNumberUtils.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/util/TestNumberUtils.java Sun Jan 30 16:08:25 2011
@@ -182,72 +182,88 @@ abstract class Converter {
}
class Int2Int extends Converter {
+ @Override
public String toInternal(String val) {
return Integer.toString(Integer.parseInt(val));
}
+ @Override
public String toExternal(String val) {
return Integer.toString(Integer.parseInt(val));
}
}
class SortInt extends Converter {
+ @Override
public String toInternal(String val) {
return NumberUtils.int2sortableStr(val);
}
+ @Override
public String toExternal(String val) {
return NumberUtils.SortableStr2int(val);
}
}
class SortLong extends Converter {
+ @Override
public String toInternal(String val) {
return NumberUtils.long2sortableStr(val);
}
+ @Override
public String toExternal(String val) {
return NumberUtils.SortableStr2long(val);
}
}
class Float2Float extends Converter {
+ @Override
public String toInternal(String val) {
return Float.toString(Float.parseFloat(val));
}
+ @Override
public String toExternal(String val) {
return Float.toString(Float.parseFloat(val));
}
}
class SortFloat extends Converter {
+ @Override
public String toInternal(String val) {
return NumberUtils.float2sortableStr(val);
}
+ @Override
public String toExternal(String val) {
return NumberUtils.SortableStr2floatStr(val);
}
}
class SortDouble extends Converter {
+ @Override
public String toInternal(String val) {
return NumberUtils.double2sortableStr(val);
}
+ @Override
public String toExternal(String val) {
return NumberUtils.SortableStr2doubleStr(val);
}
}
class Base100S extends Converter {
+ @Override
public String toInternal(String val) {
return BCDUtils.base10toBase100SortableInt(val);
}
+ @Override
public String toExternal(String val) {
return BCDUtils.base100SortableIntToBase10(val);
}
}
class Base10kS extends Converter {
+ @Override
public String toInternal(String val) {
return BCDUtils.base10toBase10kSortableInt(val);
}
+ @Override
public String toExternal(String val) {
return BCDUtils.base10kSortableIntToBase10(val);
}
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/velocity/VelocityResponseWriterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/velocity/VelocityResponseWriterTest.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/velocity/VelocityResponseWriterTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/velocity/VelocityResponseWriterTest.java Sun Jan 30 16:08:25 2011
@@ -26,7 +26,9 @@ import java.io.StringWriter;
import java.io.IOException;
public class VelocityResponseWriterTest extends AbstractSolrTestCase {
+ @Override
public String getSchemaFile() { return "schema.xml"; }
+ @Override
public String getSolrConfigFile() { return "solrconfig.xml"; }
Modified: lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/servlet/LogLevelSelection.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/servlet/LogLevelSelection.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/servlet/LogLevelSelection.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/servlet/LogLevelSelection.java Sun Jan 30 16:08:25 2011
@@ -36,6 +36,7 @@ import java.util.logging.Logger;
* @since solr 1.3
*/
public final class LogLevelSelection extends HttpServlet {
+ @Override
public void init() throws ServletException {
}
@@ -43,6 +44,7 @@ public final class LogLevelSelection ext
* Processes an HTTP GET request and changes the logging level as
* specified.
*/
+ @Override
public void doGet(HttpServletRequest request,
HttpServletResponse response)
throws IOException, ServletException {
@@ -147,6 +149,7 @@ public final class LogLevelSelection ext
}
+ @Override
public void doPost(HttpServletRequest request,
HttpServletResponse response)
throws IOException, ServletException {
@@ -259,6 +262,7 @@ public final class LogLevelSelection ext
return name.compareTo(((LogWrapper) other).name);
}
+ @Override
public boolean equals(Object obj) {
if (this == obj)
return true;
@@ -275,6 +279,7 @@ public final class LogLevelSelection ext
return true;
}
+ @Override
public int hashCode() {
final int prime = 31;
int result = 1;
Modified: lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/servlet/SolrServlet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/servlet/SolrServlet.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/servlet/SolrServlet.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/servlet/SolrServlet.java Sun Jan 30 16:08:25 2011
@@ -48,6 +48,7 @@ public class SolrServlet extends HttpSer
final Logger log = LoggerFactory.getLogger(SolrServlet.class);
private boolean hasMulticore = false;
+ @Override
public void init() throws ServletException {
log.info("SolrServlet.init()");
@@ -62,10 +63,12 @@ public class SolrServlet extends HttpSer
log.info("SolrServlet.init() done");
}
+ @Override
public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
doGet(request,response);
}
+ @Override
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
if( hasMulticore ) {
response.sendError( 400, "Missing solr core name in path" );