diff --git a/json-path-web-test/src/main/resources/css/font-awesome.min.css b/json-path-web-test/src/main/resources/css/font-awesome.min.css deleted file mode 100644 index 449d6ac5..00000000 --- a/json-path-web-test/src/main/resources/css/font-awesome.min.css +++ /dev/null @@ -1,4 +0,0 @@ -/*! - * Font Awesome 4.0.3 by @davegandy - http://fontawesome.io - @fontawesome - * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) - */@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.0.3');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.0.3') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff?v=4.0.3') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.0.3') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.0.3#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.3333333333333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.2857142857142858em;text-align:center}.fa-ul{padding-left:0;margin-left:2.142857142857143em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.142857142857143em;width:2.142857142857143em;top:.14285714285714285em;text-align:center}.fa-li.fa-lg{left:-1.8571428571428572em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:spin 2s infinite linear;-moz-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;animation:spin 2s infinite linear}@-moz-keyframes spin{0%{-moz-transform:rotate(0deg)}100%{-moz-transform:rotate(359deg)}}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg)}}@-o-keyframes spin{0%{-o-transform:rotate(0deg)}100%{-o-transform:rotate(359deg)}}@-ms-keyframes spin{0%{-ms-transform:rotate(0deg)}100%{-ms-transform:rotate(359deg)}}@keyframes spin{0%{transform:rotate(0deg)}100%{transform:rotate(359deg)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-moz-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-moz-transform:rotate(270deg);-ms-transform:rotate(270deg);-o-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0,mirror=1);-webkit-transform:scale(-1,1);-moz-transform:scale(-1,1);-ms-transform:scale(-1,1);-o-transform:scale(-1,1);transform:scale(-1,1)}.fa-flip-vertical{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2,mirror=1);-webkit-transform:scale(1,-1);-moz-transform:scale(1,-1);-ms-transform:scale(1,-1);-o-transform:scale(1,-1);transform:scale(1,-1)}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-asc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-desc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-reply-all:before{content:"\f122"}.fa-mail-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"} \ No newline at end of file diff --git a/json-path-web-test/src/main/resources/html/index.html b/json-path-web-test/src/main/resources/html/index.html index 16109d78..5937ec13 100644 --- a/json-path-web-test/src/main/resources/html/index.html +++ b/json-path-web-test/src/main/resources/html/index.html @@ -4,9 +4,9 @@ JSONPath evaluator + - @@ -21,9 +21,9 @@
@@ -33,7 +33,7 @@
- + @@ -45,7 +45,7 @@
- Result options + JSONPath options
@@ -185,25 +185,25 @@ var pathString = $("#txtPath").val(); var updateDisplay = function(icon, tooltip){ - $('#path-status').removeClass().addClass('glyphicon ' + icon); + $('#path-status').removeClass().addClass('fa ' + icon); $('#path-status-tool').attr('data-original-title', tooltip).tooltip('fixTitle'); }; if(pathString.length ==0){ - updateDisplay('glyphicon-ban-circle', 'Invalid path'); + updateDisplay('fa-ban', 'Invalid path'); return; } $.get('/api/validate/?path=' + pathString, function(data) { if(data){ if(data.result === -1){ - updateDisplay('glyphicon-ban-circle', 'Invalid path'); + updateDisplay('fa-ban', 'Invalid path'); } else if(data.result === 0){ - updateDisplay('glyphicon-record', 'Path is definite'); + updateDisplay('fa-bullseye', 'Path is definite'); } else if(data.result === 1){ - updateDisplay('glyphicon-align-justify', 'Path is indefinite'); + updateDisplay('fa-navicon', 'Path is indefinite'); } } }); diff --git a/json-path-web-test/src/main/resources/js/prettify.js b/json-path-web-test/src/main/resources/js/prettify.js index 2938c618..279c9c76 100644 --- a/json-path-web-test/src/main/resources/js/prettify.js +++ b/json-path-web-test/src/main/resources/js/prettify.js @@ -16,7 +16,7 @@ a.a=b;a.d=g.d;a.e=0;I(d,b)(a);var s=/\bMSIE\s(\d+)/.exec(navigator.userAgent),s=s&&+s[1]<=8,d=/\n/g,x=a.a,m=x.length,g=0,j=a.d,k=j.length,b=0,c=a.g,i=c.length,r=0;c[i]=m;var n,e;for(e=n=0;e=l&&(b+=2);g>=B&&(r+=2)}}finally{if(f)f.style.display=h}}catch(u){D.console&&console.log(u&&u.stack||u)}}var D=window,y=["break,continue,do,else,for,if,return,while"],E=[[y,"auto,case,char,const,default,double,enum,extern,float,goto,inline,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"], "catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"],M=[E,"alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,delegate,dynamic_cast,explicit,export,friend,generic,late_check,mutable,namespace,nullptr,property,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"],N=[E,"abstract,assert,boolean,byte,extends,final,finally,implements,import,instanceof,interface,null,native,package,strictfp,super,synchronized,throws,transient"], - O=[N,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,internal,into,is,let,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var,virtual,where"],E=[E,"debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"],P=[y,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"], + O=[N,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,internal,into,is,let,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var,virtual,where"],E=[E,"debugger,eval,export,function,getValue,null,set,undefined,var,with,Infinity,NaN"],P=[y,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"], Q=[y,"alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"],W=[y,"as,assert,const,copy,drop,enum,extern,fail,false,fn,impl,let,log,loop,match,mod,move,mut,priv,pub,pure,ref,self,static,struct,true,trait,type,unsafe,use"],y=[y,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"],R=/^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)\b/, V=/\S/,X=v({keywords:[M,O,E,"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END",P,Q,y],hashComments:!0,cStyleComments:!0,multiLineStrings:!0,regexLiterals:!0}),F={};p(X,["default-code"]);p(C([],[["pln",/^[^]*(?:>|$)/],["com",/^<\!--[\S\s]*?(?:--\>|$)/],["lang-",/^<\?([\S\s]+?)(?:\?>|$)/],["lang-",/^<%([\S\s]+?)(?:%>|$)/],["pun",/^(?:<[%?]|[%?]>)/],["lang-", /^]*>([\S\s]+?)<\/xmp\b[^>]*>/i],["lang-js",/^]*>([\S\s]*?)(<\/script\b[^>]*>)/i],["lang-css",/^]*>([\S\s]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]),["default-markup","htm","html","mxml","xhtml","xml","xsl"]);p(C([["pln",/^\s+/,q," \t\r\n"],["atv",/^(?:"[^"]*"?|'[^']*'?)/,q,"\"'"]],[["tag",/^^<\/?[a-z](?:[\w-.:]*\w)?|\/?>$/i],["atn",/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^\s"'>]*(?:[^\s"'/>]|\/(?=\s)))/],["pun",/^[/<->]+/], diff --git a/json-path/src/main/java/com/jayway/jsonpath/Criteria.java b/json-path/src/main/java/com/jayway/jsonpath/Criteria.java index 1f8a93c4..d17ed86a 100644 --- a/json-path/src/main/java/com/jayway/jsonpath/Criteria.java +++ b/json-path/src/main/java/com/jayway/jsonpath/Criteria.java @@ -272,7 +272,7 @@ public class Criteria implements Predicate { if (CriteriaType.EXISTS == criteriaType) { boolean exists = ((Boolean) expected); try { - path.evaluate(model, configuration.options(Option.THROW_ON_MISSING_PROPERTY)).get(); + path.evaluate(model, configuration.options(Option.THROW_ON_MISSING_PROPERTY)).getValue(); return exists == true; } catch (PathNotFoundException e) { return exists == false; @@ -280,7 +280,7 @@ public class Criteria implements Predicate { } else { try { - final Object actual = path.evaluate(model, configuration).get(); + final Object actual = path.evaluate(model, configuration).getValue(); return criteriaType.eval(expected, actual, configuration); } catch (CompareException e) { return false; diff --git a/json-path/src/main/java/com/jayway/jsonpath/JsonPath.java b/json-path/src/main/java/com/jayway/jsonpath/JsonPath.java index b0177052..6d341ed9 100644 --- a/json-path/src/main/java/com/jayway/jsonpath/JsonPath.java +++ b/json-path/src/main/java/com/jayway/jsonpath/JsonPath.java @@ -172,29 +172,36 @@ public class JsonPath { boolean optSuppressExceptions = configuration.getOptions().contains(Option.SUPPRESS_EXCEPTIONS); boolean optThrowOnMissingProperty = configuration.getOptions().contains(Option.THROW_ON_MISSING_PROPERTY); - Object result = null; try { - result = path.evaluate(jsonObject, configuration).getWithOptions(); + if(optAsPathList){ + return (T)path.evaluate(jsonObject, configuration).getPath(); + } else { + Object res = path.evaluate(jsonObject, configuration).getValue(); + if(optAlwaysReturnList && path.isDefinite()){ + Object array = configuration.getProvider().createArray(); + configuration.getProvider().setProperty(array, 0, res); + return (T)array; + } else { + return (T)res; + } + } } catch (RuntimeException e){ - if(optThrowOnMissingProperty || (!optThrowOnMissingProperty && !optSuppressExceptions)){ + if(optThrowOnMissingProperty || !optSuppressExceptions){ throw e; + } + } + if(optAsPathList){ + return (T)configuration.getProvider().createArray(); + } else { + if(optAlwaysReturnList){ + return (T)configuration.getProvider().createArray(); } else { - if(optSuppressExceptions){ - if(path.isDefinite() && !optAlwaysReturnList && !optAsPathList){ - result = null; - } else { - result = configuration.getProvider().createArray(); - } - } + return (T)(path.isDefinite() ? null : configuration.getProvider().createArray()); } } - return (T)result; + } - /* - public T read(Object jsonObject, Configuration configuration) { - return (T)path.evaluate(jsonObject, configuration).getWithOptions(); - }*/ /** * Applies this JsonPath to the provided json string diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/spi/compiler/EvaluationContextImpl.java b/json-path/src/main/java/com/jayway/jsonpath/internal/spi/compiler/EvaluationContextImpl.java index 1cf04ef8..2faee4ff 100644 --- a/json-path/src/main/java/com/jayway/jsonpath/internal/spi/compiler/EvaluationContextImpl.java +++ b/json-path/src/main/java/com/jayway/jsonpath/internal/spi/compiler/EvaluationContextImpl.java @@ -2,11 +2,13 @@ package com.jayway.jsonpath.internal.spi.compiler; import com.jayway.jsonpath.Configuration; import com.jayway.jsonpath.Option; +import com.jayway.jsonpath.PathNotFoundException; import com.jayway.jsonpath.spi.compiler.EvaluationContext; import com.jayway.jsonpath.spi.compiler.Path; import com.jayway.jsonpath.spi.json.JsonProvider; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Set; @@ -16,22 +18,21 @@ import java.util.Set; class EvaluationContextImpl implements EvaluationContext { private final Configuration configuration; - private final Object objectResult; - private final List pathResult; + private final Object valueResult; + private final Object pathResult; private final Path path; private int resultIndex = 0; EvaluationContextImpl(Path path, Configuration configuration) { this.path = path; this.configuration = configuration; - this.objectResult = configuration.getProvider().createArray(); - this.pathResult = new ArrayList(); - + this.valueResult = configuration.getProvider().createArray(); + this.pathResult = configuration.getProvider().createArray(); } void addResult(String path, Object model) { - pathResult.add(path); - configuration.getProvider().setProperty(objectResult, resultIndex, model); + configuration.getProvider().setProperty(valueResult, resultIndex, model); + configuration.getProvider().setProperty(pathResult, resultIndex, path); resultIndex++; } @@ -50,36 +51,34 @@ class EvaluationContextImpl implements EvaluationContext { @Override - public T get() { + public T getValue() { if (path.isDefinite()) { - return (T) jsonProvider().getArrayIndex(objectResult, 0); + if(resultIndex == 0){ + throw new PathNotFoundException("No results for path: " + path.toString()); + } + return (T) jsonProvider().getArrayIndex(valueResult, 0); } - return (T) objectResult; + return (T) valueResult; } @Override - public Object getWithOptions() { - boolean optAsPathList = configuration.getOptions().contains(Option.AS_PATH_LIST); - boolean optAlwaysReturnList = configuration.getOptions().contains(Option.ALWAYS_RETURN_LIST); - - if (optAsPathList) { - Object array = configuration.getProvider().createArray(); - int i = 0; - for (String p : pathResult) { - configuration.getProvider().setProperty(array, i, p); - i++; - } - return array; - } else if (optAlwaysReturnList) { - return objectResult; - } else { - return get(); + public T getPath() { + if(resultIndex == 0){ + throw new PathNotFoundException("No results for path: " + path.toString()); } + return (T)pathResult; } @Override public List getPathList() { - return pathResult; + List res = new ArrayList(); + if(resultIndex > 0){ + Iterable objects = configuration.getProvider().toIterable(pathResult); + for (Object o : objects) { + res.add((String)o); + } + } + return res; } } diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/spi/compiler/PathCompiler.java b/json-path/src/main/java/com/jayway/jsonpath/internal/spi/compiler/PathCompiler.java index ae8eb574..307112c5 100644 --- a/json-path/src/main/java/com/jayway/jsonpath/internal/spi/compiler/PathCompiler.java +++ b/json-path/src/main/java/com/jayway/jsonpath/internal/spi/compiler/PathCompiler.java @@ -28,6 +28,7 @@ public class PathCompiler { private static final char PERIOD = '.'; private static final char BRACKET_OPEN = '['; private static final char BRACKET_CLOSE = ']'; + private static final char SPACE = ' '; private static final Cache cache = new Cache(200); @@ -60,6 +61,8 @@ public class PathCompiler { char current = chars[i]; switch (current) { + case SPACE: + throw new InvalidPathException("Space not allowed in path"); case DOCUMENT: fragment = "$"; i++; @@ -132,7 +135,7 @@ public class PathCompiler { int skipCount = 0; while (index < chars.length) { char current = chars[index]; - if (current == PERIOD || current == BRACKET_OPEN) { + if (current == PERIOD || current == BRACKET_OPEN || current == SPACE) { break; } index++; diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/spi/compiler/PathToken.java b/json-path/src/main/java/com/jayway/jsonpath/internal/spi/compiler/PathToken.java index 9b460697..3690301a 100644 --- a/json-path/src/main/java/com/jayway/jsonpath/internal/spi/compiler/PathToken.java +++ b/json-path/src/main/java/com/jayway/jsonpath/internal/spi/compiler/PathToken.java @@ -24,39 +24,41 @@ abstract class PathToken { String property = properties.get(0); String evalPath = currentPath + "['" + property + "']"; Object propertyVal = readObjectProperty(property, model, ctx); + if(propertyVal == JsonProvider.UNDEFINED){ + return; + } if (isLeaf()) { ctx.addResult(evalPath, propertyVal); } else { next().evaluate(evalPath, propertyVal, ctx); } } else { - if(ctx.configuration().getOptions().contains(Option.MERGE_MULTI_PROPS)) { + String evalPath = currentPath + "[" + Utils.join(", ", "'", properties) + "]"; - String evalPath = currentPath + "[" + Utils.join(", ", "'", properties) + "]"; - if (!isLeaf()) { - throw new InvalidPathException("Multi properties can only be used as path leafs: " + evalPath); - } else { - Object map = ctx.jsonProvider().createMap(); - for (String property : properties) { - if(hasProperty(property, model, ctx)) { - Object propertyVal = readObjectProperty(property, model, ctx); - ctx.jsonProvider().setProperty(map, property, propertyVal); - } + if (!isLeaf()) { + throw new InvalidPathException("Multi properties can only be used as path leafs: " + evalPath); + } + + if(ctx.configuration().getOptions().contains(Option.MERGE_MULTI_PROPS)) { + Object map = ctx.jsonProvider().createMap(); + for (String property : properties) { + Object propertyVal = readObjectProperty(property, model, ctx); + if(propertyVal == JsonProvider.UNDEFINED){ + continue; } - ctx.addResult(evalPath, map); + ctx.jsonProvider().setProperty(map, property, propertyVal); } + ctx.addResult(evalPath, map); } else { - if (!isLeaf()) { - String evalPath = currentPath + "[" + Utils.join(", ", "'", properties) + "]"; - throw new InvalidPathException("Multi properties can only be used as path leafs: " + evalPath); - } else { - for (String property : properties) { - String evalPath = currentPath + "['" + property + "']"; - if(hasProperty(property, model, ctx)) { - Object propertyVal = readObjectProperty(property, model, ctx); - ctx.addResult(evalPath, propertyVal); + for (String property : properties) { + evalPath = currentPath + "['" + property + "']"; + if(hasProperty(property, model, ctx)) { + Object propertyVal = readObjectProperty(property, model, ctx); + if(propertyVal == JsonProvider.UNDEFINED){ + continue; } + ctx.addResult(evalPath, propertyVal); } } } @@ -68,9 +70,11 @@ abstract class PathToken { } private Object readObjectProperty(String property, Object model, EvaluationContextImpl ctx) { - Object val = ctx.jsonProvider().getMapValue(model, property, ctx.options().contains(Option.THROW_ON_MISSING_PROPERTY)); + Object val = ctx.jsonProvider().getMapValue(model, property, true); if(val == JsonProvider.UNDEFINED){ - throw new PathNotFoundException("Property ['" + property + "'] not found in the current context" ); + if(ctx.options().contains(Option.THROW_ON_MISSING_PROPERTY)) { + throw new PathNotFoundException("Property ['" + property + "'] not found in the current context"); + } } return val; } diff --git a/json-path/src/main/java/com/jayway/jsonpath/spi/compiler/EvaluationContext.java b/json-path/src/main/java/com/jayway/jsonpath/spi/compiler/EvaluationContext.java index f560b0b8..99fa1adb 100644 --- a/json-path/src/main/java/com/jayway/jsonpath/spi/compiler/EvaluationContext.java +++ b/json-path/src/main/java/com/jayway/jsonpath/spi/compiler/EvaluationContext.java @@ -19,17 +19,11 @@ public interface EvaluationContext { * @param expected return type * @return evaluation result */ - T get(); + T getValue(); + + + T getPath(); - /** - * This method does adhere to configuration settings like - * - * {@link com.jayway.jsonpath.Option#ALWAYS_RETURN_LIST} - * {@link com.jayway.jsonpath.Option#AS_PATH_LIST} - * - * @return evaluation result - */ - Object getWithOptions(); /** * Convenience method to get list of hits as String path representations diff --git a/json-path/src/test/java/com/jayway/jsonpath/FilterTest.java b/json-path/src/test/java/com/jayway/jsonpath/FilterTest.java index 6ac8ee75..39880533 100644 --- a/json-path/src/test/java/com/jayway/jsonpath/FilterTest.java +++ b/json-path/src/test/java/com/jayway/jsonpath/FilterTest.java @@ -392,7 +392,7 @@ public class FilterTest { Filter customFilter = new Filter.FilterAdapter>() { @Override public boolean apply(check, confMap map) { - if (map.get("name").equals("rootGrandChild_A")) { + if (map.getValue("name").equals("rootGrandChild_A")) { return true; } return false; @@ -427,7 +427,7 @@ public class FilterTest { List res = JsonPath.read(doc, "$.items[?]", customFilter); - assertEquals(1, res.get(0).intValue()); + assertEquals(1, res.getValue(0).intValue()); */ } diff --git a/json-path/src/test/java/com/jayway/jsonpath/IssuesTest.java b/json-path/src/test/java/com/jayway/jsonpath/IssuesTest.java index 082e77f0..f1b07b3d 100644 --- a/json-path/src/test/java/com/jayway/jsonpath/IssuesTest.java +++ b/json-path/src/test/java/com/jayway/jsonpath/IssuesTest.java @@ -141,8 +141,8 @@ public class IssuesTest { System.out.println(result); - //assertThat(result.get(0), is(new Double(10.1))); - //assertThat(result.get(1), is(new Double(21.0))); + //assertThat(result.getValue(0), is(new Double(10.1))); + //assertThat(result.getValue(1), is(new Double(21.0))); } diff --git a/json-path/src/test/java/com/jayway/jsonpath/JsonPathFilterTest.java b/json-path/src/test/java/com/jayway/jsonpath/JsonPathFilterTest.java index 14fc17a5..2fe29f36 100644 --- a/json-path/src/test/java/com/jayway/jsonpath/JsonPathFilterTest.java +++ b/json-path/src/test/java/com/jayway/jsonpath/JsonPathFilterTest.java @@ -73,7 +73,7 @@ public class JsonPathFilterTest { Filter customFilter = new Filter.FilterAdapter>() { @Override public boolean accept(Map map) { - if(map.get("name").equals("rootGrandChild_A")){ + if(map.getValue("name").equals("rootGrandChild_A")){ return true; } return false; @@ -109,7 +109,7 @@ public class JsonPathFilterTest { List res = JsonPath.read(doc, "$.items[?]", customFilter); - assertEquals(1, res.get(0).intValue()); + assertEquals(1, res.getValue(0).intValue()); } */ diff --git a/json-path/src/test/java/com/jayway/jsonpath/internal/TestInternal3.java b/json-path/src/test/java/com/jayway/jsonpath/internal/TestInternal3.java index 66b9b7dc..d9afd1c5 100644 --- a/json-path/src/test/java/com/jayway/jsonpath/internal/TestInternal3.java +++ b/json-path/src/test/java/com/jayway/jsonpath/internal/TestInternal3.java @@ -29,7 +29,7 @@ public class TestInternal3 extends TestBase { @Test public void a_root_object_can_be_evaluated() { - Map result = tokenize("$").evaluate(DOC, CONF).get(); + Map result = tokenize("$").evaluate(DOC, CONF).getValue(); assertThat(result) .containsKey("store") @@ -39,7 +39,7 @@ public class TestInternal3 extends TestBase { @Test public void a_definite_array_item_property_can_be_evaluated() { - String result = tokenize("$.store.book[0].author").evaluate(DOC, CONF).get(); + String result = tokenize("$.store.book[0].author").evaluate(DOC, CONF).getValue(); assertThat(result).isEqualTo("Nigel Rees"); } @@ -47,7 +47,7 @@ public class TestInternal3 extends TestBase { @Test public void a_wildcard_array_item_property_can_be_evaluated() { - List result = tokenize("$.store.book[*].author").evaluate(DOC, CONF).get(); + List result = tokenize("$.store.book[*].author").evaluate(DOC, CONF).getValue(); assertThat(result).containsOnly( "Nigel Rees", "Evelyn Waugh", "Herman Melville", "J. R. R. Tolkien"); diff --git a/json-path/src/test/java/com/jayway/jsonpath/reader/ReadConfigurationTest.java b/json-path/src/test/java/com/jayway/jsonpath/reader/ReadConfigurationTest.java index eff7468f..6d40b9fc 100644 --- a/json-path/src/test/java/com/jayway/jsonpath/reader/ReadConfigurationTest.java +++ b/json-path/src/test/java/com/jayway/jsonpath/reader/ReadConfigurationTest.java @@ -34,7 +34,7 @@ public class ReadConfigurationTest { Object updatedJsonModel = JsonPath.parse("{...}") .write("$['store'][1]['name']", "new name") .write("$.store[1].age", 43) - .get(); + .getValue(); */ }