Updated Branches:
  refs/heads/master ef346f573 -> 041e98bfa

CAMEL-3338: DefaultProducer should inherit isSingleton from its parent 
endpoint. As its unusual to have a mix of singleton endpoints vs producers for 
the same Camel component.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/041e98bf
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/041e98bf
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/041e98bf

Branch: refs/heads/master
Commit: 041e98bfaf45fd3929095e46e274547ad4f52d1e
Parents: ef346f5
Author: Claus Ibsen <[email protected]>
Authored: Thu Aug 8 11:26:30 2013 +0200
Committer: Claus Ibsen <[email protected]>
Committed: Thu Aug 8 13:45:25 2013 +0200

----------------------------------------------------------------------
 .../src/main/java/org/apache/camel/IsSingleton.java   | 14 ++++++++------
 .../java/org/apache/camel/impl/DefaultProducer.java   |  5 ++++-
 .../apache/camel/processor/async/MyAsyncEndpoint.java |  2 +-
 .../smpp/SmppProducerLazySessionCreationTest.java     |  3 +++
 .../apache/camel/component/smpp/SmppProducerTest.java |  7 +++++--
 5 files changed, 21 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/041e98bf/camel-core/src/main/java/org/apache/camel/IsSingleton.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/IsSingleton.java 
b/camel-core/src/main/java/org/apache/camel/IsSingleton.java
index 1f16c46..a6db668 100644
--- a/camel-core/src/main/java/org/apache/camel/IsSingleton.java
+++ b/camel-core/src/main/java/org/apache/camel/IsSingleton.java
@@ -19,12 +19,14 @@ package org.apache.camel;
 /**
  * Used for defining if a given class is singleton or not.  If the class is a 
singleton, 
  * then a single instance will be shared (and hence should be treated as 
immutable and
- * be used in a thread-safe manner.)
- * 
+ * be used in a thread-safe manner).
+ * <p/>
  * This interface is not implemented as a marker interface (i.e., it's 
necessary to read  
- * isSingleton() instead of instanceof(IsSingleton)).  This allows for 
subclasses to have 
- * a singleton status different from a parent and for objects to have this 
value dynamically 
- * changed. 
+ * {@link #isSingleton()} instead of <tt>instanceof(IsSingleton))</tt>.
+ * This allows for subclasses to have a singleton status different from a 
parent and
+ * for objects to have this value dynamically changed.
+ * <p/>
+ * Camel component is very often singleton based, only a few components is not.
  *
  * @version 
  */
@@ -32,7 +34,7 @@ public interface IsSingleton {
 
     /**
      * Whether this class supports being singleton or not.
-     *  
+     *
      * @return <tt>true</tt> to be a single shared instance, <tt>false</tt> to 
create new instances.
      */
     boolean isSingleton();

http://git-wip-us.apache.org/repos/asf/camel/blob/041e98bf/camel-core/src/main/java/org/apache/camel/impl/DefaultProducer.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultProducer.java 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultProducer.java
index 9187893..f71d186 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultProducer.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultProducer.java
@@ -59,8 +59,11 @@ public abstract class DefaultProducer extends ServiceSupport 
implements Producer
         return endpoint.createExchange(exchange);
     }
 
+    /**
+     * This implementation will delegate to the endpoint {@link 
org.apache.camel.Endpoint#isSingleton()}
+     */
     public boolean isSingleton() {
-        return true;
+        return endpoint.isSingleton();
     }
 
     protected void doStart() throws Exception {

http://git-wip-us.apache.org/repos/asf/camel/blob/041e98bf/camel-core/src/test/java/org/apache/camel/processor/async/MyAsyncEndpoint.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/test/java/org/apache/camel/processor/async/MyAsyncEndpoint.java
 
b/camel-core/src/test/java/org/apache/camel/processor/async/MyAsyncEndpoint.java
index 596e384..04d0184 100644
--- 
a/camel-core/src/test/java/org/apache/camel/processor/async/MyAsyncEndpoint.java
+++ 
b/camel-core/src/test/java/org/apache/camel/processor/async/MyAsyncEndpoint.java
@@ -51,7 +51,7 @@ public class MyAsyncEndpoint extends DefaultEndpoint {
     }
 
     public boolean isSingleton() {
-        return false;
+        return true;
     }
 
     public String getReply() {

http://git-wip-us.apache.org/repos/asf/camel/blob/041e98bf/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
----------------------------------------------------------------------
diff --git 
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
 
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
index 595d0c3..e2057f7 100644
--- 
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
+++ 
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
@@ -62,6 +62,7 @@ public class SmppProducerLazySessionCreationTest {
     @Test
     public void doStartShouldNotCreateTheSmppSession() throws Exception {
         
expect(endpoint.getConnectionString()).andReturn("smpp://smppclient@localhost:2775");
+        expect(endpoint.isSingleton()).andReturn(true);
 
         replay(endpoint, session);
 
@@ -90,6 +91,7 @@ public class SmppProducerLazySessionCreationTest {
                     NumberingPlanIndicator.UNKNOWN,
                     ""))).andReturn("1");
         
expect(endpoint.getConnectionString()).andReturn("smpp://smppclient@localhost:2775");
+        expect(endpoint.isSingleton()).andReturn(true);
         SmppBinding binding = createMock(SmppBinding.class);
         Exchange exchange = createMock(Exchange.class);
         Message in = createMock(Message.class);
@@ -134,6 +136,7 @@ public class SmppProducerLazySessionCreationTest {
         Message in = createMock(Message.class);
         SmppCommand command = createMock(SmppCommand.class);
         expect(endpoint.getBinding()).andReturn(binding);
+        expect(endpoint.isSingleton()).andReturn(true);
         expect(binding.createSmppCommand(session, 
exchange)).andReturn(command);
         expect(exchange.getIn()).andReturn(in);
         expect(in.getHeader("CamelSmppSystemId", 
String.class)).andReturn("smppclient2");

http://git-wip-us.apache.org/repos/asf/camel/blob/041e98bf/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java
----------------------------------------------------------------------
diff --git 
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java
 
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java
index 45ea305..a479bcc 100644
--- 
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java
+++ 
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java
@@ -80,6 +80,7 @@ public class SmppProducerTest {
                     ""))).andReturn("1");
         expect(endpoint.getConnectionString())
             .andReturn("smpp://smppclient@localhost:2775");
+        expect(endpoint.isSingleton()).andReturn(true);
     }
     
     @Test
@@ -98,7 +99,8 @@ public class SmppProducerTest {
         expect(endpoint.getConnectionString())
             .andReturn("smpp://smppclient@localhost:2775")
             .times(3);
-        
+        expect(endpoint.isSingleton()).andReturn(true);
+
         replay(session, endpoint);
         
         producer.doStop();
@@ -116,7 +118,8 @@ public class SmppProducerTest {
         session.unbindAndClose();
         expect(endpoint.getConnectionString())
             .andReturn("smpp://smppclient@localhost:2775");
-        
+        expect(endpoint.isSingleton()).andReturn(true);
+
         replay(session, endpoint);
         
         producer.doStart();

Reply via email to