[New] Implemented AnySelection

This commit is contained in:
Robert von Burg 2014-08-07 01:00:07 +02:00
parent 9fbf49bc45
commit 6c9adf5daf
4 changed files with 107 additions and 33 deletions

View File

@ -0,0 +1,29 @@
/*
* Copyright 2013 Robert von Burg <eitch@eitchnet.ch>
*
* 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 li.strolch.runtime.query.inmemory;
import li.strolch.model.StrolchElement;
/**
* @author Robert von Burg <eitch@eitchnet.ch>
*/
public class AnySelector<T extends StrolchElement> implements Selector<T> {
@Override
public boolean select(T element) {
return true;
}
}

View File

@ -15,6 +15,8 @@
*/
package li.strolch.runtime.query.inmemory;
import java.util.List;
import li.strolch.model.Order;
import li.strolch.model.OrderVisitor;
import li.strolch.model.query.DateSelection;
@ -43,30 +45,32 @@ public class InMemoryOrderQueryVisitor extends InMemoryQueryVisitor<Order, Order
DBC.PRE.assertNotNull("OrderVisitor may not be null!", orderVisitor);
orderQuery.accept(this);
if (this.navigator == null) {
Navigator<Order> navigator = getNavigator();
if (navigator == null) {
String msg = "Query is missing a navigation!"; //$NON-NLS-1$
throw new QueryException(msg);
}
if (this.selectors.isEmpty())
return new InMemoryQuery<>(this.navigator, null, orderVisitor);
List<Selector<Order>> selectors = getSelectors();
if (selectors.isEmpty())
return new InMemoryQuery<>(navigator, null, orderVisitor);
DBC.PRE.assertTrue("Invalid query as it may only contain one selector!", this.selectors.size() == 1); //$NON-NLS-1$
return new InMemoryQuery<>(this.navigator, this.selectors.get(0), orderVisitor);
DBC.PRE.assertTrue("Invalid query as it may only contain one selector!", selectors.size() == 1); //$NON-NLS-1$
return new InMemoryQuery<>(navigator, selectors.get(0), orderVisitor);
}
@Override
public void visit(StrolchTypeNavigation navigation) {
this.navigator = new OrderTypeNavigator(navigation.getType());
setNavigator(new OrderTypeNavigator(navigation.getType()));
}
@Override
public void visit(DateSelection selection) {
this.selectors.add(new DateSelector(selection.getDate()));
addSelector(new DateSelector(selection.getDate()));
}
@Override
public void visit(StateSelection selection) {
this.selectors.add(new StateSelector(selection.getState()));
addSelector(new StateSelector(selection.getState()));
}
}

View File

