summaryrefslogtreecommitdiff
path: root/java
Commit message (Collapse)AuthorAgeFilesLines
* Fix an issue with generate_pretty and empty objects in the Ruby and Java ↵Chris Seaton2020-10-071-5/+5
| | | | implementations
* Merge pull request #405 from Shopify/escape-slash-2.3.0NARUSE, Yui2020-07-313-3/+39
|\ | | | | Add an option to escape forward slash character
| * Add an option to escape forward slash characterJean Boussier2020-07-043-3/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit 26d181059989279a79c433cedcd893b4f52e42ee Author: Francois Chagnon <francois.chagnon@jadedpixel.com> Date: Tue Sep 15 21:17:34 2015 +0000 add config options for escape_slash commit fa282334051b16df91ca097dd7304b46f3bc7719 Author: Francois Chagnon <francois.chagnon@jadedpixel.com> Date: Mon Feb 9 21:09:33 2015 +0000 add forward slash to escape character
* | [refactor] drop old JRuby 1.7 compat codeKarol Bucek2020-07-061-24/+5
|/
* [fix] 2.5 compat on JRuby 9.2 Fixnum/Bignum -> Integerkares2019-02-211-10/+33
| | | | | | | slightly ugly but the only way to still compile under 1.7 once Ruby 1.9.3 gets dropped this should get ironed out ! resolves GH-336
* Always use underscore for match stringFlorian Frank2019-02-212-4/+4
|
* Back-out change of directory of json-java.gemspec.Xuân Baldauf2017-03-271-42/+0
|
* Merge decimal_class patch by Michael JaschobFlorian Frank2016-09-233-86/+158
| | | | | | Also: - Avoid some issues with bundler - Avoid some issues with jruby
* Fix issue #296 when parsing frozen stringsFlorian Frank2016-07-262-71/+77
|
* Treat ASCII_8BIT as UTF-8 by defaultFlorian Frank2016-06-033-91/+85
|
* Remove quirks modeFlorian Frank2016-06-026-540/+126
|
* Merge branch 'v1.8'Florian Frank2016-02-2513-29/+25
|\
| * Call OBJECT_HANDLER for objects without #to_jsonFlorian Frank2016-02-251-5/+8
| | | | | | as a last-ditch effort.
| * Remove remnants of GPL licensesFlorian Frank2015-09-1113-24/+17
| |
* | Remove generate restriction for […]/{…}Florian Frank2015-06-131-32/+0
|/
* Improve JRuby perf. by removing source of multithreaded contentionBen Browning2015-01-022-89/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The RuntimeInfo.forRuntime method synchronizes all invocations and ParserSession#parseString was calling this many times when parsing large JSON strings. Thus, when running in a heavily multithreaded environment, threads were spending a large portion of their time waiting on that synchronization instead of doing work parsing the JSON. This fix simply passes in the RuntimeInfo object to the ParserSession when it's instantiated, since the RuntimeInfo is already known and we've already incurred the synchronization cost at that time. Using the test script at https://gist.github.com/bbrowning/0b89580b03a5f19e7a9f, I get the following results before and after this fix on my machine: Before: $ jruby ~/tmp/json_contention.rb 337.920000 0.570000 338.490000 ( 57.955000) After: $ jruby ~/tmp/json_contention.rb 326.400000 0.580000 326.980000 ( 43.084000) That's a 25% reduction in processing time for parsing the same JSON on my quad core machine. I'd expect an even higher percentage improvement on a machine with more CPUs.
* Fix documentation wordingFlorian Frank2014-07-031-1/+1
|
* Try to convert first with to_hash, then to_hFlorian Frank2013-02-211-2/+3
| | | | | | | | rb_convert_type doesn't return if conversion fails, so use rb_check_convert_type and the raise vi rb_convert_type. Make sure, that this behaviour is consisten across all generator implementations. Fixes https://github.com/flori/json/issues/162
* Security fix create_additons/JSON::GenericObjectv1.7.7Florian Frank2013-02-112-2/+2
|
* fix a bug in the JRuby implementation. getInstanceVariable() can return a ↵John Shahid2013-02-041-1/+2
| | | | null which causes NPE.
* Increase hash likeness of State objectsFlorian Frank2012-12-311-2/+18
|
* add merge alias for configure in jrubyFlorian Frank2012-11-291-1/+1
|
* Change actual rl filessferik-max_nestingFlorian Frank2012-10-072-3/+3
|
* Increase default max_nesting to 100Erik Michaels-Ober2012-10-052-2/+2
| | | | See discussion at https://github.com/intridea/multi_json/pull/59.
* enforce utf8 encoding in parsed stringsjruby-fix-encodingFlorian Frank2012-05-103-37/+52
|
* force jruby encoding after generationFlorian Frank2012-05-091-0/+4
|
* Propagate src encoding to values made from it (fixes 1.9 mode converting ↵Thomas E. Enebo2012-02-111-0/+1
| | | | everything to ascii-8bit; harmless for 1.8 mode too)
* Merge branch 'more_jruby_tweaks' of https://github.com/headius/json into ↵Florian Frank2011-12-212-88/+94
|\ | | | | | | headius-more_jruby_tweaks
| * Only allocate a single "view" bytelist, and update it as needed.Charles Oliver Nutter2011-12-202-88/+94
| | | | | | | | | | | | | | Conflicts: java/src/json/ext/Parser.java java/src/json/ext/Parser.rl
* | Merge branch 'hash-duckyped-object_classes'Florian Frank2011-12-212-4/+0
|\ \ | |/ |/|
| * Remove superflous commentFlorian Frank2011-12-212-4/+0
| |
* | Fix #109Florian Frank2011-12-202-0/+0
|/
* Support duck typed ruby array in JRuby as wellFlorian Frank2011-12-202-16/+16
|
* Support hash ducktype objects on JRuby as wellFlorian Frank2011-12-203-49/+58
|
* Only allocate a single ParserResult, and pass it along the stack.headius-jruby_perf_tweaksCharles Oliver Nutter2011-12-202-141/+170
|
* Better ByteList subsequence and break up some parse methods.Charles Oliver Nutter2011-12-202-84/+126
|
* Use appropriate byteListToInum for Ruby version.Charles Oliver Nutter2011-12-201-1/+3
|
* Minor tweaks to Java ext for performance.Charles Oliver Nutter2011-12-202-116/+128
| | | | | | | * Avoid full newInstance logic if constructing normal Array or Hash * Skip intermediate RubyString for float and integer parsing * Avoid toString for comparison with "-Infinity" * Avoid repeated class.getName().equals() calls
* support buffer length settingsFlorian Frank2011-11-231-0/+21
|
* Extract utils out of this library into json-utilsv1.6.0Florian Frank2011-09-131-80/+84
|
* Add some documentationv1.5.4Florian Frank2011-08-312-1/+6
|
* Merge branch 'quirks-mode-parser' into quirks-modeFlorian Frank2011-07-313-131/+470
|\ | | | | | | | | | | | | | | | | Conflicts: java/src/json/ext/Parser.java java/src/json/ext/Parser.rl json.gemspec json_pure.gemspec tests/test_json.rb
| * Implement quirks_modeFlorian Frank2011-07-313-109/+448
| | | | | | | | This allows parsing of primitive values
* | started quirks mode for generatorFlorian Frank2011-07-279-72/+96
|/
* Ported fixes from fix_memory_leak into Parser.rlFlorian Frank2011-07-082-85/+107
| | | | | Ported semantic of the desired behaviour in ruby-core:35079 to java as well.
* Merge branch 'fix_memory_leak' of https://github.com/bigfix/json into ↵Florian Frank2011-07-049-46/+51
|\ | | | | | | development
| * Fix memory leak when used from multiple JRuby runtimes.John Firebaugh2011-05-189-46/+51
| |
* | Don't optimize calls for ducktypesFlorian Frank2011-05-122-27/+35
| |
* | Merge branch 'master' of gate.dyna.ping.de:/git/jsonFlorian Frank2011-05-122-17/+25
|\ \ | |/ |/|
| * use []= method if objectClass isn't a HashFlorian Frank2011-05-112-17/+25
| |
View Lorry Controller Status