From 40c0814dfaea9a0bbb64311ab4fe7e1e8f2789e1 Mon Sep 17 00:00:00 2001 From: Kalle Stenflo Date: Wed, 29 Feb 2012 19:38:53 +0100 Subject: [PATCH] Fixed naming issue with PassthroughFilter.java --- .../jayway/jsonpath/reader/filter/FilterFactory.java | 4 ++-- .../jsonpath/reader/filter/PassthroughFilter.java | 5 +++-- .../java/com/jayway/jsonpath/ComplianceTests.java | 12 +++++------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/json-path/src/main/java/com/jayway/jsonpath/reader/filter/FilterFactory.java b/json-path/src/main/java/com/jayway/jsonpath/reader/filter/FilterFactory.java index eb700a26..60070b78 100644 --- a/json-path/src/main/java/com/jayway/jsonpath/reader/filter/FilterFactory.java +++ b/json-path/src/main/java/com/jayway/jsonpath/reader/filter/FilterFactory.java @@ -8,8 +8,8 @@ package com.jayway.jsonpath.reader.filter; */ public class FilterFactory { - private final static Filter DOCUMENT_FILTER = new PassThroughFilter("$", false); - private final static Filter ALL_ARRAY_ITEMS_FILTER = new PassThroughFilter("[*]", true); + private final static Filter DOCUMENT_FILTER = new PassthroughFilter("$", false); + private final static Filter ALL_ARRAY_ITEMS_FILTER = new PassthroughFilter("[*]", true); private final static Filter WILDCARD_FILTER = new WildcardFilter("*"); private final static Filter SCAN_FILTER = new ScanFilter(".."); diff --git a/json-path/src/main/java/com/jayway/jsonpath/reader/filter/PassthroughFilter.java b/json-path/src/main/java/com/jayway/jsonpath/reader/filter/PassthroughFilter.java index 500f5e9f..14020874 100644 --- a/json-path/src/main/java/com/jayway/jsonpath/reader/filter/PassthroughFilter.java +++ b/json-path/src/main/java/com/jayway/jsonpath/reader/filter/PassthroughFilter.java @@ -8,11 +8,12 @@ import com.jayway.jsonpath.spi.JsonProvider; * Date: 11/4/11 * Time: 10:15 PM */ -public class PassThroughFilter extends Filter { +public class PassthroughFilter extends Filter { + private boolean isArrayFilter; - public PassThroughFilter(String condition, boolean isArrayFilter) { + public PassthroughFilter(String condition, boolean isArrayFilter) { super(condition); this.isArrayFilter = isArrayFilter; } diff --git a/json-path/src/test/java/com/jayway/jsonpath/ComplianceTests.java b/json-path/src/test/java/com/jayway/jsonpath/ComplianceTests.java index 7eeca86e..794ff5fc 100644 --- a/json-path/src/test/java/com/jayway/jsonpath/ComplianceTests.java +++ b/json-path/src/test/java/com/jayway/jsonpath/ComplianceTests.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Map; import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.hasItems; import static org.junit.Assert.assertThat; /** @@ -113,14 +114,11 @@ public class ComplianceTests { " }"; + //assertThat(JsonPath.>read(json, "$.menu.items[?(@ && @.id && !@.label)].id"), hasItems("?")); //low + //assertThat(JsonPath.>read(json, "$.menu.items[?(@ && @.label && /SVG/.test(@.label))].id"), hasItems("?")); //low + //assertThat(JsonPath.>read(json, "$.menu.items[?(!@)]"), hasItems("?")); //low + //assertThat(JsonPath.>read(json, "$..[0]"), hasItems("?")); //low - /* - - "$.menu.items[?(@ && @.id && !@.label)].id", - "$.menu.items[?(@ && @.label && /SVG/.test(@.label))].id", - "$.menu.items[?(!@)]", - "$..[0]" - */ }