1. 09 Feb, 2016 1 commit
  2. 04 Feb, 2016 2 commits
  3. 21 Jan, 2016 1 commit
  4. 20 Jan, 2016 1 commit
    • Jon Skeet's avatar
      Ensure that FieldMask, Timestamp and Duration ToString() calls don't throw · dd43dcca
      Jon Skeet authored
      The usage of ICustomDiagnosticMessage here is non-essential - ToDiagnosticString
      doesn't actually get called by ToString() in this case, due to JsonFormatter code. It was
      intended to make it clearer that it *did* have a custom format... but then arguably I should
      do the same for Value, Struct, Any etc.
      
      Moving some of the code out of JsonFormatter and into Duration/Timestamp/FieldMask likewise
      feels somewhat nice, somewhat nasty... basically there are JSON-specific bits of formatting, but
      also domain-specific bits of computation. <sigh>
      
      Thoughts welcome.
      dd43dcca
  5. 15 Jan, 2016 11 commits
  6. 13 Jan, 2016 2 commits
  7. 11 Jan, 2016 1 commit
  8. 06 Jan, 2016 2 commits
    • Jon Skeet's avatar
      Ensure all formatted well-known-type values are valid JSON · b4a58173
      Jon Skeet authored
      This involves quoting timestamp/duration/field-mask values, even when they're not in fields.
      It's better for consistency.
      
      Fixes issue #1097.
      b4a58173
    • Jon Skeet's avatar
      Improve number handling in JSON parsing · aa431a04
      Jon Skeet authored
      - Tighten up on Infinity/NaN handling in terms of whitespace handling (and test casing)
      - Validate that values are genuinely integers when they've been parsed from a JSON number (ignoring the fact that 1.0000000000000000001 == 1 as a double...)
      - Allow exponents and decimal points in string representations
      aa431a04
  9. 15 Dec, 2015 2 commits
    • Jon Skeet's avatar
      Generated code changes from previous commit. · adee6fe3
      Jon Skeet authored
      adee6fe3
    • Jon Skeet's avatar
      Make ToString() valid without a type registry · aabc6c41
      Jon Skeet authored
      This addresses issue #1008, by creating a JsonFormatter which is private and only different
      to JsonFormatter.Default in terms of reference equality.
      
      Other plausible designs:
      
      - The same, but expose the diagnostic-only formatter
      - Add something to settings to say "I don't have a type registry at all"
      - Change the behaviour of JsonFormatter.Default (bad idea IMO, as we really *don't* want the result of this used as regular JSON to be parsed)
      
      Note that just trying to find a separate fix to issue #933 and using that to override Any.ToString() differently wouldn't work for messages that *contain* an Any.
      
      Generated code changes follow in the next commit.
      aabc6c41
  10. 02 Dec, 2015 2 commits
    • Jon Skeet's avatar
      Handle JSON parsing for Any. · 3de2fced
      Jon Skeet authored
      This required a rework of the tokenizer to allow for a "replaying" tokenizer, basically in case the @type value comes after the data itself. This rework is nice in some ways (all the pushback and object depth logic in one place) but is a little fragile in terms of token push-back when using the replay tokenizer. It'll be fine for the scenario we need it for, but we should be careful...
      3de2fced
    • Jon Skeet's avatar
      JSON formatting for Any. · 567579b5
      Jon Skeet authored
      567579b5
  11. 22 Nov, 2015 2 commits
    • Jon Skeet's avatar
      Generated code changes for previous commit (basically… · a2667aaf
      Jon Skeet authored
      Generated code changes for previous commit (basically InternalBuildGeneratedFileFrom => FromGeneratedCode)
      a2667aaf
    • Jon Skeet's avatar
      Tidy up reflection in advance of attempting to implement DynamicMessage. · 72ec3367
      Jon Skeet authored
      There are corner cases where MessageDescriptor.{ClrType,Parser} will return null, and these are now documented. However, normally they *should* be implemented, even for descriptors of for dynamic messages. Ditto FieldDescriptor.Accessor.
      We'll still need a fair amount of work to implement dynamic messages, but this change means that the public API will be remain intact.
      
      Additionally, this change starts making use of C# 6 features in the files that it touches. This is far from exhaustive, and later PRs will have more.
      
      Generated code changes coming in the next commit.
      72ec3367
  12. 21 Nov, 2015 1 commit
  13. 19 Nov, 2015 1 commit
  14. 09 Nov, 2015 1 commit
  15. 05 Nov, 2015 2 commits
    • Jon Skeet's avatar
      Reimplement JSON recursion by detecting the depth in the tokenizer. · 6fa17e75
      Jon Skeet authored
      Added a TODO around a possible change to the tokenizer API, changing PushBack(token) into just Rewind() or something similar.
      6fa17e75
    • Jon Skeet's avatar
      Created a new exception for JSON failures. · 0fb39c4a
      Jon Skeet authored
      This is only thrown directly by JsonTokenizer, but surfaces from JsonParser as well. I've added doc comments to hopefully make everything clear.
      
      The exception is actually thrown by the reader within JsonTokenizer, in anticipation of keeping track of the location within the document, but that change is not within this PR.
      0fb39c4a
  16. 04 Nov, 2015 1 commit
  17. 03 Nov, 2015 1 commit
    • Jon Skeet's avatar
      Implement JSON parsing in C#. · fb248822
      Jon Skeet authored
      This includes all the well-known types except Any.
      Some aspects are likely to require further work when the details of the JSON parsing expectations are hammered out in more detail. Some of these have "ignored" tests already.
      
      Note that the choice *not* to use Json.NET was made for two reasons:
      - Going from 0 dependencies to 1 dependency is a big hit, and there's not much benefit here
      - Json.NET parses more leniently than we'd want; accommodating that would be nearly as much work as writing the tokenizer
      This only really affects the JsonTokenizer, which could be replaced by Json.NET. The JsonParser code would be about the same length with Json.NET... but I wouldn't be as confident in it.
      fb248822
  18. 30 Oct, 2015 1 commit
  19. 24 Oct, 2015 2 commits
  20. 01 Oct, 2015 2 commits
    • Jon Skeet's avatar
      Support ToString in RepeatedField and MapField. · 9ed6d4da
      Jon Skeet authored
      This changes how we approach JSON formatting in general - instead of looking  at the field a value came from, we just look at the type of the value. It's possible this *could* be slightly inefficient, but if we start caring about JSON performance deeply, we'll probably want to rewrite all of this anyway. It's definitely simpler this way.
      
      When we support dynamic messages, we'll need to modify JsonFormatter to handle enum values, as they won't come be "real" .NET enums at that point. It shouldn't be hard to do though.
      9ed6d4da
    • Jon Skeet's avatar
      Generated code from previous commit. · 18e0a2e5
      Jon Skeet authored
      18e0a2e5
  21. 30 Sep, 2015 1 commit