Jie Luo
7727e2603c
Merge pull request #1195 from calbach/python-json-struct
...
Manually down-integrate python JSON struct support from internal code base.
9 years ago
Jisi Liu
110e31cbbc
Merge pull request #1199 from google/google_integrate
...
Integrate google internal changes to master
9 years ago
CH Albach
5477f8cdba
Manually down-integrate python JSON struct support from internal code base.
9 years ago
Jisi Liu
defa25b38b
Restore the license for Internal.java
9 years ago
Jisi Liu
1b8bab3a78
Uncomment the test, which was commented out during integration
9 years ago
Jisi Liu
5221dcbe47
Integrate from google internal.
...
Java files are moved to un-do the hack in the prevous commit, which
moved the java files to the original position for integration.
9 years ago
Jisi Liu
cb3f428810
Undo the Java module change for integration.
...
Moving the files to their original location, so that opensource changes
can be picked during the internal merge. Those files will be moved into
the correct location after merging with internal code.
Note: do NOT merge this into master without the other internal
down-integration commit.
9 years ago
Jan Tattermusch
b13874d59e
Merge pull request #1158 from jskeet/nonnormalized-tostring
...
Ensure that FieldMask, Timestamp and Duration ToString() calls don't throw
9 years ago
Feng Xiao
60f7fc51fb
Merge pull request #1169 from LuminateWireless/bazel-build
...
Fix bazel BUILD for Java.
9 years ago
Jisi Liu
c65be83200
Merge pull request #1167 from xfxyjwf/refactor_doc
...
Refactor README.md.
9 years ago
Ming Zhao
4fe03816b1
Fix bazel BUILD for Java.
9 years ago
Feng Xiao
d0e0114f31
Refactor README.md.
...
Move the original README.md to src since it's talking about C++
exclusively and add a more general README.md to document how
to install protoc for all languages.
9 years ago
Jan Tattermusch
187977649b
Merge pull request #1163 from jskeet/more-json
...
Fix mistakes in highest-representable float64 integers
9 years ago
Feng Xiao
f2b6dbb8b3
Merge pull request #1162 from brian-peloton/master
...
Avoid upcasting uninitialized pointers
9 years ago
Jon Skeet
3878d84662
Fix mistakes in highest-representable float64 integers
9 years ago
Brian Silverman
96c2dd5dfc
Avoid upcasting uninitialized pointers
...
Fixes google/protobuf#693
msan flags this as being undefined behavior. I think it's triggering
because the compiler has to insert a branch to avoid changing the
pointer's value if it starts out NULL. I can't figure out if this is
actually undefined behavior or not, but it definitely seems to be a gray
area of the standard which is best avoided.
9 years ago
Feng Xiao
fe066bd514
Merge pull request #789 from motahan/solaris64_fix
...
Fixing compile errors on Solaris in 64-bit mode
9 years ago
Jon Skeet
dd43dcca8c
Ensure that FieldMask, Timestamp and Duration ToString() calls don't throw
...
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.
9 years ago
Jan Tattermusch
8c5260b21b
Merge pull request #1096 from jskeet/custom-to-string
...
Introduce ICustomDiagnosticMessage to allow for custom string formatting
9 years ago
Feng Xiao
6794d17c94
Merge pull request #1155 from jcburke14/jb-intcast
...
Fix compiler warning from repeated_field.h
9 years ago
John Burke
3937dedbff
Fix compiler warning from repeated_field.h
9 years ago
Feng Xiao
91427fe075
Merge pull request #1147 from jcanizales/patch-1
...
Update podspec version to 3.0.0-beta-2
9 years ago
Feng Xiao
bbe6e430f6
Merge pull request #896 from jhump/jh/fix-ioexception-vs-invalidprotobuf-exception
...
throw IOException instead of InvalidProtocolBufferException when appropriate
9 years ago
Jon Skeet
d522479aa0
Merge pull request #1145 from jskeet/conformance
...
JSON Conformance improvements
9 years ago
Joshua Haberman
1e113df20a
Merge pull request #1146 from haberman/pycppfix
...
Fixed Python 3.x C++ build, and updated conformance failure lists.
9 years ago
Jorge Canizales
b40e125f0b
Update podspec version to 3.0.0-beta-2
...
It's already submitted.
9 years ago
Joshua Humphries
248557e73a
move test file (was in wrong place after rebasing on java module refactor)
9 years ago
Joshua Humphries
60654349e7
fully qualify invocations of static methods on GeneratedMessage
9 years ago
Joshua Humphries
f3c75580e4
throw IOException instead of InvalidProtocolBufferException when appropriate
9 years ago
Josh Haberman
06fd6fa850
Fixed Python 3.x C++ build, and updated conformance failure lists.
9 years ago
Feng Xiao
9a5d892e2a
Merge pull request #1143 from xfxyjwf/fix_java
...
Fix tests broken by the Java directory change.
9 years ago
Jon Skeet
030c268489
Fix broken test
9 years ago
Jon Skeet
5ee055d53d
Remove now-fixed conformance errors.
9 years ago
Jon Skeet
b1ea15f7a5
Make sure that
...
"valueField": null
is parsed appropriately, i.e. that it remembers that the field is set.
9 years ago
Jon Skeet
8866d6a80e
Reject JSON containing the same oneof field twice
9 years ago
Jon Skeet
52db5139c4
Change handling of unknown enums: we now write out the value as a number.
9 years ago
Jon Skeet
f437b67f60
Extra strictness for FieldMask conversion
9 years ago
Jon Skeet
022a9b2675
Allow the original field name (rather than camel-cased) when parsing JSON
9 years ago
Jon Skeet
1fc485928f
Fixes to JSON timestamp/duration representations
9 years ago
Jon Skeet
c74676f070
Report serialization errors in conformance tests
9 years ago
Jon Skeet
888e71bdfc
Prohibit null values in repeated and map fields in JSON
9 years ago
Jon Skeet
1a34ac03be
Throw a better exception when invalid base64 is detected in JSON
9 years ago
Jon Skeet
730c38ad8c
Support (and test) numeric enum parsing in JSON
9 years ago
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.
9 years ago
Feng Xiao
ea956761cc
Fix tests broken by the Java directory change.
...
Change-Id: I39c4eadbd28164cfd83aa2d1d8b6dfe8286db803
9 years ago
Feng Xiao
b6ef4015d7
Merge pull request #1121 from nmittler/restructure
...
Restructuring protobuf to multiple modules
9 years ago
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.
9 years ago
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
9 years ago
Jon Skeet
5dba7d7b4c
Introduce ICustomDiagnosticMessage to allow for custom string formatting
...
This fixes issue #933 , effectively.
9 years ago
Jan Tattermusch
73c003c309
Merge pull request #1089 from jskeet/map-null
...
Prohibit null values in maps
9 years ago