+ add some integration tests (still unfinished) and improve parsing
This commit is contained in:
Costin Leau
2011-09-16 22:26:22 +03:00
parent 2b676358c8
commit 13c98d2a7c
6 changed files with 143 additions and 1 deletions

View File

@@ -44,7 +44,7 @@ public class IndexFactoryBean implements InitializingBean, BeanNameAware, Factor
private RegionService cache;
private String beanName;
private String name, expression, from, imports;
private IndexType type;
private IndexType type = IndexType.FUNCTIONAL;
public void afterPropertiesSet() throws Exception {
if (queryService == null) {
@@ -60,8 +60,13 @@ public class IndexFactoryBean implements InitializingBean, BeanNameAware, Factor
}
Assert.notNull(queryService, "Query service required for index creation");
Assert.hasText(expression, "Index expression is required");
Assert.hasText(from, "Index from clause is required");
String indexName = StringUtils.hasText(name) ? name : beanName;
Assert.hasText(indexName, "Index bean id or name is required");
index = createIndex(queryService, indexName);
}

View File

@@ -34,6 +34,7 @@ class GemfireNamespaceHandler extends NamespaceHandlerSupport {
registerBeanDefinitionParser("partitioned-region", new PartitionedRegionParser());
registerBeanDefinitionParser("client-region", new ClientRegionParser());
registerBeanDefinitionParser("pool", new PoolParser());
registerBeanDefinitionParser("index", new IndexParser());
registerBeanDefinitionParser("cache-server", new CacheServerParser());
registerBeanDefinitionParser("transaction-manager", new TransactionManagerParser());

View File

@@ -0,0 +1,49 @@
/*
* Copyright 2011 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.gemfire.config;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.AbstractSimpleBeanDefinitionParser;
import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.data.gemfire.IndexFactoryBean;
import org.w3c.dom.Element;
/**
* Parser for <index;gt; definitions.
*
* @author Costin Leau
*/
class IndexParser extends AbstractSimpleBeanDefinitionParser {
protected Class<?> getBeanClass(Element element) {
return IndexFactoryBean.class;
}
@Override
protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
ParsingUtils.setPropertyReference(element, builder, "cache-ref", "cache");
super.doParse(element, parserContext, builder);
}
@Override
protected boolean isEligibleAttribute(String attributeName) {
if ("cache-ref".equals(attributeName)) {
return false;
}
return super.isEligibleAttribute(attributeName);
}
}