Project

General

Profile

« Previous | Next » 

Revision 49309

excluding solr6 changes, they were moved to dedicated branch

View differences:

modules/dnet-openaireplus-mapping-utils/trunk/src/main/java/eu/dnetlib/data/index/CloudIndexClientFactory.java
2 2

  
3 3
import org.apache.commons.logging.Log;
4 4
import org.apache.commons.logging.LogFactory;
5
import org.apache.solr.client.solrj.impl.CloudSolrClient;
5
import org.apache.solr.client.solrj.impl.CloudSolrServer;
6 6
import org.apache.solr.client.solrj.response.SolrPingResponse;
7 7

  
8 8
/**
......
15 15
	public static CloudIndexClient newIndexClient(final String baseURL, final String collection, final boolean parallelUpdates)
16 16
			throws CloudIndexClientException {
17 17
		try {
18
			final CloudSolrClient client = new CloudSolrClient.Builder().withZkHost(baseURL).build();
18
			final CloudSolrServer client = new CloudSolrServer(baseURL);
19 19

  
20 20
			log.info(String.format("Initializing solr server (%s) ...", baseURL));
21 21

  
modules/dnet-openaireplus-mapping-utils/trunk/src/main/java/eu/dnetlib/data/index/CloudIndexClient.java
6 6
import java.util.Date;
7 7
import java.util.List;
8 8

  
9
import eu.dnetlib.functionality.index.solr.feed.StreamingInputDocumentFactory;
10
import eu.dnetlib.miscutils.datetime.HumanTime;
11
import eu.dnetlib.miscutils.functional.UnaryFunction;
9 12
import org.apache.commons.logging.Log;
10 13
import org.apache.commons.logging.LogFactory;
11 14
import org.apache.solr.client.solrj.SolrQuery;
12
import org.apache.solr.client.solrj.impl.CloudSolrClient;
15
import org.apache.solr.client.solrj.impl.CloudSolrServer;
13 16
import org.apache.solr.client.solrj.response.QueryResponse;
14 17
import org.apache.solr.client.solrj.response.UpdateResponse;
15 18
import org.apache.solr.common.SolrInputDocument;
16 19

  
17
import eu.dnetlib.functionality.index.solr.feed.StreamingInputDocumentFactory;
18
import eu.dnetlib.miscutils.datetime.HumanTime;
19
import eu.dnetlib.miscutils.functional.UnaryFunction;
20

  
21 20
/**
22 21
 * Created by michele on 11/11/15.
23 22
 */
......
26 25
	private static final Log log = LogFactory.getLog(CloudIndexClient.class);
27 26
	private static final String INDEX_RECORD_RESULT_FIELD = "dnetResult";
28 27

  
29
	private final CloudSolrClient solrClient;
28
	private final CloudSolrServer solrClient;
30 29

  
31
	protected CloudIndexClient(final CloudSolrClient solrServer) {
30
	protected CloudIndexClient(final CloudSolrServer solrServer) {
32 31
		this.solrClient = solrServer;
33 32
	}
34 33

  
......
153 152

  
154 153
	public void close() throws IOException {
155 154
		if (solrClient != null) {
156
			solrClient.close();
155
			solrClient.shutdown();
157 156
		}
158 157
	}
159 158

  

Also available in: Unified diff