=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/OpFactory.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/OpFactory.java 2015-01-20 07:04:36 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/OpFactory.java 2015-01-20 07:15:07 +0000 @@ -37,6 +37,7 @@ import org.hisp.dhis.dxf2.objectfilter.ops.LikeOp; import org.hisp.dhis.dxf2.objectfilter.ops.LtOp; import org.hisp.dhis.dxf2.objectfilter.ops.LteOp; +import org.hisp.dhis.dxf2.objectfilter.ops.NLikeOp; import org.hisp.dhis.dxf2.objectfilter.ops.NeqOp; import org.hisp.dhis.dxf2.objectfilter.ops.NnullOp; import org.hisp.dhis.dxf2.objectfilter.ops.NullOp; @@ -57,6 +58,7 @@ register( "eq", EqOp.class ); register( "neq", NeqOp.class ); register( "like", LikeOp.class ); + register( "nlike", NLikeOp.class ); register( "startsWith", StartsWithOp.class ); register( "endsWith", EndsWithOp.class ); register( "gt", GtOp.class ); @@ -86,10 +88,7 @@ { return opClass.newInstance(); } - catch ( InstantiationException ignored ) - { - } - catch ( IllegalAccessException ignored ) + catch ( InstantiationException | IllegalAccessException ignored ) { } === added file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/ops/NLikeOp.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/ops/NLikeOp.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/ops/NLikeOp.java 2015-01-20 07:15:07 +0000 @@ -0,0 +1,54 @@ +package org.hisp.dhis.dxf2.objectfilter.ops; + +/* + * 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. + */ + +/** + * @author Morten Olav Hansen + */ +public class NLikeOp extends Op +{ + @Override + public OpStatus evaluate( Object object ) + { + if ( getValue() == null || object == null ) + { + return OpStatus.IGNORE; + } + + if ( String.class.isInstance( object ) ) + { + String s1 = getValue( String.class ); + String s2 = (String) object; + + return (s1 != null && s2.toLowerCase().contains( s1.toLowerCase() )) ? OpStatus.EXCLUDE : OpStatus.INCLUDE; + } + + return OpStatus.IGNORE; + } +}