Spring/spring-data-couchbase
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACOUCH-52 also register shutdown for xml-based configs

Browse Source
This commit is contained in:
Michael Nitschinger
2014-01-23 15:45:47 +01:00
parent 7dd2a5b7b2
commit 46b33e9952
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/springframework/data/couchbase/config/CouchbaseParser.java
View File

@@ -66,6 +66,8 @@ public class CouchbaseParser extends AbstractSingleBeanDefinitionParser {
bean.addConstructorArgValue(StringUtils.hasText(bucket) ? bucket : CouchbaseFactoryBean.DEFAULT_BUCKET);
String password = element.getAttribute("password");
bean.addConstructorArgValue(StringUtils.hasText(password) ? password : CouchbaseFactoryBean.DEFAULT_PASSWORD);
bean.setDestroyMethodName(CouchbaseFactoryBean.DEFAULT_DESTROY_METHOD);
}
/**
@@ -78,7 +80,8 @@ public class CouchbaseParser extends AbstractSingleBeanDefinitionParser {
* @return the ID to work with.
*/
@Override
protected String resolveId(final Element element, final AbstractBeanDefinition definition, final ParserContext parserContext) {
protected String resolveId(final Element element, final AbstractBeanDefinition definition,
final ParserContext parserContext) {
String id = super.resolveId(element, definition, parserContext);
return StringUtils.hasText(id) ? id : BeanNames.COUCHBASE;
}

5
src/main/java/org/springframework/data/couchbase/core/CouchbaseFactoryBean.java
View File

@@ -59,6 +59,11 @@ public class CouchbaseFactoryBean implements FactoryBean<CouchbaseClient>, Initi
*/
public static final String DEFAULT_PASSWORD = "";
/**
* The name of the default shutdown method to call when the context is destroyed.
*/
public static final String DEFAULT_DESTROY_METHOD = "shutdown";
/**
* Holds the enclosed {@link CouchbaseClient}.
*/