INT-2312: Rebase polishing

artembilan · Sep 30, 2013 · d6995cd · d6995cd
1 parent a3859af
commit d6995cd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/...va/org/springframework/integration/mongodb/config/MongoDbInboundChannelAdapterParser.java b/...va/org/springframework/integration/mongodb/config/MongoDbInboundChannelAdapterParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,13 +15,13 @@
  */
 package org.springframework.integration.mongodb.config;
 
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.w3c.dom.Element;
 
 import org.springframework.beans.BeanMetadataElement;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
-import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.config.xml.AbstractPollingInboundChannelAdapterParser;
 import org.springframework.integration.config.xml.IntegrationNamespaceUtils;
@@ -43,7 +43,7 @@ protected BeanMetadataElement parseSource(Element element, ParserContext parserC
 		// 'collection-name', 'collection-name-expression' and 'mongo-converter'
 		MongoParserUtils.processCommonAttributes(element, parserContext, builder);
 
-		RootBeanDefinition queryExpressionDef =
+		BeanDefinition queryExpressionDef =
 				IntegrationNamespaceUtils.createExpressionDefinitionFromValueOrExpression("query", "query-expression",
 						parserContext, element, true);
 

diff --git a/...ongodb/src/main/java/org/springframework/integration/mongodb/config/MongoParserUtils.java b/...ongodb/src/main/java/org/springframework/integration/mongodb/config/MongoParserUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
  */
 package org.springframework.integration.mongodb.config;
 
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.config.xml.IntegrationNamespaceUtils;
 import org.springframework.util.StringUtils;
@@ -62,7 +62,7 @@ public static void processCommonAttributes(Element element, ParserContext parser
 			IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "mongo-converter");
 		}
 
-		RootBeanDefinition collectionNameExpressionDef =
+		BeanDefinition collectionNameExpressionDef =
 				IntegrationNamespaceUtils.createExpressionDefinitionFromValueOrExpression("collection-name", "collection-name-expression",
 						parserContext, element, false);