=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Conjunction.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Conjunction.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Conjunction.java 2015-06-02 07:39:57 +0000 @@ -0,0 +1,42 @@ +package org.hisp.dhis.query; + +/* + * Copyright (c) 2004-2015, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +import org.hisp.dhis.schema.Schema; + +/** + * @author Morten Olav Hansen + */ +public class Conjunction extends Junction +{ + public Conjunction( Schema schema, Type type ) + { + super( schema, Type.AND ); + } +} === added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Criteria.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Criteria.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Criteria.java 2015-06-02 07:39:57 +0000 @@ -0,0 +1,89 @@ +package org.hisp.dhis.query; + +/* + * Copyright (c) 2004-2015, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +import org.hisp.dhis.schema.Schema; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +/** + * @author Morten Olav Hansen + */ +public abstract class Criteria +{ + protected List criterions = new ArrayList<>(); + + protected final Schema schema; + + public Criteria( Schema schema ) + { + this.schema = schema; + } + + public List getCriterions() + { + return criterions; + } + + public Criteria add( Criterion... criterions ) + { + for ( Criterion criterion : criterions ) + { + if ( !Restriction.class.isInstance( criterion ) ) + { + continue; + } + + Restriction restriction = (Restriction) criterion; + + if ( !schema.haveProperty( restriction.getPath() ) ) + { + continue; + } + + if ( restriction.getParameters().size() > restriction.getOperator().getMax() + || restriction.getParameters().size() < restriction.getOperator().getMin() ) + { + continue; + } + + this.criterions.add( restriction ); + } + + return this; + } + + public Criteria add( Collection criterions ) + { + this.criterions.addAll( criterions ); + return this; + } +} === added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Disjunction.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Disjunction.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Disjunction.java 2015-06-02 07:39:57 +0000 @@ -0,0 +1,42 @@ +package org.hisp.dhis.query; + +/* + * Copyright (c) 2004-2015, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +import org.hisp.dhis.schema.Schema; + +/** + * @author Morten Olav Hansen + */ +public class Disjunction extends Junction +{ + public Disjunction( Schema schema, Type type ) + { + super( schema, Type.OR ); + } +} === added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Junction.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Junction.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Junction.java 2015-06-02 07:39:57 +0000 @@ -0,0 +1,55 @@ +package org.hisp.dhis.query; + +/* + * Copyright (c) 2004-2015, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +import org.hisp.dhis.schema.Schema; + +/** + * @author Morten Olav Hansen + */ +public abstract class Junction extends Criteria implements Criterion +{ + protected enum Type + { + AND, OR + } + + protected Type type; + + public Junction( Schema schema, Type type ) + { + super( schema ); + this.type = type; + } + + public Type getType() + { + return type; + } +} === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Query.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Query.java 2015-06-02 04:25:37 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Query.java 2015-06-02 07:39:57 +0000 @@ -40,14 +40,10 @@ /** * @author Morten Olav Hansen */ -public class Query +public class Query extends Criteria { - private final Schema schema; - private List orders = new ArrayList<>(); - private List criterions = new ArrayList<>(); - private Integer firstResult; private Integer maxResults; @@ -59,7 +55,7 @@ private Query( Schema schema ) { - this.schema = schema; + super( schema ); } public Schema getSchema() @@ -72,11 +68,6 @@ return orders; } - public List getCriterions() - { - return criterions; - } - public Integer getFirstResult() { return firstResult; @@ -99,41 +90,6 @@ return this; } - // Builder - public Query add( Criterion... criterions ) - { - for ( Criterion criterion : criterions ) - { - if ( !Restriction.class.isInstance( criterion ) ) - { - continue; - } - - Restriction restriction = (Restriction) criterion; - - if ( !schema.haveProperty( restriction.getPath() ) ) - { - continue; - } - - if ( restriction.getParameters().size() > restriction.getOperator().getMax() - || restriction.getParameters().size() < restriction.getOperator().getMin() ) - { - continue; - } - - this.criterions.add( restriction ); - } - - return this; - } - - public Query add( Collection criterions ) - { - this.criterions.addAll( criterions ); - return this; - } - public Query addOrder( Order... orders ) { for ( Order order : orders )