From e55aee06ce139a36ba20b371337223c0ac469f30 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Thu, 11 Dec 2008 19:33:43 +0000
Subject: [PATCH] Minimizing class loading in parsers and using the parser
 context error handling capabilities rather than throwing Exceptions or using
 assertions. This facilitates proper tooling support (INT-114).

---
 .../adapter/config/AbstractRemotingGatewayParser.java       | 6 ------
 .../httpinvoker/config/HttpInvokerInboundGatewayParser.java | 5 ++---
 .../integration/rmi/config/RmiInboundGatewayParser.java     | 5 ++---
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/AbstractRemotingGatewayParser.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/AbstractRemotingGatewayParser.java
index 4549a39a06..6cb3c4e771 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/AbstractRemotingGatewayParser.java
+++ b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/AbstractRemotingGatewayParser.java
@@ -23,7 +23,6 @@ import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.AbstractSimpleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.integration.config.ConsumerEndpointFactoryBean;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -34,11 +33,6 @@ import org.springframework.util.StringUtils;
  */
 public abstract class AbstractRemotingGatewayParser extends AbstractSimpleBeanDefinitionParser {
 
-	protected Class<?> getBeanClass(Element element) {
-		return ConsumerEndpointFactoryBean.class;
-	}
-
-
 	@Override
 	protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext)
 			throws BeanDefinitionStoreException {
diff --git a/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/config/HttpInvokerInboundGatewayParser.java b/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/config/HttpInvokerInboundGatewayParser.java
index bf10eba35e..735e7a1139 100644
--- a/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/config/HttpInvokerInboundGatewayParser.java
+++ b/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/config/HttpInvokerInboundGatewayParser.java
@@ -19,7 +19,6 @@ package org.springframework.integration.httpinvoker.config;
 import org.w3c.dom.Element;
 
 import org.springframework.integration.adapter.config.AbstractRemotingGatewayParser;
-import org.springframework.integration.httpinvoker.HttpInvokerInboundGateway;
 
 /**
  * Parser for the &lt;httpinvoker-gateway/&gt; element. 
@@ -29,8 +28,8 @@ import org.springframework.integration.httpinvoker.HttpInvokerInboundGateway;
 public class HttpInvokerInboundGatewayParser extends AbstractRemotingGatewayParser {
 
 	@Override
-	protected Class<?> getBeanClass(Element element) {
-		return HttpInvokerInboundGateway.class;
+	protected String getBeanClassName(Element element) {
+		return "org.springframework.integration.httpinvoker.HttpInvokerInboundGateway";
 	}
 
 }
diff --git a/org.springframework.integration.rmi/src/main/java/org/springframework/integration/rmi/config/RmiInboundGatewayParser.java b/org.springframework.integration.rmi/src/main/java/org/springframework/integration/rmi/config/RmiInboundGatewayParser.java
index bbeaef14ae..acce4a382c 100644
--- a/org.springframework.integration.rmi/src/main/java/org/springframework/integration/rmi/config/RmiInboundGatewayParser.java
+++ b/org.springframework.integration.rmi/src/main/java/org/springframework/integration/rmi/config/RmiInboundGatewayParser.java
@@ -20,7 +20,6 @@ import org.w3c.dom.Element;
 
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.integration.adapter.config.AbstractRemotingGatewayParser;
-import org.springframework.integration.rmi.RmiInboundGateway;
 import org.springframework.util.StringUtils;
 
 /**
@@ -34,8 +33,8 @@ public class RmiInboundGatewayParser extends AbstractRemotingGatewayParser {
 
 
 	@Override
-	protected Class<?> getBeanClass(Element element) {
-		return RmiInboundGateway.class;
+	protected String getBeanClassName(Element element) {
+		return "org.springframework.integration.rmi.RmiInboundGateway";
 	}
 
 	@Override