Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed bug causing PropertyIsNil filter to fail if ResponsePaging is activated #678

Merged
merged 1 commit into from
Aug 17, 2016
Merged

Fixed bug causing PropertyIsNil filter to fail if ResponsePaging is activated #678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions deegree-core/deegree-core-base/src/main/java/org/deegree/filter/xml/Filter200XMLEncoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
import org.deegree.filter.comparison.PropertyIsLessThan;
import org.deegree.filter.comparison.PropertyIsLessThanOrEqualTo;
import org.deegree.filter.comparison.PropertyIsLike;
import org.deegree.filter.comparison.PropertyIsNil;
import org.deegree.filter.comparison.PropertyIsNotEqualTo;
import org.deegree.filter.comparison.PropertyIsNull;
import org.deegree.filter.expression.Function;
Expand Down Expand Up @@ -123,26 +124,29 @@ public class Filter200XMLEncoder {
spatialOperatorTypeToElementName.put( SpatialOperator.SubType.EQUALS, new QName( FES_20_NS, "Equals" ) );
spatialOperatorTypeToElementName.put( SpatialOperator.SubType.DISJOINT, new QName( FES_20_NS, "Disjoint" ) );
spatialOperatorTypeToElementName.put( SpatialOperator.SubType.DWITHIN, new QName( FES_20_NS, "DWithin" ) );
spatialOperatorTypeToElementName.put( SpatialOperator.SubType.INTERSECTS, new QName( FES_20_NS, "Intersects" ) );
spatialOperatorTypeToElementName.put( SpatialOperator.SubType.INTERSECTS,
new QName( FES_20_NS, "Intersects" ) );
spatialOperatorTypeToElementName.put( SpatialOperator.SubType.OVERLAPS, new QName( FES_20_NS, "Overlaps" ) );
spatialOperatorTypeToElementName.put( SpatialOperator.SubType.TOUCHES, new QName( FES_20_NS, "Touches" ) );
spatialOperatorTypeToElementName.put( SpatialOperator.SubType.WITHIN, new QName( FES_20_NS, "Within" ) );

temporalOperatorTypeToElementName.put( TemporalOperator.SubType.AFTER, new QName( FES_20_NS, "After" ) );
temporalOperatorTypeToElementName.put( TemporalOperator.SubType.ANYINTERACTS, new QName( FES_20_NS,
"AnyInteracts" ) );
temporalOperatorTypeToElementName.put( TemporalOperator.SubType.ANYINTERACTS,
new QName( FES_20_NS, "AnyInteracts" ) );
temporalOperatorTypeToElementName.put( TemporalOperator.SubType.BEFORE, new QName( FES_20_NS, "Before" ) );
temporalOperatorTypeToElementName.put( TemporalOperator.SubType.BEGINS, new QName( FES_20_NS, "Begins" ) );
temporalOperatorTypeToElementName.put( TemporalOperator.SubType.BEGUNBY, new QName( FES_20_NS, "BegunBy" ) );
temporalOperatorTypeToElementName.put( TemporalOperator.SubType.DURING, new QName( FES_20_NS, "During" ) );
temporalOperatorTypeToElementName.put( TemporalOperator.SubType.ENDEDBY, new QName( FES_20_NS, "EndedBy" ) );
temporalOperatorTypeToElementName.put( TemporalOperator.SubType.MEETS, new QName( FES_20_NS, "Meets" ) );
temporalOperatorTypeToElementName.put( TemporalOperator.SubType.METBY, new QName( FES_20_NS, "MetBy" ) );
temporalOperatorTypeToElementName.put( TemporalOperator.SubType.OVERLAPPEDBY, new QName( FES_20_NS,
"OverlappedBy" ) );
temporalOperatorTypeToElementName.put( TemporalOperator.SubType.TCONTAINS, new QName( FES_20_NS, "TContains" ) );
temporalOperatorTypeToElementName.put( TemporalOperator.SubType.OVERLAPPEDBY,
new QName( FES_20_NS, "OverlappedBy" ) );
temporalOperatorTypeToElementName.put( TemporalOperator.SubType.TCONTAINS,
new QName( FES_20_NS, "TContains" ) );
temporalOperatorTypeToElementName.put( TemporalOperator.SubType.TEQUALS, new QName( FES_20_NS, "TEquals" ) );
temporalOperatorTypeToElementName.put( TemporalOperator.SubType.TOVERLAPS, new QName( FES_20_NS, "TOverlaps" ) );
temporalOperatorTypeToElementName.put( TemporalOperator.SubType.TOVERLAPS,
new QName( FES_20_NS, "TOverlaps" ) );
}

