You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/04/18 11:38:52 UTC
[1/2] camel git commit: CAMEL-8664 LAST_ERROR constant removed
Repository: camel
Updated Branches:
refs/heads/master 8affc0b7c -> 0ee1085a4
CAMEL-8664 LAST_ERROR constant removed
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0ee1085a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0ee1085a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0ee1085a
Branch: refs/heads/master
Commit: 0ee1085a40e33df1db8de6130a07b5897f0875fa
Parents: c240428
Author: ancosen <an...@gmail.com>
Authored: Sat Apr 18 08:25:28 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Apr 18 11:39:42 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/component/mongodb/MongoDbConstants.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/0ee1085a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbConstants.java
----------------------------------------------------------------------
diff --git a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbConstants.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbConstants.java
index 2ba5376..8f36dd9 100644
--- a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbConstants.java
+++ b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbConstants.java
@@ -25,7 +25,6 @@ public final class MongoDbConstants {
public static final String BATCH_SIZE = "CamelMongoDbBatchSize";
public static final String NUM_TO_SKIP = "CamelMongoDbNumToSkip";
public static final String INSERT_RECORDS_AFFECTED = "CamelMongoDbInsertRecordsAffected";
- //public static final String LAST_ERROR = "CamelMongoDbLastError";
public static final String MULTIUPDATE = "CamelMongoDbMultiUpdate";
public static final String UPSERT = "CamelMongoDbUpsert";
public static final String RECORDS_AFFECTED = "CamelMongoDbRecordsAffected";
[2/2] camel git commit: Resolve CAMEL-8664 Update MongoDB Java Driver
from 2.13.1 to 3.0.0
Posted by da...@apache.org.
Resolve CAMEL-8664 Update MongoDB Java Driver from 2.13.1 to 3.0.0
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c2404285
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c2404285
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c2404285
Branch: refs/heads/master
Commit: c2404285bc0c1b8366460801ed31df9b864e298e
Parents: 8affc0b
Author: ancosen <an...@gmail.com>
Authored: Fri Apr 17 21:15:35 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Apr 18 11:39:42 2015 +0200
----------------------------------------------------------------------
.../component/mongodb/MongoDbConstants.java | 2 +-
.../component/mongodb/MongoDbEndpoint.java | 19 +----------
.../component/mongodb/MongoDbProducer.java | 10 ------
.../MongoDbTailableCursorConsumerTest.java | 2 +-
.../mongodb/MongoDbWriteConcernsTest.java | 33 ++------------------
parent/pom.xml | 2 +-
6 files changed, 7 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c2404285/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbConstants.java
----------------------------------------------------------------------
diff --git a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbConstants.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbConstants.java
index adc3e3d..2ba5376 100644
--- a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbConstants.java
+++ b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbConstants.java
@@ -25,7 +25,7 @@ public final class MongoDbConstants {
public static final String BATCH_SIZE = "CamelMongoDbBatchSize";
public static final String NUM_TO_SKIP = "CamelMongoDbNumToSkip";
public static final String INSERT_RECORDS_AFFECTED = "CamelMongoDbInsertRecordsAffected";
- public static final String LAST_ERROR = "CamelMongoDbLastError";
+ //public static final String LAST_ERROR = "CamelMongoDbLastError";
public static final String MULTIUPDATE = "CamelMongoDbMultiUpdate";
public static final String UPSERT = "CamelMongoDbUpsert";
public static final String RECORDS_AFFECTED = "CamelMongoDbRecordsAffected";
http://git-wip-us.apache.org/repos/asf/camel/blob/c2404285/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
index e3a056c..abe930b 100644
--- a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
+++ b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbEndpoint.java
@@ -66,8 +66,6 @@ public class MongoDbEndpoint extends DefaultEndpoint {
@UriParam(defaultValue = "true")
private boolean createCollection = true;
@UriParam
- private boolean invokeGetLastError;
- @UriParam
private WriteConcern writeConcern;
private WriteConcern writeConcernRef;
@UriParam
@@ -153,7 +151,7 @@ public class MongoDbEndpoint extends DefaultEndpoint {
}
} else if (role == 'C') {
if (!ObjectHelper.isEmpty(operation) || !ObjectHelper.isEmpty(writeConcern) || writeConcernRef != null
- || dynamicity || invokeGetLastError) {
+ || dynamicity) {
throw new IllegalArgumentException("operation, writeConcern, writeConcernRef, dynamicity, invokeGetLastError "
+ "options cannot appear on a consumer endpoint");
}
@@ -409,21 +407,6 @@ public class MongoDbEndpoint extends DefaultEndpoint {
}
/**
- * Instructs this endpoint to invoke {@link WriteResult#getLastError()} with every operation. By default, MongoDB does not wait
- * for the write operation to occur before returning. If set to true, each exchange will only return after the write operation
- * has actually occurred in MongoDB.
- *
- * @param invokeGetLastError true or false
- */
- public void setInvokeGetLastError(boolean invokeGetLastError) {
- this.invokeGetLastError = invokeGetLastError;
- }
-
- public boolean isInvokeGetLastError() {
- return invokeGetLastError;
- }
-
- /**
* Set the {@link WriteConcern} for write operations on MongoDB, passing in the bean ref to a custom WriteConcern which exists in the Registry.
* You can also use standard WriteConcerns by passing in their key. See the {@link #setWriteConcern(String) setWriteConcern} method.
*
http://git-wip-us.apache.org/repos/asf/camel/blob/c2404285/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbProducer.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbProducer.java
index b15140d..5155161 100644
--- a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbProducer.java
+++ b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbProducer.java
@@ -470,16 +470,6 @@ public class MongoDbProducer extends DefaultProducer {
}
private void processAndTransferWriteResult(WriteResult result, Exchange exchange) {
- // if invokeGetLastError is set, or a WriteConcern is set which implicitly calls getLastError, then we have the chance to populate
- // the MONGODB_LAST_ERROR header, as well as setting an exception on the Exchange if one occurred at the MongoDB server
- if (endpoint.isInvokeGetLastError() || (endpoint.getWriteConcern() != null ? endpoint.getWriteConcern().callGetLastError() : false)) {
- CommandResult cr = result.getCachedLastError() == null ? result.getLastError() : result.getCachedLastError();
- exchange.getOut().setHeader(MongoDbConstants.LAST_ERROR, cr);
- if (!cr.ok()) {
- exchange.setException(MongoDbComponent.wrapInCamelMongoDbException(cr.getException()));
- }
- }
-
// determine where to set the WriteResult: as the OUT body or as an IN message header
if (endpoint.isWriteResultAsHeader()) {
exchange.getOut().setHeader(MongoDbConstants.WRITERESULT, result);
http://git-wip-us.apache.org/repos/asf/camel/blob/c2404285/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbTailableCursorConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbTailableCursorConsumerTest.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbTailableCursorConsumerTest.java
index 9085ff7..6aebbb4 100644
--- a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbTailableCursorConsumerTest.java
+++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbTailableCursorConsumerTest.java
@@ -156,7 +156,7 @@ public class MongoDbTailableCursorConsumerTest extends AbstractMongoDbTest {
// create a capped collection with max = 1000
cappedTestCollection = db.createCollection(cappedTestCollectionName,
BasicDBObjectBuilder.start().add("capped", true).add("size", 1000000000).add("max", 1000).get());
- cappedTestCollection.ensureIndex("increasing");
+ cappedTestCollection.createIndex("increasing");
addTestRoutes();
context.startRoute("tailableCursorConsumer2");
http://git-wip-us.apache.org/repos/asf/camel/blob/c2404285/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbWriteConcernsTest.java
----------------------------------------------------------------------
diff --git a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbWriteConcernsTest.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbWriteConcernsTest.java
index ff92ee6..3af595d 100644
--- a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbWriteConcernsTest.java
+++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbWriteConcernsTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.mongodb;
-import com.mongodb.CommandResult;
import com.mongodb.WriteConcern;
import com.mongodb.WriteResult;
@@ -25,25 +24,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.junit.Test;
public class MongoDbWriteConcernsTest extends AbstractMongoDbTest {
-
- // Test invalid write concern on message header - will it throw the exception?
-
- @Test
- public void testNoWriteConcern() throws Exception {
- assertEquals(0, testCollection.count());
- Object result = template.requestBody("direct:noWriteConcern", "{\"scientist\":\"newton\"}");
- assertTrue("Result is not of type WriteResult", result instanceof WriteResult);
- WriteResult wr = (WriteResult) result;
- WriteConcern wc = wr.getLastConcern();
- // check the WriteConcern's behaviour
- if (wc.callGetLastError()) {
- assertNotNull(wr.getCachedLastError());
- } else {
- assertNull(wr.getCachedLastError());
- }
- CommandResult cr = wr.getLastError();
- assertTrue(cr.ok());
- }
@Test
public void testDynamicWriteConcernSafe() throws Exception {
@@ -53,19 +33,13 @@ public class MongoDbWriteConcernsTest extends AbstractMongoDbTest {
Object result = template.requestBodyAndHeader("direct:noWriteConcern", "{\"scientist\":\"newton\"}", MongoDbConstants.WRITECONCERN, WriteConcern.SAFE);
assertTrue("Result is not of type WriteResult", result instanceof WriteResult);
WriteResult wr = (WriteResult) result;
- // should not be null because with WriteConcern.SAFE, getLastError was called implicitly by the driver
- assertNotNull(wr.getCachedLastError());
- CommandResult cr = wr.getLastError();
- assertTrue(cr.ok());
+ assertTrue(wr.wasAcknowledged());
// same behaviour should be reproduced with String 'SAFE'
result = template.requestBodyAndHeader("direct:noWriteConcern", "{\"scientist\":\"newton\"}", MongoDbConstants.WRITECONCERN, "SAFE");
assertTrue("Result is not of type WriteResult", result instanceof WriteResult);
wr = (WriteResult) result;
- // should not be null because with WriteConcern.SAFE, getLastError was called implicitly by the driver
- assertNotNull(wr.getCachedLastError());
- cr = wr.getLastError();
- assertTrue(cr.ok());
+ assertTrue(wr.wasAcknowledged());
}
@Test
@@ -88,8 +62,7 @@ public class MongoDbWriteConcernsTest extends AbstractMongoDbTest {
from("direct:noWriteConcern").to("mongodb:myDb?database=test&collection=camelTest&operation=insert");
from("direct:writeConcernParam").to("mongodb:myDb?database=test&collection=camelTest&operation=insert&writeConcern=SAFE");
//from("direct:writeConcernRef").to("mongodb:myDb?database=test&collection=camelTest&operation=insert&writeConcernRef=customWriteConcern");
- from("direct:noWriteConcernWithCallGetLastError").to("mongodb:myDb?database=test&collection=camelTest&operation=insert&"
- + "invokeGetLastError=true");
+ from("direct:noWriteConcernWithCallGetLastError").to("mongodb:myDb?database=test&collection=camelTest&operation=insert");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/c2404285/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 8830f9c..a1b2304 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -345,7 +345,7 @@
<minimal-json-version>0.9.1</minimal-json-version>
<mock-javamail-version>1.9</mock-javamail-version>
<mockito-version>1.9.5</mockito-version>
- <mongo-java-driver-version>2.13.1</mongo-java-driver-version>
+ <mongo-java-driver-version>3.0.0</mongo-java-driver-version>
<mqtt-client-version>1.10</mqtt-client-version>
<msv-version>2013.6.1</msv-version>
<mustache-java-version>0.9.0</mustache-java-version>