@ -16,6 +16,7 @@
package li.strolch.runtime.query.inmemory;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import li.strolch.model.GroupedParameterizedElement;
@ -37,6 +38,8 @@ import li.strolch.model.query.ParameterSelectionVisitor;
import li.strolch.model.query.Selection;
import li.strolch.model.query.StrolchElementSelectionVisitor;
import li.strolch.persistence.api.StrolchDao;
import li.strolch.runtime.query.inmemory.ParameterSelector.StringParameterSelector;
import ch.eitchnet.utils.dbc.DBC;
/**
* @author Robert von Burg <eitch@eitchnet.ch>
@ -44,21 +47,29 @@ import li.strolch.persistence.api.StrolchDao;
public abstract class InMemoryQueryVisitor<T extends GroupedParameterizedElement, S extends StrolchDao<?>> implements
StrolchElementSelectionVisitor, ParameterSelectionVisitor {
protected Navigator<T> navigator;
protected List<Selector<T>> selectors;
private Navigator<T> navigator;
private List<Selector<T>> selectors;
private boolean any;
public InMemoryQueryVisitor() {
this.selectors = new ArrayList<>();
}
public List<Selector<T>> getSelectors() {
return this.selectors;
return Collections.unmodifiableList(this.selectors);
}
public Navigator<T> getNavigator() {
return this.navigator;
}
/**
* @param navigator
*/
protected void setNavigator(StrolchTypeNavigator<T> navigator) {
this.navigator = navigator;
}
/**
* Returns a new instance of this concrete type for performing recursive {@link BooleanSelection BooleanSelections}
*
@ -66,30 +77,49 @@ public abstract class InMemoryQueryVisitor<T extends GroupedParameterizedElement
*/
protected abstract InMemoryQueryVisitor<T, S> newInstance();
private void assertNotAny() {
DBC.INTERIM.assertFalse("Not allowed to use further Selections with Any!", this.any);
}
protected void addSelector(Selector<T> selector) {
assertNotAny();
this.selectors.add(selector);
}
@Override
public void visitAny() {
DBC.PRE.assertEmpty("Only one selection allow when using Any!", this.selectors);
addSelector(new AnySelector<T>());
this.any = true;
}
@Override
public void visitAnd(AndSelection andSelection) {
assertNotAny();
InMemoryQueryVisitor<T, S> query = newInstance();
List<Selection> selections = andSelection.getSelections();
for (Selection selection : selections) {
selection.accept(query);
}
AndSelector<T> andSelector = new AndSelector<>(query.getSelectors());
this.selectors.add(andSelector);
addSelector(andSelector);
}
@Override
public void visitOr(OrSelection orSelection) {
assertNotAny();
InMemoryQueryVisitor<T, S> query = newInstance();
List<Selection> selections = orSelection.getSelections();
for (Selection selection : selections) {
selection.accept(query);
}
OrSelector<T> orSelector = new OrSelector<>(query.getSelectors());
this.selectors.add(orSelector);
addSelector(orSelector);
}
@Override
public void visitNot(NotSelection notSelection) {
assertNotAny();
InMemoryQueryVisitor<T, S> query = newInstance();
List<Selection> selections = notSelection.getSelections();
for (Selection selection : selections) {
@ -98,67 +128,74 @@ public abstract class InMemoryQueryVisitor<T extends GroupedParameterizedElement
List<Selector<T>> notSelectors = query.getSelectors();
if (!notSelectors.isEmpty()) {
NotSelector<T> notSelector = new NotSelector<>(notSelectors.get(0));
this.selectors.add(notSelector);
addSelector(notSelector);
}
}
@Override
public void visit(IdSelection selection) {
this.selectors.add(new IdSelector<T>(selection.getIds()));
addSelector(new IdSelector<T>(selection.getIds()));
}
@Override
public void visit(NameSelection selection) {
this.selectors.add(new NameSelector<T>(selection.getName()).caseInsensitive(selection.isCaseInsensitive())
.contains(selection.isContains()));
addSelector(new NameSelector<T>(selection.getName()).caseInsensitive(selection.isCaseInsensitive()).contains(
selection.isContains()));
}
@Override
public void visit(StringParameterSelection selection) {
this.selectors.add(ParameterSelector
.<T> stringSelector(selection.getBagKey(), selection.getParamKey(), selection.getValue())
.contains(selection.isContains()).caseInsensitive(selection.isCaseInsensitive()));
StringParameterSelector<T> stringSelector = //
ParameterSelector.<T> stringSelector( //
selection.getBagKey(), //
selection.getParamKey(), //
selection.getValue() //
)//
.contains(selection.isContains()) //
.caseInsensitive(selection.isCaseInsensitive());
addSelector(stringSelector);
}
@Override
public void visit(IntegerParameterSelection selection) {
this.selectors.add(ParameterSelector.<T> integerSelector(selection.getBagKey(), selection.getParamKey(),
addSelector(ParameterSelector.<T> integerSelector(selection.getBagKey(), selection.getParamKey(),
selection.getValue()));
}
@Override
public void visit(BooleanParameterSelection selection) {
this.selectors.add(ParameterSelector.<T> booleanSelector(selection.getBagKey(), selection.getParamKey(),
addSelector(ParameterSelector.<T> booleanSelector(selection.getBagKey(), selection.getParamKey(),
selection.getValue()));
}
@Override
public void visit(LongParameterSelection selection) {
this.selectors.add(ParameterSelector.<T> longSelector(selection.getBagKey(), selection.getParamKey(),
addSelector(ParameterSelector.<T> longSelector(selection.getBagKey(), selection.getParamKey(),
selection.getValue()));
}
@Override
public void visit(FloatParameterSelection selection) {
this.selectors.add(ParameterSelector.<T> floatSelector(selection.getBagKey(), selection.getParamKey(),
addSelector(ParameterSelector.<T> floatSelector(selection.getBagKey(), selection.getParamKey(),
selection.getValue()));
}
@Override
public void visit(DateParameterSelection selection) {
this.selectors.add(ParameterSelector.<T> dateSelector(selection.getBagKey(), selection.getParamKey(),
addSelector(ParameterSelector.<T> dateSelector(selection.getBagKey(), selection.getParamKey(),
selection.getValue()));
}
@Override
public void visit(DateRangeParameterSelection selection) {
this.selectors.add(ParameterSelector.<T> dateRangeSelector(selection.getBagKey(), selection.getParamKey(),
addSelector(ParameterSelector.<T> dateRangeSelector(selection.getBagKey(), selection.getParamKey(),
selection.getFrom(), selection.getTo()));
}
@Override
public void visit(StringListParameterSelection selection) {
this.selectors.add(ParameterSelector.<T> stringListSelector(selection.getBagKey(), selection.getParamKey(),
addSelector(ParameterSelector.<T> stringListSelector(selection.getBagKey(), selection.getParamKey(),
selection.getValue()));
}
}

View File

@ -15,6 +15,8 @@
*/
package li.strolch.runtime.query.inmemory;
import java.util.List;
import li.strolch.model.Resource;
import li.strolch.model.ResourceVisitor;
import li.strolch.model.query.ResourceQuery;
@ -42,20 +44,22 @@ public class InMemoryResourceQueryVisitor extends InMemoryQueryVisitor<Resource,
DBC.PRE.assertNotNull("ResourceVisitor may not be null!", resourceVisitor);
resourceQuery.accept(this);
if (this.navigator == null) {
Navigator<Resource> navigator = getNavigator();
if (navigator == null) {
String msg = "Query is missing a navigation!"; //$NON-NLS-1$
throw new QueryException(msg);
}
if (this.selectors.isEmpty())
return new InMemoryQuery<>(this.navigator, null, resourceVisitor);
List<Selector<Resource>> selectors = getSelectors();
if (selectors.isEmpty())
return new InMemoryQuery<>(navigator, null, resourceVisitor);
DBC.INTERIM.assertTrue("Invalid query as it may only contain one selector!", this.selectors.size() == 1); //$NON-NLS-1$
return new InMemoryQuery<>(this.navigator, this.selectors.get(0), resourceVisitor);
DBC.INTERIM.assertTrue("Invalid query as it may only contain one selector!", selectors.size() == 1); //$NON-NLS-1$
return new InMemoryQuery<>(navigator, selectors.get(0), resourceVisitor);
}
@Override
public void visit(StrolchTypeNavigation navigation) {
this.navigator = new ResourceTypeNavigator(navigation.getType());
setNavigator(new ResourceTypeNavigator(navigation.getType()));
}
}