You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2011/03/31 19:47:52 UTC
svn commit: r1087383 - in /camel/trunk/components/camel-aws/src: main/java/org/apache/camel/component/aws/s3/S3Endpoint.java test/java/org/apache/camel/component/aws/s3/S3ComponentConfigurationTest.java

Author: cmueller
Date: Thu Mar 31 17:47:52 2011
New Revision: 1087383

URL: http://svn.apache.org/viewvc?rev=1087383&view=rev
Log:
CAMEL-3546: set a propper default value for the maxMessagesPerPoll option

Modified:
    camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
    camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentConfigurationTest.java

Modified: camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java?rev=1087383&r1=1087382&r2=1087383&view=diff
==============================================================================
--- camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java (original)
+++ camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java Thu Mar 31 17:47:52 2011
@@ -48,7 +48,7 @@ public class S3Endpoint extends Schedule
 
     private AmazonS3Client s3Client;
     private S3Configuration configuration;
-    private int maxMessagesPerPoll;
+    private int maxMessagesPerPoll = 10;
     
     public S3Endpoint(String uri, CamelContext context, S3Configuration configuration) {
         super(uri, context);

Modified: camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentConfigurationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentConfigurationTest.java?rev=1087383&r1=1087382&r2=1087383&view=diff
==============================================================================
--- camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentConfigurationTest.java (original)
+++ camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentConfigurationTest.java Thu Mar 31 17:47:52 2011
@@ -34,6 +34,7 @@ public class S3ComponentConfigurationTes
         assertNull(endpoint.getConfiguration().getAmazonS3Client());
         assertNull(endpoint.getConfiguration().getRegion());
         assertTrue(endpoint.getConfiguration().isDeleteAfterRead());
+        assertEquals(10, endpoint.getMaxMessagesPerPoll());
     }
     
     @Test
@@ -51,12 +52,13 @@ public class S3ComponentConfigurationTes
         assertSame(mock, endpoint.getConfiguration().getAmazonS3Client());
         assertNull(endpoint.getConfiguration().getRegion());
         assertTrue(endpoint.getConfiguration().isDeleteAfterRead());
+        assertEquals(10, endpoint.getMaxMessagesPerPoll());
     }
     
     @Test
     public void createEndpointWithMaximalConfiguration() throws Exception {
         S3Component component = new S3Component(context);
-        S3Endpoint endpoint = (S3Endpoint) component.createEndpoint("aws-s3://MyBucket?accessKey=xxx&secretKey=yyy&region=us-west-1&deleteAfterRead=false");
+        S3Endpoint endpoint = (S3Endpoint) component.createEndpoint("aws-s3://MyBucket?accessKey=xxx&secretKey=yyy&region=us-west-1&deleteAfterRead=false&maxMessagesPerPoll=1");
         
         assertEquals("MyBucket", endpoint.getConfiguration().getBucketName());
         assertEquals("xxx", endpoint.getConfiguration().getAccessKey());
@@ -64,6 +66,7 @@ public class S3ComponentConfigurationTes
         assertNull(endpoint.getConfiguration().getAmazonS3Client());
         assertEquals("us-west-1", endpoint.getConfiguration().getRegion());
         assertFalse(endpoint.getConfiguration().isDeleteAfterRead());
+        assertEquals(1, endpoint.getMaxMessagesPerPoll());
     }
     
     @Test(expected = IllegalArgumentException.class)