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 2013/07/28 14:07:14 UTC
[2/4] git commit: CAMEL-6581: Changing destination using JMX on
SendProcessor not longer supported, to aid optimizing routing engine.
CAMEL-6581: Changing destination using JMX on SendProcessor not longer supported, to aid optimizing routing engine.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9433bf13
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9433bf13
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9433bf13
Branch: refs/heads/master
Commit: 9433bf1347544f9acad8b0c2a74e4e480de20dc7
Parents: 357f6de
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Jul 28 10:42:27 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Jul 28 10:42:27 2013 +0200
----------------------------------------------------------------------
.../mbean/ManagedSendProcessorMBean.java | 4 ++++
.../management/mbean/ManagedSendProcessor.java | 4 +---
.../apache/camel/processor/SendProcessor.java | 9 ++++-----
.../management/ManagedSendProcessorTest.java | 21 --------------------
4 files changed, 9 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9433bf13/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedSendProcessorMBean.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedSendProcessorMBean.java b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedSendProcessorMBean.java
index e35e468..a99a49f 100644
--- a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedSendProcessorMBean.java
+++ b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedSendProcessorMBean.java
@@ -23,7 +23,11 @@ public interface ManagedSendProcessorMBean extends ManagedProcessorMBean {
@ManagedAttribute(description = "Destination as Endpoint URI")
String getDestination();
+ /**
+ * @deprecated no longer in use. Will be removed in a future Camel release.
+ */
@ManagedAttribute(description = "Destination as Endpoint URI")
+ @Deprecated
void setDestination(String uri);
@ManagedAttribute(description = "Message Exchange Pattern")
http://git-wip-us.apache.org/repos/asf/camel/blob/9433bf13/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSendProcessor.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSendProcessor.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSendProcessor.java
index 43688e8..668d963 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSendProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedSendProcessor.java
@@ -17,7 +17,6 @@
package org.apache.camel.management.mbean;
import org.apache.camel.CamelContext;
-import org.apache.camel.Endpoint;
import org.apache.camel.api.management.ManagedResource;
import org.apache.camel.api.management.mbean.ManagedSendProcessorMBean;
import org.apache.camel.model.ProcessorDefinition;
@@ -44,8 +43,7 @@ public class ManagedSendProcessor extends ManagedProcessor implements ManagedSen
}
public void setDestination(String uri) {
- Endpoint endpoint = getContext().getEndpoint(uri);
- processor.setDestination(endpoint);
+ // noop
}
public String getMessageExchangePattern() {
http://git-wip-us.apache.org/repos/asf/camel/blob/9433bf13/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
index 56f1f6e..c197aa5 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
@@ -66,12 +66,11 @@ public class SendProcessor extends ServiceSupport implements AsyncProcessor, Tra
return "sendTo(" + destination + (pattern != null ? " " + pattern : "") + ")";
}
+ /**
+ * @deprecated not longer supported.
+ */
+ @Deprecated
public void setDestination(Endpoint destination) {
- this.destination = destination;
- // destination changed so purge the cache
- if (producerCache != null) {
- producerCache.purge();
- }
}
public String getTraceLabel() {
http://git-wip-us.apache.org/repos/asf/camel/blob/9433bf13/camel-core/src/test/java/org/apache/camel/management/ManagedSendProcessorTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedSendProcessorTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedSendProcessorTest.java
index 3f01465..6113790 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedSendProcessorTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedSendProcessorTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.management;
-import javax.management.Attribute;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -60,26 +59,6 @@ public class ManagedSendProcessorTest extends ManagementTestSupport {
String pattern = (String) mbeanServer.getAttribute(on, "MessageExchangePattern");
assertNull(pattern);
-
- // we must stop it to change the destination
- mbeanServer.invoke(on, "stop", null, null);
-
- // send it somewhere else
- mbeanServer.setAttribute(on, new Attribute("Destination", "direct:foo"));
-
- // start it
- mbeanServer.invoke(on, "start", null, null);
-
- // prepare mocks
- result.reset();
- result.expectedMessageCount(0);
- foo.reset();
- foo.expectedMessageCount(1);
-
- // send in another message that should be sent to mock:foo
- template.sendBody("direct:start", "Bye World");
-
- assertMockEndpointsSatisfied();
}
@Override