From c4f61646f7f0160e72cd34f03fb566b7606627cb Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Thu, 2 Oct 2008 19:44:57 +0000 Subject: [PATCH] Removed getName from AbstractEndpoint. --- .../integration/endpoint/AbstractEndpoint.java | 9 +-------- .../endpoint/AbstractMessageHandlingEndpoint.java | 2 +- .../integration/endpoint/ServiceActivatorEndpoint.java | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractEndpoint.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractEndpoint.java index 8c8691c7bc..754d5b696d 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractEndpoint.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractEndpoint.java @@ -52,13 +52,6 @@ public abstract class AbstractEndpoint implements MessageEndpoint, TaskScheduler private final MessageChannelTemplate channelTemplate = new MessageChannelTemplate(); - /** - * Return the name of this endpoint. - */ - public String getName() { - return this.name; - } - public void setBeanName(String name) { this.name = name; } @@ -101,7 +94,7 @@ public abstract class AbstractEndpoint implements MessageEndpoint, TaskScheduler if (e instanceof RuntimeException) { throw (RuntimeException) e; } - throw new ConfigurationException("failed to initialize endpoint '" + this.getName() + "'", e); + throw new ConfigurationException("failed to initialize endpoint '" + this + "'", e); } } diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageHandlingEndpoint.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageHandlingEndpoint.java index ed101e8d7c..d4813025ff 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageHandlingEndpoint.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageHandlingEndpoint.java @@ -74,7 +74,7 @@ public abstract class AbstractMessageHandlingEndpoint extends AbstractMessageCon Object result = this.handle(message); if (result == null) { if (this.requiresReply) { - throw new MessageHandlingException(message, "endpoint '" + this.getName() + throw new MessageHandlingException(message, "endpoint '" + this + "' requires a reply, but no reply was received"); } return; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ServiceActivatorEndpoint.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ServiceActivatorEndpoint.java index e8de2d76d2..3dfd65e906 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ServiceActivatorEndpoint.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ServiceActivatorEndpoint.java @@ -65,7 +65,7 @@ public class ServiceActivatorEndpoint extends AbstractMessageHandlingEndpoint { if (e instanceof RuntimeException) { throw (RuntimeException) e; } - throw new MessageHandlingException(message, "failure occurred in endpoint '" + this.getName() + "'", e); + throw new MessageHandlingException(message, "failure occurred in endpoint '" + this + "'", e); } }