Author: boday
Date: Fri Dec 2 06:59:57 2011
New Revision: 1209375
URL: http://svn.apache.org/viewvc?rev=1209375&view=rev
Log:
CAMEL-4539 added camel-solr rollback operation support
Added:
camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrTransactionsTest.java
- copied, changed from r1209336,
camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrCommitAndOptimizeTest.java
Removed:
camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrCommitAndOptimizeTest.java
Modified:
camel/trunk/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrConstants.java
camel/trunk/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java
Modified:
camel/trunk/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrConstants.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrConstants.java?rev=1209375&r1=1209374&r2=1209375&view=diff
==============================================================================
---
camel/trunk/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrConstants.java
(original)
+++
camel/trunk/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrConstants.java
Fri Dec 2 06:59:57 2011
@@ -22,6 +22,7 @@ public final class SolrConstants {
public static final String OPERATION = "SolrOperation";
public static final String PARAM = "SolrParam.";
public static final String OPERATION_COMMIT = "COMMIT";
+ public static final String OPERATION_ROLLBACK = "ROLLBACK";
public static final String OPERATION_OPTIMIZE = "OPTIMIZE";
public static final String OPERATION_INSERT = "INSERT";
public static final String OPERATION_ADD_BEAN = "ADD_BEAN";
Modified:
camel/trunk/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java?rev=1209375&r1=1209374&r2=1209375&view=diff
==============================================================================
---
camel/trunk/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java
(original)
+++
camel/trunk/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java
Fri Dec 2 06:59:57 2011
@@ -58,6 +58,8 @@ public class SolrProducer extends Defaul
solrServer.addBean(exchange.getIn().getBody());
} else if (operation.equalsIgnoreCase(SolrConstants.OPERATION_COMMIT))
{
solrServer.commit();
+ } else if
(operation.equalsIgnoreCase(SolrConstants.OPERATION_ROLLBACK)) {
+ solrServer.rollback();
} else if
(operation.equalsIgnoreCase(SolrConstants.OPERATION_OPTIMIZE)) {
solrServer.optimize();
} else {
Copied:
camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrTransactionsTest.java
(from r1209336,
camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrCommitAndOptimizeTest.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrTransactionsTest.java?p2=camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrTransactionsTest.java&p1=camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrCommitAndOptimizeTest.java&r1=1209336&r2=1209375&rev=1209375&view=diff
==============================================================================
---
camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrCommitAndOptimizeTest.java
(original)
+++
camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrTransactionsTest.java
Fri Dec 2 06:59:57 2011
@@ -20,7 +20,7 @@ import java.util.HashMap;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.junit.Test;
-public class SolrCommitAndOptimizeTest extends SolrComponentTestSupport {
+public class SolrTransactionsTest extends SolrComponentTestSupport {
@Test
public void testCommit() throws Exception {
@@ -37,6 +37,26 @@ public class SolrCommitAndOptimizeTest e
}
@Test
+ public void testRollback() throws Exception {
+
+ //insert and verify
+ solrInsertTestEntry();
+ assertEquals("wrong number of entries found", 0,
executeSolrQuery("id:" + TEST_ID).getResults().getNumFound());
+
+ //rollback
+ template.sendBodyAndHeader("direct:start", null,
SolrConstants.OPERATION, SolrConstants.OPERATION_ROLLBACK);
+
+ //verify after rollback
+ assertEquals("wrong number of entries found", 0,
executeSolrQuery("id:" + TEST_ID).getResults().getNumFound());
+
+ //commit
+ template.sendBodyAndHeader("direct:start", null,
SolrConstants.OPERATION, SolrConstants.OPERATION_COMMIT);
+
+ //verify after commit (again)
+ assertEquals("wrong number of entries found", 0,
executeSolrQuery("id:" + TEST_ID).getResults().getNumFound());
+ }
+
+ @Test
public void testOptimize() throws Exception {
//insert and verify
