Commit Graph

3197 Commits

Author SHA1 Message Date
Jon Skeet
b1ea15f7a5 Make sure that
"valueField": null

is parsed appropriately, i.e. that it remembers that the field is set.
2016-01-15 14:18:16 +00:00
Jon Skeet
8866d6a80e Reject JSON containing the same oneof field twice 2016-01-15 13:54:17 +00:00
Jon Skeet
52db5139c4 Change handling of unknown enums: we now write out the value as a number. 2016-01-15 13:45:53 +00:00
Jon Skeet
f437b67f60 Extra strictness for FieldMask conversion 2016-01-15 12:02:07 +00:00
Jon Skeet
022a9b2675 Allow the original field name (rather than camel-cased) when parsing JSON 2016-01-15 11:39:54 +00:00
Jon Skeet
1fc485928f Fixes to JSON timestamp/duration representations 2016-01-15 11:39:27 +00:00
Jon Skeet
c74676f070 Report serialization errors in conformance tests 2016-01-15 10:55:57 +00:00
Jon Skeet
888e71bdfc Prohibit null values in repeated and map fields in JSON 2016-01-15 10:55:36 +00:00
Jon Skeet
1a34ac03be Throw a better exception when invalid base64 is detected in JSON 2016-01-15 10:43:06 +00:00
Jon Skeet
730c38ad8c Support (and test) numeric enum parsing in JSON 2016-01-15 10:41:56 +00:00
Jon Skeet
f262611ff6 Fix handling of repeated wrappers
Previously we were incorrectly packing wrapper types.
This also refactors FieldCodec a bit as well, using more C# 6-ness.
2016-01-15 10:13:56 +00:00
Feng Xiao
ea956761cc Fix tests broken by the Java directory change.
Change-Id: I39c4eadbd28164cfd83aa2d1d8b6dfe8286db803
2016-01-14 14:29:51 -08:00
Feng Xiao
b6ef4015d7 Merge pull request #1121 from nmittler/restructure
Restructuring protobuf to multiple modules
2016-01-13 11:22:18 -08:00
nmittler
49efe9d7db Restructuring protobuf to multiple modules
protobuf/java will become a parent pom that will contain two modules:

core - contains all of the code for the protobuf-java artifact
util - contains all of the code for the protobuf-java-util artifact