/**
Expand Down Expand Up @@ -243,6 +247,9 @@ private static void export( ComparisonOperator operator, XMLStreamWriter writer
case PROPERTY_IS_NULL:
export( (PropertyIsNull) operator, writer );
break;
case PROPERTY_IS_NIL:
export( (PropertyIsNil) operator, writer );
break;
default:
throw new IllegalArgumentException( "Encoding of operator subtype " + operator.getType()
+ " is not supported yet!" );
Expand Down Expand Up @@ -440,6 +447,13 @@ private static void export( PropertyIsNull operator, XMLStreamWriter writer )
writer.writeEndElement();
}

private static void export( PropertyIsNil operator, XMLStreamWriter writer )
throws XMLStreamException {
writer.writeStartElement( FES_20_NS, "PropertyIsNil" );
export( operator.getPropertyName(), writer );
writer.writeEndElement();
}

private static void export( XMLStreamWriter writer, And andOp )
throws XMLStreamException, UnknownCRSException, TransformationException {
writer.writeStartElement( FES_20_NS, "And" );
Expand Down
5 changes: 3 additions & 2 deletions ...-core-base/src/test/java/org/deegree/filter/xml/Filter200XMLEncoderParameterizedTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,12 @@ public static List<Object[]> data()
filterTests.add( new Object[] { "testfilter5.xml", asString( "v200/testfilter5.xml" ) } );
filterTests.add( new Object[] { "testfilter6.xml", asString( "v200/testfilter6.xml" ) } );
filterTests.add( new Object[] { "testfilter7.xml", asString( "v200/testfilter7.xml" ) } );
filterTests.add( new Object[] { "testfilter8.xml", asString( "v200/testfilter8.xml" ) } );
filterTests.add( new Object[] { "aixm_by_gml_identifier.xml", asString( "v200/aixm_by_gml_identifier.xml" ) } );
filterTests.add( new Object[] { "aixm_custom_geometry_bbox.xml",
asString( "v200/aixm_custom_geometry_bbox.xml" ) } );
asString( "v200/aixm_custom_geometry_bbox.xml" ) } );
filterTests.add( new Object[] { "aixm_custom_geometry_property.xml",
asString( "v200/aixm_custom_geometry_property.xml" ) } );
asString( "v200/aixm_custom_geometry_property.xml" ) } );
filterTests.add( new Object[] { "aixm_timeinstant_begin.xml", asString( "v200/aixm_timeinstant_begin.xml" ) } );
filterTests.add( new Object[] { "temporal/tequals.xml", asString( "v200/temporal/tequals.xml" ) } );
return filterTests;
Expand Down
7 changes: 7 additions & 0 deletions ...ree-core/deegree-core-base/src/test/resources/org/deegree/filter/xml/v200/testfilter8.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<fes:Filter xmlns:app="http://www.deegree.org/app" xmlns:fes="http://www.opengis.net/fes/2.0" xmlns:gml="http://www.opengis.net/gml"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/fes/2.0 http://schemas.opengis.net/filter/2.0/filter.xsd">
<fes:PropertyIsNil>
<fes:ValueReference>app:nilTest</fes:ValueReference>
</fes:PropertyIsNil>
</fes:Filter>