Merge pull request #2434 from millmanorama/fix-compiler-warnings

fix compiler warnings about raw types
This commit is contained in:
Richard Cordovano 2017-01-07 11:10:24 -05:00 committed by GitHub
commit b0ce3168df

View File

@ -46,13 +46,13 @@ import javax.swing.AbstractAction;
import org.apache.solr.client.solrj.SolrQuery; import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrRequest; import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.client.solrj.SolrServerException; import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.request.CoreAdminRequest;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.client.solrj.response.TermsResponse;
import org.apache.solr.client.solrj.impl.HttpSolrClient; import org.apache.solr.client.solrj.impl.HttpSolrClient;
import org.apache.solr.client.solrj.impl.HttpSolrClient.Builder; import org.apache.solr.client.solrj.impl.HttpSolrClient.Builder;
import org.apache.solr.client.solrj.impl.XMLResponseParser; import org.apache.solr.client.solrj.impl.XMLResponseParser;
import org.apache.solr.client.solrj.request.CoreAdminRequest;
import org.apache.solr.client.solrj.response.CoreAdminResponse; import org.apache.solr.client.solrj.response.CoreAdminResponse;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.client.solrj.response.TermsResponse;
import org.apache.solr.common.SolrDocument; import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrDocumentList; import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException;
@ -775,7 +775,7 @@ public class Server {
} }
} }
NamedList<Object> request(SolrRequest request) throws SolrServerException, NoOpenCoreException { NamedList<Object> request(SolrRequest<?> request) throws SolrServerException, NoOpenCoreException {
currentCoreLock.readLock().lock(); currentCoreLock.readLock().lock();
try { try {
if (null == currentCore) { if (null == currentCore) {
@ -1256,7 +1256,7 @@ public class Server {
return solrCore.query(sq); return solrCore.query(sq);
} }
private NamedList<Object> request(SolrRequest request) throws SolrServerException { private NamedList<Object> request(SolrRequest<?> request) throws SolrServerException {
try { try {
return solrCore.request(request); return solrCore.request(request);
} catch (IOException e) { } catch (IOException e) {