Also cleaned up various Maven warnings.
2016-01-13 08:15:15 -08:00
Jon Skeet
f2fe50bfc5 JSON conformance test fixes
- Spot an Any without a type URL
- In the conformance test runner, catch exceptions due to generally-invalid JSON
2016-01-13 14:05:06 +00:00
Jon Skeet
5dba7d7b4c Introduce ICustomDiagnosticMessage to allow for custom string formatting
This fixes issue #933, effectively.
2016-01-13 10:58:49 +00:00
Jan Tattermusch
73c003c309 Merge pull request #1089 from jskeet/map-null
Prohibit null values in maps
2016-01-12 20:55:47 -08:00
Joshua Haberman
937ef23acd Merge pull request #1080 from haberman/conformance-crashes
Allow conformance test runner to tolerate crashes, and re-enable conformance tests
2016-01-12 15:30:35 -08:00
Feng Xiao
da2eb68dd3 Merge pull request #1129 from dongjoon-hyun/fix_typos_in_README_and_CHANGES
Fix typos in README.md/CHANGES.txt
2016-01-12 10:54:44 -08:00
Josh Haberman
7e74a02b17 Don't generate Objective C WKT for conformance tests to avoid dupliate defs. 2016-01-12 08:56:17 -08:00
Thomas Van Lenten
af8e7ef9a3 Merge pull request #1131 from thomasvl/fix_sem_leak
Release the semaphore in dealloc, fixing leak.
2016-01-12 09:05:50 -05:00
Thomas Van Lenten
4d663376e2 Release the semaphore in dealloc, fixing leak. 2016-01-12 09:04:08 -05:00
Josh Haberman
043ca2b84b Conformance: Update C# failure list to reflect which tests currently pass. 2016-01-12 02:48:00 -08:00
Josh Haberman
fc7f8d9cd0 Fixed Ruby conformance tests by running them under rvm Ruby. 2016-01-11 21:16:42 -08:00
Josh Haberman
bf50ec4ac9 Added debugging output to debug type= problem on Travis. 2016-01-11 16:15:46 -08:00
Josh Haberman
ea909a57e4 Updated C#'s failure list, and added missing file. 2016-01-11 16:15:46 -08:00
Josh Haberman
e891c29f9b Allow conformance test runner to tolerate crashes, and re-enable conformance tests. 2016-01-11 16:15:46 -08:00
Dongjoon Hyun
7b08d49e9d Fix typos in README.md/CHANGES.txt 2016-01-11 14:52:01 -08:00
Feng Xiao
c64146f195 Merge pull request #1046 from peternewman/patch-1
Add the docs claimed define for HAVE_UNORDERED_MAP
2016-01-11 11:16:35 -08:00
Jon Skeet
9e4f354f14 Prohibit null values in map fields
On deserialization, missing values for message types
are replaced with a "default" message.
2016-01-11 09:34:43 +00:00
Peter Newman
4af1cc7445 Revert the change and remove an incorrect comment 2016-01-09 13:38:42 +00:00
Feng Xiao
5700a1054b Merge pull request #1124 from xfxyjwf/appveyor
Fix appveyor build.
2016-01-09 01:04:07 -08:00
Feng Xiao
8f2b622944 Fix appveyor build. 2016-01-09 00:48:49 -08:00
Jan Tattermusch
6d1d415133 Merge pull request #1098 from jskeet/wkt-json
Ensure all formatted well-known-type values are valid JSON
2016-01-08 16:58:47 -08:00
Jan Tattermusch
698f61688c Merge pull request #1088 from jskeet/codec-pruning
Remove unused method in FieldCodec.
2016-01-08 16:50:05 -08:00
Jan Tattermusch
be44985c8c Merge pull request #1087 from jskeet/json-tests
Improve number handling in JSON parsing
2016-01-08 16:49:22 -08:00
Feng Xiao
edd60c9003 Merge pull request #1120 from gitplaneta/master
Update README.md - remove typo
2016-01-08 14:22:28 -08:00
Radoslaw Busz
7d91667e82 Update README.md - remove typo 2016-01-08 15:18:48 +00:00
Feng Xiao
35683bc179 Merge pull request #1101 from xfxyjwf/doc
Update README.md and remove INSTALL.txt
2016-01-07 11:03:33 -08:00
Thomas Van Lenten
d134a80f84 Merge pull request #1118 from thomasvl/xcode_scheme_cleanup
Remove the stale reference to test no longer around, and keep the performance test limited to just performance tests.
2016-01-07 10:35:38 -05:00
Thomas Van Lenten
0e42ed30cb Remove the stale reference to test no longer around, and keep the performance test limited to just performance tests. 2016-01-07 10:31:33 -05:00
Feng Xiao
64d865210f Update README.md and remove INSTALL.txt
Added instructions on what tools to install to compile protobuf from
source. Removed the INSTALL.txt file because it's just a simple copy of
the autoconf documentation and confuses users.

Change-Id: I6fd8aa13495f1238fe5c62451b95ad480b1c4bed
2016-01-06 18:25:25 -08:00
Feng Xiao
76195058e2 Patch internal change 111557819.
Defer calls to mutable_unknown_fields() until it is actually required to
save memory for C++ lite runtime.

Change-Id: Ica9c1fd276cdb164942d1e7b6e098c83ee3ffdc5
2016-01-06 18:10:24 -08:00
Feng Xiao
363316a8d7 Merge pull request #1100 from xfxyjwf/javadoc
Update version number and fix javadoc errors.
2016-01-06 16:41:01 -08:00
Feng Xiao
7d075a44c1 Update version number and fix javadoc errors. 2016-01-06 15:47:41 -08:00
Thomas Van Lenten
ee4a0c0e06 Merge pull request #1094 from thomasvl/update_objc_conformance
Fix up the conformance tests
2016-01-06 14:16:25 -05:00
Jon Skeet
b4a58173f2 Ensure all formatted well-known-type values are valid JSON
This involves quoting timestamp/duration/field-mask values, even when they're not in fields.
It's better for consistency.

Fixes issue #1097.
2016-01-06 12:05:31 +00:00
Jon Skeet
aa431a0481 Improve number handling in JSON parsing
- 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
2016-01-06 11:16:10 +00:00
Thomas Van Lenten
df4e4d8717 Fix up the conformance tests
- Update all the new runner cases to handle a skip result as a skip and not a failure.
- Make ObjC use the new serialize_error result if it fails to generate the data.
2016-01-05 16:31:40 -05:00
Thomas Van Lenten
d19c26f2c8 Merge pull request #1093 from thomasvl/fix_objc
Update objectivec/google/protobuf/Type.pbobjc.m
2016-01-05 15:27:39 -05:00