SOLR-6025: Replace mentions of CommonsHttpSolrServer with HttpSolrServer and StreamingUpdateSolrServer with ConcurrentUpdateSolrServer

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1590410 13f79535-47bb-0310-9956-ffa450edef68

solr/CHANGES.txt

@@ -138,6 +138,9 @@ Other Changes
 * SOLR-5974: Remove ShardDoc.score and use parent's ScoreDoc.score.
   (Tomás Fernández Löbbe via Ryan Ernst)
 
+* SOLR-6025: Replace mentions of CommonsHttpSolrServer with HttpSolrServer and
+  StreamingUpdateSolrServer with ConcurrentUpdateSolrServer. (Ahmet Arslan via shalin)
+
 Build
 ---------------------
 

solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema.xml

@@ -39,7 +39,7 @@
   - for best index size and searching performance, set "index" to false
     for all general text fields, use copyField to copy them to the
     catchall "text" field, and use that for searching.
-  - For maximum indexing performance, use the StreamingUpdateSolrServer
+  - For maximum indexing performance, use the ConcurrentUpdateSolrServer
     java client.
   - Remember to run the JVM in server mode, and use a higher logging level
     that avoids logging every request

solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/schema.xml

@@ -39,7 +39,7 @@
   - for best index size and searching performance, set "index" to false
     for all general text fields, use copyField to copy them to the
     catchall "text" field, and use that for searching.
-  - For maximum indexing performance, use the StreamingUpdateSolrServer
+  - For maximum indexing performance, use the ConcurrentUpdateSolrServer
     java client.
   - Remember to run the JVM in server mode, and use a higher logging level
     that avoids logging every request

solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/schema.xml

@@ -39,7 +39,7 @@
   - for best index size and searching performance, set "index" to false
     for all general text fields, use copyField to copy them to the
     catchall "text" field, and use that for searching.
-  - For maximum indexing performance, use the StreamingUpdateSolrServer
+  - For maximum indexing performance, use the ConcurrentUpdateSolrServer
     java client.
   - Remember to run the JVM in server mode, and use a higher logging level
     that avoids logging every request

solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/schema.xml

@@ -39,7 +39,7 @@
   - for best index size and searching performance, set "index" to false
     for all general text fields, use copyField to copy them to the
     catchall "text" field, and use that for searching.
-  - For maximum indexing performance, use the StreamingUpdateSolrServer
+  - For maximum indexing performance, use the ConcurrentUpdateSolrServer
     java client.
   - Remember to run the JVM in server mode, and use a higher logging level
     that avoids logging every request

solr/contrib/uima/src/test-files/uima/solr/collection1/conf/schema.xml

@@ -34,7 +34,7 @@
     size and searching performance, set "index" to false for all general
     text fields, use copyField to copy them to the catchall "text"
     field, and use that for searching. - For maximum indexing
-    performance, use the StreamingUpdateSolrServer java client. -
+    performance, use the ConcurrentUpdateSolrServer java client. -
     Remember to run the JVM in server mode, and use a higher logging
     level that avoids logging every request
   -->

solr/contrib/uima/src/test-files/uima/uima-tokenizers-schema.xml

@@ -34,7 +34,7 @@
     size and searching performance, set "index" to false for all general
     text fields, use copyField to copy them to the catchall "text"
     field, and use that for searching. - For maximum indexing
-    performance, use the StreamingUpdateSolrServer java client. -
+    performance, use the ConcurrentUpdateSolrServer java client. -
     Remember to run the JVM in server mode, and use a higher logging
     level that avoids logging every request
   -->

solr/example/example-DIH/solr/db/conf/schema.xml

@@ -39,7 +39,7 @@
   - for best index size and searching performance, set "index" to false
     for all general text fields, use copyField to copy them to the
     catchall "text" field, and use that for searching.
-  - For maximum indexing performance, use the StreamingUpdateSolrServer
+  - For maximum indexing performance, use the ConcurrentUpdateSolrServer
     java client.
   - Remember to run the JVM in server mode, and use a higher logging level
     that avoids logging every request

solr/example/example-DIH/solr/mail/conf/schema.xml

