AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
3,281 Commits 35 Branches 138 Tags 124 MiB
261fde1707
Commit Graph

3281 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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.
 2016-01-29 13:51:05 -08:00
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.
 2016-01-28 13:59:14 -08:00
Swen Kooij
37d6cf9cfe Fixed unused parameters and extra ';' 2016-01-28 11:40:07 +02:00
kkm
714b6b761b Fix Intel compiler warnings in include files on Windows 2016-01-27 14:23:36 -08:00
Jan Tattermusch
b13874d59e Merge pull request #1158 from jskeet/nonnormalized-tostring 
Ensure that FieldMask, Timestamp and Duration ToString() calls don't throw
 2016-01-26 08:43:45 -08:00
Parth Kolekar
21e1f1d2e9 Updated python examples to use with. 2016-01-26 04:13:31 +05:30
Sylvain Baubeau
e5ec85e7a5 Fix typos in README.md 2016-01-25 21:41:31 +01:00
Feng Xiao
60f7fc51fb Merge pull request #1169 from LuminateWireless/bazel-build 
Fix bazel BUILD for Java.
 2016-01-22 11:29:34 -08:00
Jisi Liu
c65be83200 Merge pull request #1167 from xfxyjwf/refactor_doc 
Refactor README.md.
 2016-01-22 09:52:44 -08:00
Ming Zhao
4fe03816b1 Fix bazel BUILD for Java. 2016-01-21 23:08:33 -08:00
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.
 2016-01-21 17:30:45 -08:00
Jan Tattermusch
187977649b Merge pull request #1163 from jskeet/more-json 
Fix mistakes in highest-representable float64 integers
 2016-01-21 15:49:08 -08:00
Feng Xiao
f2b6dbb8b3 Merge pull request #1162 from brian-peloton/master 
Avoid upcasting uninitialized pointers
 2016-01-21 11:19:40 -08:00
Jon Skeet
3878d84662 Fix mistakes in highest-representable float64 integers 2016-01-21 10:49:57 +00:00
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.
 2016-01-20 23:05:25 -05:00
Feng Xiao
fe066bd514 Merge pull request #789 from motahan/solaris64_fix 
Fixing compile errors on Solaris in 64-bit mode
 2016-01-20 16:57:01 -08:00
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.
 2016-01-20 18:43:00 +00:00
Jan Tattermusch
8c5260b21b Merge pull request #1096 from jskeet/custom-to-string 
Introduce ICustomDiagnosticMessage to allow for custom string formatting
 2016-01-19 19:38:16 -08:00
Feng Xiao
6794d17c94 Merge pull request #1155 from jcburke14/jb-intcast 
Fix compiler warning from repeated_field.h
 2016-01-19 16:57:10 -08:00
John Burke
3937dedbff Fix compiler warning from repeated_field.h 2016-01-19 15:13:25 -08:00
Feng Xiao
91427fe075 Merge pull request #1147 from jcanizales/patch-1 
Update podspec version to 3.0.0-beta-2
 2016-01-19 11:28:15 -08:00
Feng Xiao
bbe6e430f6 Merge pull request #896 from jhump/jh/fix-ioexception-vs-invalidprotobuf-exception 
throw IOException instead of InvalidProtocolBufferException when appropriate
 2016-01-16 20:54:31 -08:00
Jon Skeet
d522479aa0 Merge pull request #1145 from jskeet/conformance 
JSON Conformance improvements
 2016-01-16 18:28:13 +00:00
Joshua Haberman
1e113df20a Merge pull request #1146 from haberman/pycppfix 
Fixed Python 3.x C++ build, and updated conformance failure lists.
 2016-01-15 23:52:33 -08:00
Jorge Canizales
b40e125f0b Update podspec version to 3.0.0-beta-2 
It's already submitted.
 2016-01-15 20:21:46 -08:00
Joshua Humphries
248557e73a move test file (was in wrong place after rebasing on java module refactor) 2016-01-15 21:51:20 -05:00
Joshua Humphries
60654349e7 fully qualify invocations of static methods on GeneratedMessage 2016-01-15 21:51:19 -05:00
Joshua Humphries
f3c75580e4 throw IOException instead of InvalidProtocolBufferException when appropriate 2016-01-15 21:51:19 -05:00
Josh Haberman
06fd6fa850 Fixed Python 3.x C++ build, and updated conformance failure lists. 2016-01-15 17:26:44 -08:00
Damien Martin-Guillerez
76547e5190 Make protobuf Skylark extension appends the workspace root 
This change make protobuf skylark extension works when using
remote repository.

Note that this make the Skylark extension unusable prior
to Bazel 0.1.4 because the workspace_root is not available
on prior version.

Tested with Bazel 0.1.4rc2.

Fixes https://github.com/bazelbuild/bazel/issues/784.
 2016-01-15 23:12:09 +01:00
Feng Xiao
9a5d892e2a Merge pull request #1143 from xfxyjwf/fix_java 
Fix tests broken by the Java directory change.
 2016-01-15 10:43:51 -08:00
Jon Skeet
030c268489 Fix broken test 2016-01-15 17:34:10 +00:00
Jon Skeet
5ee055d53d Remove now-fixed conformance errors. 2016-01-15 14:43:17 +00:00
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