You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2012/06/28 19:52:10 UTC
svn commit: r1355088 [8/8] - in /lucene/dev/branches/branch_4x: ./
dev-tools/ lucene/
lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/
lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/
lucene/analysis/commo...
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/ShardResultTransformer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/ShardResultTransformer.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/ShardResultTransformer.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/ShardResultTransformer.java Thu Jun 28 17:51:38 2012
@@ -48,8 +48,7 @@ public interface ShardResultTransformer<
* @param sortWithinGroup The sort inside a group
* @param shard The shard address where the response originated from
* @return native structure of the data
- * @throws IOException If I/O related errors occur during transforming
*/
- R transformToNative(NamedList<NamedList> shardResponse, Sort groupSort, Sort sortWithinGroup, String shard) throws IOException;
+ R transformToNative(NamedList<NamedList> shardResponse, Sort groupSort, Sort sortWithinGroup, String shard);
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/LoadAdminUiServlet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/LoadAdminUiServlet.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/LoadAdminUiServlet.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/LoadAdminUiServlet.java Thu Jun 28 17:51:38 2012
@@ -21,7 +21,6 @@ import java.io.InputStream;
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -42,7 +41,7 @@ public final class LoadAdminUiServlet ex
@Override
public void doGet(HttpServletRequest request,
HttpServletResponse response)
- throws IOException, ServletException {
+ throws IOException {
response.setCharacterEncoding("UTF-8");
response.setContentType("text/html");
@@ -76,7 +75,7 @@ public final class LoadAdminUiServlet ex
@Override
public void doPost(HttpServletRequest request,
HttpServletResponse response)
- throws IOException, ServletException {
+ throws IOException {
doGet(request, response);
}
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java Thu Jun 28 17:51:38 2012
@@ -246,7 +246,7 @@ class HttpRequestContentStream extends C
{
private final HttpServletRequest req;
- public HttpRequestContentStream( HttpServletRequest req ) throws IOException {
+ public HttpRequestContentStream( HttpServletRequest req ) {
this.req = req;
contentType = req.getContentType();
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/ZookeeperInfoServlet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/ZookeeperInfoServlet.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/ZookeeperInfoServlet.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/ZookeeperInfoServlet.java Thu Jun 28 17:51:38 2012
@@ -28,7 +28,6 @@ import org.apache.zookeeper.data.Stat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -49,13 +48,13 @@ public final class ZookeeperInfoServlet
static final Logger log = LoggerFactory.getLogger(ZookeeperInfoServlet.class);
@Override
- public void init() throws ServletException {
+ public void init() {
}
@Override
public void doGet(HttpServletRequest request,
HttpServletResponse response)
- throws IOException, ServletException {
+ throws IOException {
response.setCharacterEncoding("UTF-8");
response.setContentType("application/json");
@@ -92,7 +91,7 @@ public final class ZookeeperInfoServlet
@Override
public void doPost(HttpServletRequest request,
HttpServletResponse response)
- throws IOException, ServletException {
+ throws IOException {
doGet(request, response);
}
@@ -363,7 +362,7 @@ public final class ZookeeperInfoServlet
json.write(v);
}
- boolean printZnode(JSONWriter json, String path) throws IOException {
+ boolean printZnode(JSONWriter json, String path) {
try {
Stat stat = new Stat();
// Trickily, the call to zkClient.getData fills in the stat variable
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java Thu Jun 28 17:51:38 2012
@@ -27,8 +27,6 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.lucene.index.IndexReader;
-
import org.apache.solr.core.IndexDeletionPolicyWrapper;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrConfig;
@@ -43,13 +41,11 @@ import org.apache.commons.codec.binary.B
public final class HttpCacheHeaderUtil {
- public static void sendNotModified(HttpServletResponse res)
- throws IOException {
+ public static void sendNotModified(HttpServletResponse res) {
res.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
}
- public static void sendPreconditionFailed(HttpServletResponse res)
- throws IOException {
+ public static void sendPreconditionFailed(HttpServletResponse res) {
res.setStatus(HttpServletResponse.SC_PRECONDITION_FAILED);
}
@@ -215,8 +211,7 @@ public final class HttpCacheHeaderUtil {
public static boolean doCacheHeaderValidation(final SolrQueryRequest solrReq,
final HttpServletRequest req,
final Method reqMethod,
- final HttpServletResponse resp)
- throws IOException {
+ final HttpServletResponse resp) {
if (Method.POST==reqMethod || Method.OTHER==reqMethod) {
return false;
@@ -244,14 +239,12 @@ public final class HttpCacheHeaderUtil {
* Check for etag related conditional headers and set status
*
* @return true if no request processing is necessary and HTTP response status has been set, false otherwise.
- * @throws IOException
*/
@SuppressWarnings("unchecked")
public static boolean checkETagValidators(final HttpServletRequest req,
final HttpServletResponse resp,
final Method reqMethod,
- final String etag)
- throws IOException {
+ final String etag) {
// First check If-None-Match because this is the common used header
// element by HTTP clients
@@ -281,12 +274,10 @@ public final class HttpCacheHeaderUtil {
* Check for modify time related conditional headers and set status
*
* @return true if no request processing is necessary and HTTP response status has been set, false otherwise.
- * @throws IOException
*/
public static boolean checkLastModValidators(final HttpServletRequest req,
final HttpServletResponse resp,
- final long lastMod)
- throws IOException {
+ final long lastMod) {
try {
// First check for If-Modified-Since because this is the common
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java Thu Jun 28 17:51:38 2012
@@ -21,7 +21,6 @@ import java.io.IOException;
import org.apache.lucene.index.IndexWriter;
import org.apache.solr.cloud.RecoveryStrategy;
-import org.apache.solr.common.SolrException;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.DirectoryFactory;
import org.apache.solr.core.SolrCore;
@@ -64,7 +63,7 @@ public final class DefaultSolrCoreState
}
@Override
- public void decref(IndexWriterCloser closer) throws IOException {
+ public void decref(IndexWriterCloser closer) {
synchronized (this) {
refCnt--;
if (refCnt == 0) {
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java Thu Jun 28 17:51:38 2012
@@ -42,11 +42,9 @@ import org.apache.lucene.search.BooleanQ
import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
-import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.common.params.ModifiableSolrParams;
-import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.core.SolrConfig.UpdateHandlerInfo;
@@ -93,7 +91,7 @@ public class DirectUpdateHandler2 extend
protected final CommitTracker commitTracker;
protected final CommitTracker softCommitTracker;
- public DirectUpdateHandler2(SolrCore core) throws IOException {
+ public DirectUpdateHandler2(SolrCore core) {
super(core);
solrCoreState = new DefaultSolrCoreState(core.getDirectoryFactory());
@@ -109,7 +107,7 @@ public class DirectUpdateHandler2 extend
softCommitTracker = new CommitTracker("Soft", core, softCommitDocsUpperBound, softCommitTimeUpperBound, true, true);
}
- public DirectUpdateHandler2(SolrCore core, UpdateHandler updateHandler) throws IOException {
+ public DirectUpdateHandler2(SolrCore core, UpdateHandler updateHandler) {
super(core);
if (updateHandler instanceof DirectUpdateHandler2) {
this.solrCoreState = ((DirectUpdateHandler2) updateHandler).solrCoreState;
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java Thu Jun 28 17:51:38 2012
@@ -172,7 +172,7 @@ public class SolrCmdDistributor {
}
private void doDelete(DeleteUpdateCommand cmd, List<Node> nodes,
- ModifiableSolrParams params) throws IOException {
+ ModifiableSolrParams params) {
flushAdds(1);
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/TransactionLog.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/TransactionLog.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/TransactionLog.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/TransactionLog.java Thu Jun 28 17:51:38 2012
@@ -18,7 +18,6 @@
package org.apache.solr.update;
import org.apache.lucene.util.BytesRef;
-import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.util.FastInputStream;
@@ -27,13 +26,19 @@ import org.apache.solr.common.util.JavaB
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.RandomAccessFile;
import java.nio.ByteBuffer;
import java.nio.channels.Channels;
import java.nio.channels.FileChannel;
-import java.rmi.registry.LocateRegistry;
-import java.util.*;
-import java.util.concurrent.CountDownLatch;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
/**
@@ -129,11 +134,11 @@ public class TransactionLog {
}
- TransactionLog(File tlogFile, Collection<String> globalStrings) throws IOException {
+ TransactionLog(File tlogFile, Collection<String> globalStrings) {
this(tlogFile, globalStrings, false);
}
- TransactionLog(File tlogFile, Collection<String> globalStrings, boolean openExisting) throws IOException {
+ TransactionLog(File tlogFile, Collection<String> globalStrings, boolean openExisting) {
try {
if (debug) {
log.debug("New TransactionLog file=" + tlogFile + ", exists=" + tlogFile.exists() + ", size=" + tlogFile.length() + ", openExisting=" + openExisting);
@@ -596,7 +601,7 @@ public class TransactionLog {
ChannelFastInputStream fis;
private LogCodec codec = new LogCodec() {
@Override
- public SolrInputDocument readSolrInputDocument(FastInputStream dis) throws IOException {
+ public SolrInputDocument readSolrInputDocument(FastInputStream dis) {
// Given that the SolrInputDocument is last in an add record, it's OK to just skip
// reading it completely.
return null;
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/UpdateLog.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/UpdateLog.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/UpdateLog.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/UpdateLog.java Thu Jun 28 17:51:38 2012
@@ -20,7 +20,6 @@ package org.apache.solr.update;
import org.apache.lucene.util.BytesRef;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrInputDocument;
-import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
@@ -31,7 +30,6 @@ import org.apache.solr.request.SolrQuery
import org.apache.solr.request.SolrRequestInfo;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.search.SolrIndexSearcher;
-import org.apache.solr.update.processor.DistributedUpdateProcessor;
import org.apache.solr.update.processor.DistributedUpdateProcessorFactory;
import org.apache.solr.update.processor.RunUpdateProcessorFactory;
import org.apache.solr.update.processor.UpdateRequestProcessor;
@@ -632,11 +630,7 @@ public class UpdateLog implements Plugin
private void ensureLog() {
if (tlog == null) {
String newLogName = String.format(Locale.ENGLISH, LOG_FILENAME_PATTERN, TLOG_NAME, id);
- try {
- tlog = new TransactionLog(new File(tlogDir, newLogName), globalStrings);
- } catch (IOException e) {
- throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Can't open new tlog!", e);
- }
+ tlog = new TransactionLog(new File(tlogDir, newLogName), globalStrings);
}
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/util/SystemIdResolver.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/util/SystemIdResolver.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/util/SystemIdResolver.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/util/SystemIdResolver.java Thu Jun 28 17:51:38 2012
@@ -96,7 +96,7 @@ public final class SystemIdResolver impl
};
}
- URI resolveRelativeURI(String baseURI, String systemId) throws IOException,URISyntaxException {
+ URI resolveRelativeURI(String baseURI, String systemId) throws URISyntaxException {
URI uri;
// special case for backwards compatibility: if relative systemId starts with "/" (we convert that to an absolute solrres:-URI)
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/TestRandomFaceting.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/TestRandomFaceting.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/TestRandomFaceting.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/TestRandomFaceting.java Thu Jun 28 17:51:38 2012
@@ -19,14 +19,9 @@ package org.apache.solr;
import org.apache.lucene.search.FieldCache;
import org.apache.lucene.util._TestUtil;
-import org.apache.noggit.JSONUtil;
-import org.apache.noggit.ObjectBuilder;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.request.SolrQueryRequest;
-import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.SchemaField;
-import org.apache.solr.util.TestUtils;
-import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -80,7 +75,7 @@ public class TestRandomFaceting extends
model = indexDocs(types, model, ndocs);
}
- void deleteSomeDocs() throws Exception {
+ void deleteSomeDocs() {
Random rand = random();
int percent = rand.nextInt(100);
if (model == null) return;
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java Thu Jun 28 17:51:38 2012
@@ -34,12 +34,8 @@ import java.util.concurrent.SynchronousQ
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
-import org.apache.lucene.util.LuceneTestCase;
-import org.apache.noggit.JSONUtil;
-import org.apache.noggit.ObjectBuilder;
import org.apache.solr.JSONTestUtil;
import org.apache.solr.client.solrj.SolrQuery;
-import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.impl.CloudSolrServer;
@@ -48,7 +44,6 @@ import org.apache.solr.client.solrj.requ
import org.apache.solr.client.solrj.request.ContentStreamUpdateRequest;
import org.apache.solr.client.solrj.request.CoreAdminRequest.Create;
import org.apache.solr.client.solrj.request.QueryRequest;
-import org.apache.solr.client.solrj.request.UpdateRequest;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.client.solrj.response.UpdateResponse;
import org.apache.solr.common.SolrException;
@@ -58,7 +53,6 @@ import org.apache.solr.common.cloud.Slic
import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.UpdateParams;
-import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.update.SolrCmdDistributor.Request;
@@ -392,7 +386,7 @@ public class BasicDistributedZkTest exte
}
private void testNumberOfCommitsWithCommitAfterAdd()
- throws MalformedURLException, SolrServerException, IOException {
+ throws SolrServerException, IOException {
long startCommits = getNumCommits((HttpSolrServer) clients.get(0));
ContentStreamUpdateRequest up = new ContentStreamUpdateRequest("/update");
@@ -406,7 +400,7 @@ public class BasicDistributedZkTest exte
assertEquals(startCommits + 1L, endCommits);
}
- private Long getNumCommits(HttpSolrServer solrServer) throws MalformedURLException,
+ private Long getNumCommits(HttpSolrServer solrServer) throws
SolrServerException, IOException {
HttpSolrServer server = new HttpSolrServer(solrServer.getBaseURL());
ModifiableSolrParams params = new ModifiableSolrParams();
@@ -552,15 +546,13 @@ public class BasicDistributedZkTest exte
}
private void createCollection(String collection,
- List<SolrServer> collectionClients, String baseUrl, int num)
- throws MalformedURLException, SolrServerException, IOException, InterruptedException {
+ List<SolrServer> collectionClients, String baseUrl, int num) {
createCollection(collection, collectionClients, baseUrl, num, null);
}
private void createCollection(final String collection,
List<SolrServer> collectionClients, final String baseUrl, final int num,
- final String shardId) throws MalformedURLException, SolrServerException,
- IOException, InterruptedException {
+ final String shardId) {
Callable call = new Callable() {
public Object call() {
HttpSolrServer server;
@@ -594,8 +586,7 @@ public class BasicDistributedZkTest exte
collectionClients.add(createNewSolrServer(collection, baseUrl));
}
- private void testMultipleCollections() throws MalformedURLException,
- SolrServerException, IOException, Exception {
+ private void testMultipleCollections() throws Exception {
// create another 2 collections and search across them
createNewCollection("collection2");
createNewCollection("collection3");
@@ -665,8 +656,7 @@ public class BasicDistributedZkTest exte
client.add(doc);
}
- private void createNewCollection(final String collection)
- throws MalformedURLException, SolrServerException, IOException, InterruptedException {
+ private void createNewCollection(final String collection) throws InterruptedException {
final List<SolrServer> collectionClients = new ArrayList<SolrServer>();
otherCollectionClients.put(collection, collectionClients);
int unique = 0;
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java Thu Jun 28 17:51:38 2012
@@ -17,10 +17,7 @@ package org.apache.solr.cloud;
* limitations under the License.
*/
-import java.io.IOException;
import java.net.ConnectException;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -32,7 +29,6 @@ import org.apache.solr.client.solrj.impl
import org.apache.solr.client.solrj.impl.HttpClientUtil;
import org.apache.solr.client.solrj.impl.HttpSolrServer;
import org.apache.solr.common.SolrInputDocument;
-import org.apache.zookeeper.KeeperException;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
@@ -43,11 +39,11 @@ import org.junit.Ignore;
public class ChaosMonkeyNothingIsSafeTest extends FullSolrCloudTest {
@BeforeClass
- public static void beforeSuperClass() throws Exception {
+ public static void beforeSuperClass() {
}
@AfterClass
- public static void afterSuperClass() throws Exception {
+ public static void afterSuperClass() {
}
@Before
@@ -159,8 +155,7 @@ public class ChaosMonkeyNothingIsSafeTes
}
}
- private void waitForThingsToLevelOut() throws KeeperException,
- InterruptedException, Exception, IOException, URISyntaxException {
+ private void waitForThingsToLevelOut() throws Exception {
int cnt = 0;
boolean retry = false;
do {
@@ -210,7 +205,7 @@ public class ChaosMonkeyNothingIsSafeTes
private List<SolrServer> clients;
public FullThrottleStopableIndexingThread(List<SolrServer> clients,
- int startI, boolean doDeletes) throws MalformedURLException {
+ int startI, boolean doDeletes) {
super(startI, doDeletes);
setName("FullThrottleStopableIndexingThread");
setDaemon(true);
@@ -282,18 +277,14 @@ public class ChaosMonkeyNothingIsSafeTes
if (clientIndex > clients.size() - 1) {
clientIndex = 0;
}
- try {
- suss.shutdownNow();
- suss = new ConcurrentUpdateSolrServer(
- ((HttpSolrServer) clients.get(clientIndex)).getBaseURL(),
- httpClient, 30, 3) {
- public void handleError(Throwable ex) {
- log.warn("suss error", ex);
- }
- };
- } catch (MalformedURLException e1) {
- e1.printStackTrace();
- }
+ suss.shutdownNow();
+ suss = new ConcurrentUpdateSolrServer(
+ ((HttpSolrServer) clients.get(clientIndex)).getBaseURL(),
+ httpClient, 30, 3) {
+ public void handleError(Throwable ex) {
+ log.warn("suss error", ex);
+ }
+ };
}
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java Thu Jun 28 17:51:38 2012
@@ -17,15 +17,12 @@ package org.apache.solr.cloud;
* limitations under the License.
*/
-import java.io.IOException;
-import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.common.SolrInputDocument;
-import org.apache.zookeeper.KeeperException;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
@@ -36,12 +33,12 @@ import org.junit.Ignore;
public class ChaosMonkeySafeLeaderTest extends FullSolrCloudTest {
@BeforeClass
- public static void beforeSuperClass() throws Exception {
+ public static void beforeSuperClass() {
}
@AfterClass
- public static void afterSuperClass() throws Exception {
+ public static void afterSuperClass() {
}
@@ -119,8 +116,7 @@ public class ChaosMonkeySafeLeaderTest e
if (VERBOSE) System.out.println("control docs:" + controlClient.query(new SolrQuery("*:*")).getResults().getNumFound() + "\n\n");
}
- private void waitForThingsToLevelOut() throws KeeperException,
- InterruptedException, Exception, IOException, URISyntaxException {
+ private void waitForThingsToLevelOut() throws Exception {
int cnt = 0;
boolean retry = false;
do {
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/CloudStateUpdateTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/CloudStateUpdateTest.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/CloudStateUpdateTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/CloudStateUpdateTest.java Thu Jun 28 17:51:38 2012
@@ -66,7 +66,7 @@ public class CloudStateUpdateTest extend
private Initializer init2;
@BeforeClass
- public static void beforeClass() throws Exception {
+ public static void beforeClass() {
System.setProperty("solrcloud.skip.autorecovery", "true");
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java Thu Jun 28 17:51:38 2012
@@ -18,8 +18,6 @@ package org.apache.solr.cloud;
*/
import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.concurrent.TimeoutException;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrServer;
@@ -48,7 +46,7 @@ public class FullSolrCloudDistribCmdsTes
@BeforeClass
- public static void beforeSuperClass() throws Exception {
+ public static void beforeSuperClass() {
}
public FullSolrCloudDistribCmdsTest() {
@@ -131,8 +129,7 @@ public class FullSolrCloudDistribCmdsTes
testThatCantForwardToLeaderFails();
}
- private void testThatCantForwardToLeaderFails() throws InterruptedException,
- Exception, TimeoutException, IOException, KeeperException {
+ private void testThatCantForwardToLeaderFails() throws Exception {
ZkNodeProps props = zkStateReader.getLeaderProps(DEFAULT_COLLECTION, "shard1");
chaosMonkey.stopShard("shard1");
@@ -164,8 +161,8 @@ public class FullSolrCloudDistribCmdsTes
assertTrue("A whole shard is down - some of these should fail", fails > 0);
}
- private long addTwoDocsInOneRequest(long docId) throws SolrServerException,
- IOException, Exception {
+ private long addTwoDocsInOneRequest(long docId) throws
+ Exception {
QueryResponse results;
UpdateRequest uReq;
uReq = new UpdateRequest();
@@ -192,7 +189,7 @@ public class FullSolrCloudDistribCmdsTes
return docId;
}
- private long addUpdateDelete() throws Exception, SolrServerException,
+ private long addUpdateDelete() throws Exception,
IOException {
long docId = 99999999L;
indexr("id", docId, t1, "originalcontent");
@@ -230,13 +227,13 @@ public class FullSolrCloudDistribCmdsTes
return docId;
}
- private void testDeleteByQueryDistrib() throws Exception, SolrServerException {
+ private void testDeleteByQueryDistrib() throws Exception {
del("*:*");
commit();
assertEquals(0, query(cloudClient).getResults().getNumFound());
}
- private void testIndexingWithSuss() throws MalformedURLException, Exception {
+ private void testIndexingWithSuss() throws Exception {
ConcurrentUpdateSolrServer suss = new ConcurrentUpdateSolrServer(
((HttpSolrServer) clients.get(0)).getBaseURL(), 3, 1);
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java Thu Jun 28 17:51:38 2012
@@ -20,9 +20,12 @@ package org.apache.solr.cloud;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.*;
-import java.util.concurrent.TimeoutException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.http.params.CoreConnectionPNames;
@@ -46,12 +49,10 @@ import org.apache.solr.common.cloud.ZkSt
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.servlet.SolrDispatchFilter;
-import org.apache.zookeeper.KeeperException;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.junit.Ignore;
/**
*
@@ -61,7 +62,7 @@ import org.junit.Ignore;
*/
public class FullSolrCloudTest extends AbstractDistributedZkTestCase {
@BeforeClass
- public static void beforeFullSolrCloudTest() throws Exception {
+ public static void beforeFullSolrCloudTest() {
// shorten the log output more for this test type
if (formatter != null) formatter.setShorterFormat();
}
@@ -148,7 +149,7 @@ public class FullSolrCloudTest extends A
}
@BeforeClass
- public static void beforeClass() throws Exception {
+ public static void beforeClass() {
System
.setProperty("solr.directoryFactory", "solr.StandardDirectoryFactory");
System.setProperty("solrcloud.update.delay", "0");
@@ -327,8 +328,7 @@ public class FullSolrCloudTest extends A
}
protected void updateMappingsFromZk(List<JettySolrRunner> jettys,
- List<SolrServer> clients) throws Exception, IOException, KeeperException,
- URISyntaxException {
+ List<SolrServer> clients) throws Exception {
zkStateReader.updateCloudState(true);
shardToClient.clear();
shardToJetty.clear();
@@ -596,8 +596,7 @@ public class FullSolrCloudTest extends A
}
- private long testUpdateAndDelete() throws Exception, SolrServerException,
- IOException {
+ private long testUpdateAndDelete() throws Exception {
long docId = 99999999L;
indexr("id", docId, t1, "originalcontent");
@@ -632,9 +631,7 @@ public class FullSolrCloudTest extends A
return docId;
}
- private void addNewReplica() throws Exception, InterruptedException,
- TimeoutException, IOException, KeeperException, URISyntaxException,
- SolrServerException {
+ private void addNewReplica() throws Exception {
JettySolrRunner newReplica = createJettys(1).get(0);
waitForRecoveriesToFinish(false);
@@ -656,8 +653,7 @@ public class FullSolrCloudTest extends A
super.waitForRecoveriesToFinish(DEFAULT_COLLECTION, zkStateReader, verbose);
}
- private void brindDownShardIndexSomeDocsAndRecover() throws Exception,
- SolrServerException, IOException, InterruptedException {
+ private void brindDownShardIndexSomeDocsAndRecover() throws Exception {
SolrQuery query = new SolrQuery("*:*");
query.set("distrib", false);
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java Thu Jun 28 17:51:38 2012
@@ -35,7 +35,6 @@ import org.apache.solr.common.cloud.ZkNo
import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.CoreContainer.Initializer;
-import org.apache.zookeeper.KeeperException;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -67,7 +66,7 @@ public class LeaderElectionIntegrationTe
private ZkStateReader reader;
@BeforeClass
- public static void beforeClass() throws Exception {
+ public static void beforeClass() {
System.setProperty("solrcloud.skip.autorecovery", "true");
}
@@ -245,7 +244,7 @@ public class LeaderElectionIntegrationTe
//Thread.sleep(100000);
}
- private String getLeader() throws InterruptedException, KeeperException {
+ private String getLeader() throws InterruptedException {
ZkNodeProps props = reader.getLeaderProps("collection1", "shard1", 30000);
String leader = props.get(ZkStateReader.NODE_NAME_PROP);
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java Thu Jun 28 17:51:38 2012
@@ -51,12 +51,12 @@ public class LeaderElectionTest extends
private volatile boolean stopStress = false;
@BeforeClass
- public static void beforeClass() throws Exception {
+ public static void beforeClass() {
createTempDir();
}
@AfterClass
- public static void afterClass() throws InterruptedException {
+ public static void afterClass() {
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java Thu Jun 28 17:51:38 2012
@@ -35,12 +35,12 @@ public class RecoveryZkTest extends Full
private StopableIndexingThread indexThread;
private StopableIndexingThread indexThread2;
@BeforeClass
- public static void beforeSuperClass() throws Exception {
+ public static void beforeSuperClass() {
}
@AfterClass
- public static void afterSuperClass() throws Exception {
+ public static void afterSuperClass() {
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/TestMultiCoreConfBootstrap.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/TestMultiCoreConfBootstrap.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/TestMultiCoreConfBootstrap.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/TestMultiCoreConfBootstrap.java Thu Jun 28 17:51:38 2012
@@ -18,7 +18,6 @@
package org.apache.solr.cloud;
import java.io.File;
-import java.io.IOException;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.cloud.SolrZkClient;
@@ -43,12 +42,12 @@ public class TestMultiCoreConfBootstrap
protected static String zkDir;
@BeforeClass
- public static void beforeClass() throws Exception {
+ public static void beforeClass() {
createTempDir();
}
@AfterClass
- public static void afterClass() throws IOException {
+ public static void afterClass() {
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/RAMDirectoryFactoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/RAMDirectoryFactoryTest.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/RAMDirectoryFactoryTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/RAMDirectoryFactoryTest.java Thu Jun 28 17:51:38 2012
@@ -37,7 +37,7 @@ public class RAMDirectoryFactoryTest ext
final Directory directory = new RAMDirectory();
RAMDirectoryFactory factory = new RAMDirectoryFactory() {
@Override
- protected Directory create(String path) throws IOException {
+ protected Directory create(String path) {
return directory;
}
};
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java Thu Jun 28 17:51:38 2012
@@ -49,12 +49,12 @@ public class TestArbitraryIndexDir exten
// TODO: fix this test to not require FSDirectory
static String savedFactory;
@BeforeClass
- public static void beforeClass() throws Exception {
+ public static void beforeClass() {
savedFactory = System.getProperty("solr.DirectoryFactory");
System.setProperty("solr.directoryFactory", "org.apache.solr.core.MockFSDirectoryFactory");
}
@AfterClass
- public static void afterClass() throws Exception {
+ public static void afterClass() {
if (savedFactory == null) {
System.clearProperty("solr.directoryFactory");
} else {
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestSolrXMLSerializer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestSolrXMLSerializer.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestSolrXMLSerializer.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestSolrXMLSerializer.java Thu Jun 28 17:51:38 2012
@@ -22,7 +22,6 @@ import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
import java.io.Writer;
import java.util.ArrayList;
import java.util.HashMap;
@@ -90,8 +89,7 @@ public class TestSolrXMLSerializer exten
}
private void assertResults(byte[] bytes)
- throws ParserConfigurationException, UnsupportedEncodingException,
- IOException, SAXException, XPathExpressionException {
+ throws ParserConfigurationException, IOException, SAXException, XPathExpressionException {
DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
BufferedInputStream is = new BufferedInputStream(new ByteArrayInputStream(bytes));
Document document;
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java Thu Jun 28 17:51:38 2012
@@ -18,13 +18,10 @@ package org.apache.solr.handler.componen
*/
import java.io.File;
-import java.io.IOException;
import org.apache.solr.BaseDistributedSearchTestCase;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.params.CommonParams;
-import org.apache.solr.util.FileUtils;
-import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -44,13 +41,13 @@ public class DistributedQueryElevationCo
}
@BeforeClass
- public static void beforeClass() throws IOException {
+ public static void beforeClass() {
System.setProperty("elevate.data.file", "elevate.xml");
File parent = new File(TEST_HOME(), "conf");
}
@AfterClass
- public static void afterClass() throws IOException {
+ public static void afterClass() {
System.clearProperty("elevate.data.file");
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/request/TestWriterPerf.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/request/TestWriterPerf.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/request/TestWriterPerf.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/request/TestWriterPerf.java Thu Jun 28 17:51:38 2012
@@ -86,7 +86,7 @@ public class TestWriterPerf extends Abst
/** make sure to close req after you are done using the response */
- public SolrQueryResponse getResponse(SolrQueryRequest req) throws IOException, Exception {
+ public SolrQueryResponse getResponse(SolrQueryRequest req) throws Exception {
SolrQueryResponse rsp = new SolrQueryResponse();
h.getCore().execute(h.getCore().getRequestHandler(null),req,rsp);
if (rsp.getException() != null) {
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java Thu Jun 28 17:51:38 2012
@@ -17,8 +17,6 @@
package org.apache.solr.search;
-import java.io.IOException;
-
import org.apache.solr.common.SolrException;
import org.apache.solr.util.AbstractSolrTestCase;
import org.junit.Test;
@@ -430,7 +428,7 @@ public class TestExtendedDismaxParser ex
}
- public void testAliasing() throws IOException, Exception {
+ public void testAliasing() throws Exception {
String oner = "*[count(//doc)=1]";
String twor = "*[count(//doc)=2]";
String nor = "*[count(//doc)=0]";
@@ -463,12 +461,12 @@ public class TestExtendedDismaxParser ex
}
- public void testAliasingBoost() throws IOException, Exception {
+ public void testAliasingBoost() throws Exception {
assertQ(req("defType","edismax", "q","Zapp Pig", "qf","myalias", "f.myalias.qf","name trait_ss^0.5"), "//result/doc[1]/str[@name='id']=42", "//result/doc[2]/str[@name='id']=47");//doc 42 should score higher than 46
assertQ(req("defType","edismax", "q","Zapp Pig", "qf","myalias^100 name", "f.myalias.qf","trait_ss^0.5"), "//result/doc[1]/str[@name='id']=47", "//result/doc[2]/str[@name='id']=42");//Now the order should be inverse
}
- public void testCyclicAliasing() throws IOException, Exception {
+ public void testCyclicAliasing() throws Exception {
try {
h.query(req("defType","edismax", "q","ignore_exception", "qf","who", "f.who.qf","name","f.name.qf","who"));
fail("Simple cyclic alising");
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestFastLRUCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestFastLRUCache.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestFastLRUCache.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestFastLRUCache.java Thu Jun 28 17:51:38 2012
@@ -83,7 +83,7 @@ public class TestFastLRUCache extends Lu
doTestPercentageAutowarm(100, 0, new int[]{}, new int[]{1, 10, 25, 51, 55, 60, 70, 80, 99, 100, 200, 300});
}
- private void doTestPercentageAutowarm(int limit, int percentage, int[] hits, int[]misses) throws IOException {
+ private void doTestPercentageAutowarm(int limit, int percentage, int[] hits, int[]misses) {
FastLRUCache<Object, Object> fastCache = new FastLRUCache<Object, Object>();
Map<String, String> params = new HashMap<String, String>();
params.put("size", String.valueOf(limit));
@@ -177,7 +177,7 @@ public class TestFastLRUCache extends Lu
private CacheRegenerator createCodeRegenerator() {
CacheRegenerator cr = new CacheRegenerator() {
public boolean regenerateItem(SolrIndexSearcher newSearcher, SolrCache newCache,
- SolrCache oldCache, Object oldKey, Object oldVal) throws IOException {
+ SolrCache oldCache, Object oldKey, Object oldVal) {
newCache.put(oldKey, oldVal);
return true;
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestLRUCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestLRUCache.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestLRUCache.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestLRUCache.java Thu Jun 28 17:51:38 2012
@@ -63,7 +63,7 @@ public class TestLRUCache extends Lucene
doTestPercentageAutowarm(10, 10, new int[]{10}, new int[]{1, 5, 9, 100, 200, 300, 400, 800, 899, 900});
}
- private void doTestPercentageAutowarm(int limit, int percentage, int[] hits, int[]misses) throws IOException {
+ private void doTestPercentageAutowarm(int limit, int percentage, int[] hits, int[]misses) {
LRUCache<Object, Object> lruCache = new LRUCache<Object, Object>();
Map<String, String> params = new HashMap<String, String>();
params.put("size", String.valueOf(limit));
@@ -126,7 +126,7 @@ public class TestLRUCache extends Lucene
CacheRegenerator cr = new CacheRegenerator() {
@SuppressWarnings("unchecked")
public boolean regenerateItem(SolrIndexSearcher newSearcher, SolrCache newCache,
- SolrCache oldCache, Object oldKey, Object oldVal) throws IOException {
+ SolrCache oldCache, Object oldKey, Object oldVal) {
newCache.put(oldKey, oldVal);
return true;
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestRecovery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestRecovery.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestRecovery.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestRecovery.java Thu Jun 28 17:51:38 2012
@@ -17,24 +17,25 @@
package org.apache.solr.search;
-import org.apache.lucene.util.BytesRef;
-import org.apache.noggit.JSONUtil;
import org.apache.noggit.ObjectBuilder;
import org.apache.solr.SolrTestCaseJ4;
-import org.apache.solr.common.util.ByteUtils;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.update.DirectUpdateHandler2;
import org.apache.solr.update.UpdateLog;
import org.apache.solr.update.UpdateHandler;
-import org.apache.solr.update.UpdateLog;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import java.io.File;
import java.io.RandomAccessFile;
-import java.util.*;
+import java.util.ArrayDeque;
+import java.util.Arrays;
+import java.util.Deque;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
import java.util.concurrent.Future;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
@@ -60,7 +61,7 @@ public class TestRecovery extends SolrTe
}
@AfterClass
- public static void afterClass() throws Exception {
+ public static void afterClass() {
if (savedFactory == null) {
System.clearProperty("solr.directoryFactory");
} else {
@@ -892,7 +893,7 @@ public class TestRecovery extends SolrTe
// WARNING... assumes format of .00000n where n is less than 9
long logNumber = Long.parseLong(fname.substring(fname.lastIndexOf(".") + 1));
- String fname2 = String.format(Locale.ENGLISH,
+ String fname2 = String.format(Locale.ENGLISH,
UpdateLog.LOG_FILENAME_PATTERN,
UpdateLog.TLOG_NAME,
logNumber + 1);
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestSort.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestSort.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestSort.java Thu Jun 28 17:51:38 2012
@@ -203,7 +203,7 @@ public class TestSort extends SolrTestCa
for (int i=0; i<qiter; i++) {
Filter filt = new Filter() {
@Override
- public DocIdSet getDocIdSet(AtomicReaderContext context, Bits acceptDocs) throws IOException {
+ public DocIdSet getDocIdSet(AtomicReaderContext context, Bits acceptDocs) {
return BitsFilteredDocIdSet.wrap(randSet(context.reader().maxDoc()), acceptDocs);
}
};
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java Thu Jun 28 17:51:38 2012
@@ -54,7 +54,7 @@ public class SolrRequestParserTest exten
static SolrRequestParsers parser;
@AfterClass
- public static void afterClass() throws Exception {
+ public static void afterClass() {
parser = null;
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java Thu Jun 28 17:51:38 2012
@@ -54,7 +54,7 @@ public class FileBasedSpellCheckerTest e
}
@AfterClass
- public static void afterClass() throws Exception {
+ public static void afterClass() {
queryConverter = null;
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java Thu Jun 28 17:51:38 2012
@@ -76,7 +76,7 @@ public class IndexBasedSpellCheckerTest
}
@AfterClass
- public static void afterClass() throws Exception {
+ public static void afterClass() {
queryConverter = null;
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java Thu Jun 28 17:51:38 2012
@@ -43,7 +43,7 @@ public class SuggesterTest extends SolrT
}
@AfterClass
- public static void afterClass() throws Exception {
+ public static void afterClass() {
if (savedFactory == null) {
System.clearProperty("solr.directoryFactory");
} else {
@@ -51,7 +51,7 @@ public class SuggesterTest extends SolrT
}
}
- public static void addDocs() throws Exception {
+ public static void addDocs() {
assertU(adoc("id", "1",
"text", "acceptable accidentally accommodate acquire"
));
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java Thu Jun 28 17:51:38 2012
@@ -18,7 +18,6 @@
package org.apache.solr.update;
import java.util.Arrays;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -51,7 +50,7 @@ public class DirectUpdateHandlerTest ext
}
@AfterClass
- public static void afterClass() throws Exception {
+ public static void afterClass() {
if (savedFactory == null) {
System.clearProperty("solr.directoryFactory");
} else {
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/update/TestIndexingPerformance.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/update/TestIndexingPerformance.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/update/TestIndexingPerformance.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/update/TestIndexingPerformance.java Thu Jun 28 17:51:38 2012
@@ -41,12 +41,12 @@ public class TestIndexingPerformance ext
// TODO: fix this test to not require FSDirectory
static String savedFactory;
@BeforeClass
- public static void beforeClass() throws Exception {
+ public static void beforeClass() {
savedFactory = System.getProperty("solr.DirectoryFactory");
System.setProperty("solr.directoryFactory", "org.apache.solr.core.MockFSDirectoryFactory");
}
@AfterClass
- public static void afterClass() throws Exception {
+ public static void afterClass() {
if (savedFactory == null) {
System.clearProperty("solr.directoryFactory");
} else {
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/DOMUtilTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/DOMUtilTest.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/DOMUtilTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/util/DOMUtilTest.java Thu Jun 28 17:51:38 2012
@@ -19,7 +19,6 @@ package org.apache.solr.util;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
-import org.apache.solr.util.DOMUtilTestBase;
public class DOMUtilTest extends DOMUtilTestBase {
@@ -49,7 +48,7 @@ public class DOMUtilTest extends DOMUtil
assertTypeAndValue( namedList, "Boolean", false );
}
- private void assertTypeAndValue( NamedList<Object> namedList, String key, Object value ) throws Exception {
+ private void assertTypeAndValue( NamedList<Object> namedList, String key, Object value ) {
Object v = namedList.get( key );
assertNotNull( v );
assertEquals( key, v.getClass().getSimpleName() );
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/noggit/CharArr.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/noggit/CharArr.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/noggit/CharArr.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/noggit/CharArr.java Thu Jun 28 17:51:38 2012
@@ -198,7 +198,7 @@ public class CharArr implements CharSequ
return null;
}
- public final Appendable append(char c) throws IOException {
+ public final Appendable append(char c) {
write(c);
return this;
}
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/BinaryRequestWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/BinaryRequestWriter.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/BinaryRequestWriter.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/BinaryRequestWriter.java Thu Jun 28 17:51:38 2012
@@ -84,11 +84,11 @@ public class BinaryRequestWriter extends
return new Long(baos.size());
}
- public InputStream getStream() throws IOException {
+ public InputStream getStream() {
return new ByteArrayInputStream(baos.getbuf(), 0, baos.size());
}
- public Reader getReader() throws IOException {
+ public Reader getReader() {
throw new RuntimeException("No reader available . this is a binarystream");
}
};
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java Thu Jun 28 17:51:38 2012
@@ -19,7 +19,6 @@ package org.apache.solr.client.solrj.imp
import java.io.IOException;
import java.io.OutputStream;
-import java.net.MalformedURLException;
import java.util.LinkedList;
import java.util.Queue;
import java.util.concurrent.BlockingQueue;
@@ -86,10 +85,9 @@ public class ConcurrentUpdateSolrServer
* The buffer size before the documents are sent to the server
* @param threadCount
* The number of background threads used to empty the queue
- * @throws MalformedURLException
*/
public ConcurrentUpdateSolrServer(String solrServerUrl, int queueSize,
- int threadCount) throws MalformedURLException {
+ int threadCount) {
this(solrServerUrl, null, queueSize, threadCount);
}
@@ -99,8 +97,7 @@ public class ConcurrentUpdateSolrServer
* ThreadSafeClientConnManager.
*/
public ConcurrentUpdateSolrServer(String solrServerUrl,
- HttpClient client, int queueSize, int threadCount)
- throws MalformedURLException {
+ HttpClient client, int queueSize, int threadCount) {
this.server = new HttpSolrServer(solrServerUrl, client);
this.server.setFollowRedirects(false);
queue = new LinkedBlockingQueue<UpdateRequest>(queueSize);
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/CloudState.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/CloudState.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/CloudState.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/CloudState.java Thu Jun 28 17:51:38 2012
@@ -240,7 +240,7 @@ public class CloudState implements JSONW
/**
* Create CloudState from json string that is typically stored in zookeeper.
*/
- public static CloudState load(byte[] bytes, Set<String> liveNodes) throws KeeperException, InterruptedException {
+ public static CloudState load(byte[] bytes, Set<String> liveNodes) {
if (bytes == null || bytes.length == 0) {
return new CloudState(liveNodes, Collections.<String, Map<String,Slice>>emptyMap());
}
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java Thu Jun 28 17:51:38 2012
@@ -17,7 +17,6 @@ package org.apache.solr.common.cloud;
* limitations under the License.
*/
-import java.io.IOException;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeoutException;
@@ -83,7 +82,7 @@ class ConnectionManager implements Watch
new ZkClientConnectionStrategy.ZkUpdate() {
@Override
public void update(SolrZooKeeper keeper)
- throws InterruptedException, TimeoutException, IOException {
+ throws InterruptedException, TimeoutException {
synchronized (connectionStrategy) {
waitForConnected(SolrZkClient.DEFAULT_CLIENT_CONNECT_TIMEOUT);
client.updateKeeper(keeper);
@@ -118,7 +117,7 @@ class ConnectionManager implements Watch
}
public synchronized void waitForConnected(long waitForConnection)
- throws InterruptedException, TimeoutException, IOException {
+ throws InterruptedException, TimeoutException {
long expire = System.currentTimeMillis() + waitForConnection;
long left = waitForConnection;
while (!connected && left > 0) {
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/util/ContentStreamBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/util/ContentStreamBase.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/util/ContentStreamBase.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/util/ContentStreamBase.java Thu Jun 28 17:51:38 2012
@@ -73,7 +73,7 @@ public abstract class ContentStreamBase
{
private final URL url;
- public URLStream( URL url ) throws IOException {
+ public URLStream( URL url ) {
this.url = url;
sourceInfo = "url";
}
@@ -95,7 +95,7 @@ public abstract class ContentStreamBase
{
private final File file;
- public FileStream( File f ) throws IOException {
+ public FileStream( File f ) {
file = f;
contentType = null; // ??
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java Thu Jun 28 17:51:38 2012
@@ -17,7 +17,6 @@
package org.apache.solr.client.solrj;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -62,7 +61,7 @@ public abstract class LargeVolumeTestBas
log.info("done");
}
- private void query(int count) throws SolrServerException, IOException {
+ private void query(int count) throws SolrServerException {
SolrServer gserver = this.getSolrServer();
SolrQuery query = new SolrQuery("*:*");
QueryResponse response = gserver.query(query);
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java Thu Jun 28 17:51:38 2012
@@ -540,8 +540,7 @@ abstract public class SolrExampleTests e
}
private static Field getCUSSExceptionField(Object cs)
- throws SecurityException, NoSuchFieldException, IllegalArgumentException,
- IllegalAccessException {
+ throws SecurityException, NoSuchFieldException, IllegalArgumentException {
Field field = cs.getClass().getDeclaredField("lastError");
field.setAccessible(true);
return field;
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java Thu Jun 28 17:51:38 2012
@@ -54,13 +54,13 @@ public class TestLBHttpSolrServer extend
static String savedFactory;
@BeforeClass
- public static void beforeClass() throws Exception {
+ public static void beforeClass() {
savedFactory = System.getProperty("solr.DirectoryFactory");
System.setProperty("solr.directoryFactory", "org.apache.solr.core.MockFSDirectoryFactory");
}
@AfterClass
- public static void afterClass() throws Exception {
+ public static void afterClass() {
if (savedFactory == null) {
System.clearProperty("solr.directoryFactory");
} else {
Modified: lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/JSONTestUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/JSONTestUtil.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/JSONTestUtil.java (original)
+++ lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/JSONTestUtil.java Thu Jun 28 17:51:38 2012
@@ -87,7 +87,7 @@ public class JSONTestUtil {
* @param expected expected JSON Object
* @param delta tollerance allowed in comparing float/double values
*/
- public static String matchObj(String path, Object input, Object expected, double delta) throws Exception {
+ public static String matchObj(String path, Object input, Object expected, double delta) {
CollectionTester tester = new CollectionTester(input,delta);
boolean reversed = path.startsWith("!");
String positivePath = reversed ? path.substring(1) : path;
Modified: lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java (original)
+++ lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java Thu Jun 28 17:51:38 2012
@@ -67,7 +67,7 @@ public abstract class SolrTestCaseJ4 ext
@BeforeClass
@SuppressWarnings("unused")
- private static void beforeClass() throws Exception {
+ private static void beforeClass() {
setupLogging();
startTrackingSearchers();
startTrackingZkClients();
@@ -325,7 +325,7 @@ public abstract class SolrTestCaseJ4 ext
log.info("####initCore end");
}
- public static void createCore() throws Exception {
+ public static void createCore() {
solrConfig = TestHarness.createConfig(testSolrHome, getSolrConfigFile());
h = new TestHarness( dataDir.getAbsolutePath(),
solrConfig,
@@ -356,7 +356,7 @@ public abstract class SolrTestCaseJ4 ext
* to delete dataDir, unless the system property "solr.test.leavedatadir"
* is set.
*/
- public static void deleteCore() throws Exception {
+ public static void deleteCore() {
log.info("###deleteCore" );
if (h != null) { h.close(); }
if (dataDir != null) {
Modified: lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java (original)
+++ lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java Thu Jun 28 17:51:38 2012
@@ -105,12 +105,12 @@ public abstract class AbstractSolrTestCa
RuleChain.outerRule(new SystemPropertiesRestoreRule());
@BeforeClass
- public static void beforeClassAbstractSolrTestCase() throws Exception {
+ public static void beforeClassAbstractSolrTestCase() {
SolrTestCaseJ4.startTrackingSearchers();
}
@AfterClass
- public static void afterClassAbstractSolrTestCase() throws Exception {
+ public static void afterClassAbstractSolrTestCase() {
SolrTestCaseJ4.endTrackingSearchers();
}
@@ -458,7 +458,7 @@ public abstract class AbstractSolrTestCa
}
/** @see SolrTestCaseJ4#getFile */
- public static File getFile(String name) throws IOException {
+ public static File getFile(String name) {
return SolrTestCaseJ4.getFile(name);
}
}
Modified: lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java (original)
+++ lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java Thu Jun 28 17:51:38 2012
@@ -294,7 +294,7 @@ public class TestHarness {
* @see LocalSolrQueryRequest
*/
public String validateQuery(SolrQueryRequest req, String... tests)
- throws IOException, Exception {
+ throws Exception {
String res = query(req);
return validateXPath(res, tests);
@@ -309,7 +309,7 @@ public class TestHarness {
* @exception IOException if there is a problem writing the XML
* @see LocalSolrQueryRequest
*/
- public String query(SolrQueryRequest req) throws IOException, Exception {
+ public String query(SolrQueryRequest req) throws Exception {
return query(req.getParams().get(CommonParams.QT), req);
}
@@ -323,7 +323,7 @@ public class TestHarness {
* @exception IOException if there is a problem writing the XML
* @see LocalSolrQueryRequest
*/
- public String query(String handler, SolrQueryRequest req) throws IOException, Exception {
+ public String query(String handler, SolrQueryRequest req) throws Exception {
try {
SolrQueryResponse rsp = new SolrQueryResponse();
SolrRequestInfo.setRequestInfo(new SolrRequestInfo(req, rsp));