@@ -39,7 +39,7 @@
   - for best index size and searching performance, set "index" to false
     for all general text fields, use copyField to copy them to the
     catchall "text" field, and use that for searching.
-  - For maximum indexing performance, use the StreamingUpdateSolrServer
+  - For maximum indexing performance, use the ConcurrentUpdateSolrServer
     java client.
   - Remember to run the JVM in server mode, and use a higher logging level
     that avoids logging every request

solr/example/example-DIH/solr/rss/conf/schema.xml

@@ -39,7 +39,7 @@
   - for best index size and searching performance, set "index" to false
     for all general text fields, use copyField to copy them to the
     catchall "text" field, and use that for searching.
-  - For maximum indexing performance, use the StreamingUpdateSolrServer
+  - For maximum indexing performance, use the ConcurrentUpdateSolrServer
     java client.
   - Remember to run the JVM in server mode, and use a higher logging level
     that avoids logging every request

solr/example/example-DIH/solr/solr/conf/schema.xml

@@ -39,7 +39,7 @@
   - for best index size and searching performance, set "index" to false
     for all general text fields, use copyField to copy them to the
     catchall "text" field, and use that for searching.
-  - For maximum indexing performance, use the StreamingUpdateSolrServer
+  - For maximum indexing performance, use the ConcurrentUpdateSolrServer
     java client.
   - Remember to run the JVM in server mode, and use a higher logging level
     that avoids logging every request

solr/example/example-DIH/solr/tika/conf/schema.xml

@@ -39,7 +39,7 @@
   - for best index size and searching performance, set "index" to false
     for all general text fields, use copyField to copy them to the
     catchall "text" field, and use that for searching.
-  - For maximum indexing performance, use the StreamingUpdateSolrServer
+  - For maximum indexing performance, use the ConcurrentUpdateSolrServer
     java client.
   - Remember to run the JVM in server mode, and use a higher logging level
     that avoids logging every request

solr/example/example-schemaless/solr/collection1/conf/schema.xml

@@ -39,7 +39,7 @@
   - for best index size and searching performance, set "index" to false
     for all general text fields, use copyField to copy them to the
     catchall "text" field, and use that for searching.
-  - For maximum indexing performance, use the StreamingUpdateSolrServer
+  - For maximum indexing performance, use the ConcurrentUpdateSolrServer
     java client.
   - Remember to run the JVM in server mode, and use a higher logging level
     that avoids logging every request

solr/example/solr/collection1/conf/schema.xml

@@ -39,7 +39,7 @@
   - for best index size and searching performance, set "index" to false
     for all general text fields, use copyField to copy them to the
     catchall "text" field, and use that for searching.
-  - For maximum indexing performance, use the StreamingUpdateSolrServer
+  - For maximum indexing performance, use the ConcurrentUpdateSolrServer
     java client.
   - Remember to run the JVM in server mode, and use a higher logging level
     that avoids logging every request

solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java

@@ -86,7 +86,7 @@ public class LBHttpSolrServer extends SolrServer {
   }
 
   // keys to the maps are currently of the form "http://localhost:8983/solr"
-  // which should be equivalent to CommonsHttpSolrServer.getBaseURL()
+  // which should be equivalent to HttpSolrServer.getBaseURL()
   private final Map<String, ServerWrapper> aliveServers = new LinkedHashMap<>();
   // access to aliveServers should be synchronized on itself
   

solr/solrj/src/test/org/apache/solr/client/solrj/TestBatchUpdate.java

@@ -50,28 +50,28 @@ public class TestBatchUpdate extends SolrJettyTestBase {
 
   @Test
   public void testWithXml() throws Exception {
-    HttpSolrServer commonsHttpSolrServer = (HttpSolrServer) getSolrServer();
-    commonsHttpSolrServer.setRequestWriter(new RequestWriter());
-    commonsHttpSolrServer.deleteByQuery( "*:*" ); // delete everything!    
-    doIt(commonsHttpSolrServer);
+    HttpSolrServer httpSolrServer = (HttpSolrServer) getSolrServer();
+    httpSolrServer.setRequestWriter(new RequestWriter());
+    httpSolrServer.deleteByQuery( "*:*" ); // delete everything!
+    doIt(httpSolrServer);
   }
 
   @Test
   public void testWithBinary()throws Exception{
-    HttpSolrServer commonsHttpSolrServer = (HttpSolrServer) getSolrServer();
-    commonsHttpSolrServer.setRequestWriter(new BinaryRequestWriter());
-    commonsHttpSolrServer.deleteByQuery( "*:*" ); // delete everything!
-    doIt(commonsHttpSolrServer);
+    HttpSolrServer httpSolrServer = (HttpSolrServer) getSolrServer();
+    httpSolrServer.setRequestWriter(new BinaryRequestWriter());
+    httpSolrServer.deleteByQuery( "*:*" ); // delete everything!
+    doIt(httpSolrServer);
   }
 
   @Test
   public void testWithBinaryBean()throws Exception{
-    HttpSolrServer commonsHttpSolrServer = (HttpSolrServer) getSolrServer();
-    commonsHttpSolrServer.setRequestWriter(new BinaryRequestWriter());
-    commonsHttpSolrServer.deleteByQuery( "*:*" ); // delete everything!
+    HttpSolrServer httpSolrServer = (HttpSolrServer) getSolrServer();
+    httpSolrServer.setRequestWriter(new BinaryRequestWriter());
+    httpSolrServer.deleteByQuery( "*:*" ); // delete everything!
     final int[] counter = new int[1];
     counter[0] = 0;
-    commonsHttpSolrServer.addBeans(new Iterator<Bean>() {
+    httpSolrServer.addBeans(new Iterator<Bean>() {
 
       @Override
       public boolean hasNext() {
@@ -91,9 +91,9 @@ public class TestBatchUpdate extends SolrJettyTestBase {
         //do nothing
       }
     });
-    commonsHttpSolrServer.commit();
+    httpSolrServer.commit();
     SolrQuery query = new SolrQuery("*:*");
-    QueryResponse response = commonsHttpSolrServer.query(query);
+    QueryResponse response = httpSolrServer.query(query);
     assertEquals(0, response.getStatus());
     assertEquals(numdocs, response.getResults().getNumFound());
   }
@@ -105,10 +105,10 @@ public class TestBatchUpdate extends SolrJettyTestBase {
     String cat;
   }
        
-  private void doIt(HttpSolrServer commonsHttpSolrServer) throws SolrServerException, IOException {
+  private void doIt(HttpSolrServer httpSolrServer) throws SolrServerException, IOException {
     final int[] counter = new int[1];
     counter[0] = 0;
-    commonsHttpSolrServer.add(new Iterator<SolrInputDocument>() {
+    httpSolrServer.add(new Iterator<SolrInputDocument>() {
 
       @Override
       public boolean hasNext() {
@@ -129,9 +129,9 @@ public class TestBatchUpdate extends SolrJettyTestBase {
 
       }
     });
-    commonsHttpSolrServer.commit();
+    httpSolrServer.commit();
     SolrQuery query = new SolrQuery("*:*");
-    QueryResponse response = commonsHttpSolrServer.query(query);
+    QueryResponse response = httpSolrServer.query(query);
     assertEquals(0, response.getStatus());
     assertEquals(numdocs, response.getResults().getNumFound());
   }

solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java

@@ -46,7 +46,7 @@ public class SolrExampleJettyTest extends SolrExampleTests {
       // setup the server...
       String url = "http" + (isSSLMode() ? "s" : "") +  "://127.0.0.1/?core=xxx";
       HttpSolrServer s = new HttpSolrServer( url );
-      Assert.fail( "CommonsHttpSolrServer should not allow a path with a parameter: "+s.getBaseURL() );
+      Assert.fail("HttpSolrServer should not allow a path with a parameter: "+s.getBaseURL() );
     }
     catch( Exception ex ) {
       // expected

solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java

@@ -672,7 +672,7 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes
     // random.nextInt(sliceCount-1));
     // }
     //
-    // CommonsHttpSolrServer client = (CommonsHttpSolrServer)
+    // HttpSolrServer client = (HttpSolrServer)
     // clients.get(which);
     
     UpdateRequest ureq = new UpdateRequest();
@@ -1767,4 +1767,4 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes
     createCollection(collectionInfos, collName, props, client);
   }
 
-}
+}