svn commit: r581121 - in /lucene/solr/trunk/client/java/solrj: src/org/apache/solr/client/solrj/request/DirectXmlRequest.java test/org/apache/solr/client/solrj/DirectXmlUpdateRequest.java test/org/apache/solr/client/solrj/SolrExampleTests.java

[ry...@apache.org]

Author: ryan
Date: Mon Oct  1 18:01:36 2007
New Revision: 581121

URL: http://svn.apache.org/viewvc?rev=581121&view=rev
Log:
moving generally useful DirectXmlRequest from the test package to solrj/request

Added:
    lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/request/DirectXmlRequest.java   (with props)
Removed:
    lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/DirectXmlUpdateRequest.java
Modified:
    lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/SolrExampleTests.java

Added: lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/request/DirectXmlRequest.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/request/DirectXmlRequest.java?rev=581121&view=auto
==============================================================================
--- lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/request/DirectXmlRequest.java (added)
+++ lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/request/DirectXmlRequest.java Mon Oct  1 18:01:36 2007
@@ -0,0 +1,61 @@
+/**
+ * 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.request;
+
+import java.io.IOException;
+import java.util.Collection;
+
+import org.apache.solr.client.solrj.SolrServer;
+import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.response.UpdateResponse;
+import org.apache.solr.client.solrj.util.ClientUtils;
+import org.apache.solr.common.params.SolrParams;
+import org.apache.solr.common.util.ContentStream;
+
+/**
+ * Send arbitrary XML to a request handler
+ * 
+ * @version $Id$
+ * @since solr 1.3
+ */
+public class DirectXmlRequest extends RequestBase
+{
+  final String xml;
+  
+  public DirectXmlRequest( String path, String body )
+  {
+    super( METHOD.POST, path );
+    xml = body;
+  }
+
+  public Collection<ContentStream> getContentStreams() {
+    return ClientUtils.toContentStreams( xml, ClientUtils.TEXT_XML );
+  }
+
+  public SolrParams getParams() {
+    return null;
+  }
+
+  public UpdateResponse process( SolrServer server ) throws SolrServerException, IOException
+  {
+    long startTime = System.currentTimeMillis();
+    UpdateResponse res = new UpdateResponse( server.request( this ) );
+    res.setElapsedTime( System.currentTimeMillis()-startTime );
+    return res;
+  }
+}

Propchange: lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/request/DirectXmlRequest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/request/DirectXmlRequest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/SolrExampleTests.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/SolrExampleTests.java?rev=581121&r1=581120&r2=581121&view=diff
==============================================================================
--- lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/SolrExampleTests.java (original)
+++ lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/SolrExampleTests.java Mon Oct  1 18:01:36 2007
@@ -26,6 +26,7 @@
 
 import junit.framework.Assert;
 
+import org.apache.solr.client.solrj.request.DirectXmlRequest;
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.client.solrj.response.UpdateResponse;
 import org.apache.solr.client.solrj.util.ClientUtils;
@@ -246,7 +247,7 @@
       xml.append( "</id>" );
     }
     xml.append( "</delete>" );
-    DirectXmlUpdateRequest up = new DirectXmlUpdateRequest( "/update", xml.toString() );
+    DirectXmlRequest up = new DirectXmlRequest( "/update", xml.toString() );
     server.request( up );
     server.commit();
     assertNumFound( "*:*", 0 ); // make sure it got out