From b5250811569146f65f2ce04f56f4a08d9d611e5e Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 13 Aug 2020 11:26:55 +0200 Subject: [PATCH] DATACASS-766 - Polishing. Associate bean definition source from XML parsers. --- .../data/cassandra/config/CassandraCqlTemplateParser.java | 2 ++ .../data/cassandra/config/CassandraMappingContextParser.java | 1 + .../data/cassandra/config/CassandraMappingConverterParser.java | 1 + .../data/cassandra/config/CassandraTemplateParser.java | 2 ++ .../config/InitializeKeyspaceBeanDefinitionParser.java | 2 +- .../cassandra/config/SessionFactoryBeanDefinitionParser.java | 1 + 6 files changed, 8 insertions(+), 1 deletion(-) diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraCqlTemplateParser.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraCqlTemplateParser.java index f5e555f14..694beb516 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraCqlTemplateParser.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraCqlTemplateParser.java @@ -64,5 +64,7 @@ class CassandraCqlTemplateParser extends AbstractSingleBeanDefinitionParser { } else { addOptionalPropertyReference(builder, "session", element, "session-ref", DefaultCqlBeanNames.SESSION); } + + builder.getRawBeanDefinition().setSource(element); } } diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingContextParser.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingContextParser.java index c70d2b34b..00a245f97 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingContextParser.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingContextParser.java @@ -71,6 +71,7 @@ class CassandraMappingContextParser extends AbstractSingleBeanDefinitionParser { @Override protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { parseMapping(element, builder); + builder.getRawBeanDefinition().setSource(element); } private void parseMapping(Element element, BeanDefinitionBuilder builder) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingConverterParser.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingConverterParser.java index 7b6dda5f5..95da551ed 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingConverterParser.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingConverterParser.java @@ -63,5 +63,6 @@ class CassandraMappingConverterParser extends AbstractSingleBeanDefinitionParser } builder.addConstructorArgReference(mappingRef); + builder.getRawBeanDefinition().setSource(element); } } diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraTemplateParser.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraTemplateParser.java index b895f33f0..a34993812 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraTemplateParser.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraTemplateParser.java @@ -72,5 +72,7 @@ class CassandraTemplateParser extends AbstractSingleBeanDefinitionParser { if (element.hasAttribute("cassandra-converter-ref")) { addRequiredPropertyReference(builder, "converter", element, "cassandra-converter-ref"); } + + builder.getRawBeanDefinition().setSource(element); } } diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/InitializeKeyspaceBeanDefinitionParser.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/InitializeKeyspaceBeanDefinitionParser.java index c00b26ef7..4c3bb8c84 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/InitializeKeyspaceBeanDefinitionParser.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/InitializeKeyspaceBeanDefinitionParser.java @@ -59,7 +59,7 @@ class InitializeKeyspaceBeanDefinitionParser extends AbstractBeanDefinitionParse parseKeyspacePopulator(element, builder); - builder.getRawBeanDefinition().setSource(parserContext.extractSource(element)); + builder.getRawBeanDefinition().setSource(element); return builder.getBeanDefinition(); } diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/SessionFactoryBeanDefinitionParser.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/SessionFactoryBeanDefinitionParser.java index 31f082cba..68c4a69b5 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/SessionFactoryBeanDefinitionParser.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/SessionFactoryBeanDefinitionParser.java @@ -64,5 +64,6 @@ class SessionFactoryBeanDefinitionParser extends AbstractSingleBeanDefinitionPar addOptionalPropertyValue(builder, "schemaAction", element, "schema-action", SchemaAction.NONE.name()); InitializeKeyspaceBeanDefinitionParser.parseKeyspacePopulator(element, builder); + builder.getRawBeanDefinition().setSource(element); } }