mirror of https://github.com/apache/lucene.git
SOLR-6895: Remove SolrServer classes from trunk
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1648710 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Alan Woodward
parent
ef809a0f10
commit
4a6d85790a
|
|
@ -37,7 +37,8 @@ System Requirements
|
|||
Upgrading from Solr 5.x
|
||||
----------------------
|
||||
|
||||
* N/A
|
||||
* The deprecated SolrServer and subclasses have been removed, use SolrClient
|
||||
instead.
|
||||
|
||||
Detailed Change List
|
||||
----------------------
|
||||
|
|
@ -47,6 +48,8 @@ Other Changes
|
|||
|
||||
* SOLR-6127: Improve example docs, using films data (Varun Thacker via ehatcher)
|
||||
|
||||
* SOLR-6895: Deprecated SolrServer classes have been removed (Alan Woodward,
|
||||
Erik Hatcher)
|
||||
|
||||
================== 5.0.0 ==================
|
||||
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright ownership.
|
||||
* The ASF licenses this file to You under the Apache License, Version 2.0
|
||||
* (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.apache.solr.morphlines.solr;
|
||||
|
||||
import org.apache.solr.client.solrj.SolrClient;
|
||||
|
||||
/**
|
||||
* @deprecated Use {@link org.apache.solr.morphlines.solr.SolrClientDocumentLoader}
|
||||
*/
|
||||
@Deprecated
|
||||
public class SolrServerDocumentLoader extends SolrClientDocumentLoader {
|
||||
|
||||
public SolrServerDocumentLoader(SolrClient client, int batchSize) {
|
||||
super(client, batchSize);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright ownership.
|
||||
* The ASF licenses this file to You under the Apache License, Version 2.0
|
||||
* (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.apache.solr.client.solrj;
|
||||
|
||||
/**
|
||||
* @deprecated Use {@link org.apache.solr.client.solrj.SolrClient}
|
||||
*/
|
||||
@Deprecated
|
||||
public abstract class SolrServer extends SolrClient {
|
||||
}
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright ownership.
|
||||
* The ASF licenses this file to You under the Apache License, Version 2.0
|
||||
* (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.apache.solr.client.solrj.impl;
|
||||
|
||||
import org.apache.http.client.HttpClient;
|
||||
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* @deprecated Use {@link org.apache.solr.client.solrj.impl.CloudSolrClient}
|
||||
*/
|
||||
@Deprecated
|
||||
public class CloudSolrServer extends CloudSolrClient {
|
||||
|
||||
public CloudSolrServer(String zkHost) {
|
||||
super(zkHost);
|
||||
}
|
||||
|
||||
public CloudSolrServer(String zkHost, HttpClient httpClient) {
|
||||
super(zkHost, httpClient);
|
||||
}
|
||||
|
||||
public CloudSolrServer(Collection<String> zkHosts, String chroot) {
|
||||
super(zkHosts, chroot);
|
||||
}
|
||||
|
||||
public CloudSolrServer(Collection<String> zkHosts, String chroot, HttpClient httpClient) {
|
||||
super(zkHosts, chroot, httpClient);
|
||||
}
|
||||
|
||||
public CloudSolrServer(String zkHost, boolean updatesToLeaders) {
|
||||
super(zkHost, updatesToLeaders);
|
||||
}
|
||||
|
||||
public CloudSolrServer(String zkHost, boolean updatesToLeaders, HttpClient httpClient) {
|
||||
super(zkHost, updatesToLeaders, httpClient);
|
||||
}
|
||||
|
||||
public CloudSolrServer(String zkHost, LBHttpSolrClient lbClient) {
|
||||
super(zkHost, lbClient);
|
||||
}
|
||||
|
||||
public CloudSolrServer(String zkHost, LBHttpSolrClient lbClient, boolean updatesToLeaders) {
|
||||
super(zkHost, lbClient, updatesToLeaders);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright ownership.
|
||||
* The ASF licenses this file to You under the Apache License, Version 2.0
|
||||
* (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.apache.solr.client.solrj.impl;
|
||||
|
||||
import org.apache.http.client.HttpClient;
|
||||
|
||||
import java.util.concurrent.ExecutorService;
|
||||
|
||||
/**
|
||||
* @deprecated Use {@link org.apache.solr.client.solrj.impl.ConcurrentUpdateSolrClient}
|
||||
*/
|
||||
@Deprecated
|
||||
public class ConcurrentUpdateSolrServer extends ConcurrentUpdateSolrClient {
|
||||
|
||||
public ConcurrentUpdateSolrServer(String solrServerUrl, int queueSize, int threadCount) {
|
||||
super(solrServerUrl, queueSize, threadCount);
|
||||
}
|
||||
|
||||
public ConcurrentUpdateSolrServer(String solrServerUrl, HttpClient client, int queueSize, int threadCount) {
|
||||
super(solrServerUrl, client, queueSize, threadCount);
|
||||
}
|
||||
|
||||
public ConcurrentUpdateSolrServer(String solrServerUrl, HttpClient client, int queueSize, int threadCount, ExecutorService es) {
|
||||
super(solrServerUrl, client, queueSize, threadCount, es);
|
||||
}
|
||||
|
||||
public ConcurrentUpdateSolrServer(String solrServerUrl, HttpClient client, int queueSize, int threadCount, ExecutorService es, boolean streamDeletes) {
|
||||
super(solrServerUrl, client, queueSize, threadCount, es, streamDeletes);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright ownership.
|
||||
* The ASF licenses this file to You under the Apache License, Version 2.0
|
||||
* (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.apache.solr.client.solrj.impl;
|
||||
|
||||
import org.apache.http.client.HttpClient;
|
||||
import org.apache.solr.client.solrj.ResponseParser;
|
||||
|
||||
/**
|
||||
* @deprecated Use {@link org.apache.solr.client.solrj.impl.HttpSolrClient}
|
||||
*/
|
||||
@Deprecated
|
||||
public class HttpSolrServer extends HttpSolrClient {
|
||||
|
||||
public HttpSolrServer(String baseURL) {
|
||||
super(baseURL);
|
||||
}
|
||||
|
||||
public HttpSolrServer(String baseURL, HttpClient client) {
|
||||
super(baseURL, client);
|
||||
}
|
||||
|
||||
public HttpSolrServer(String baseURL, HttpClient client, ResponseParser parser) {
|
||||
super(baseURL, client, parser);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright ownership.
|
||||
* The ASF licenses this file to You under the Apache License, Version 2.0
|
||||
* (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.apache.solr.client.solrj.impl;
|
||||
|
||||
import org.apache.http.client.HttpClient;
|
||||
import org.apache.solr.client.solrj.ResponseParser;
|
||||
|
||||
import java.net.MalformedURLException;
|
||||
|
||||
/**
|
||||
* @deprecated Use {@link org.apache.solr.client.solrj.impl.LBHttpSolrClient}
|
||||
*/
|
||||
@Deprecated
|
||||
public class LBHttpSolrServer extends LBHttpSolrClient {
|
||||
|
||||
public LBHttpSolrServer(String... solrServerUrls) throws MalformedURLException {
|
||||
super(solrServerUrls);
|
||||
}
|
||||
|
||||
public LBHttpSolrServer(HttpClient httpClient, String... solrServerUrl) {
|
||||
super(httpClient, solrServerUrl);
|
||||
}
|
||||
|
||||
public LBHttpSolrServer(HttpClient httpClient, ResponseParser parser, String... solrServerUrl) {
|
||||
super(httpClient, parser, solrServerUrl);
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue