Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Undo the Java module change for integration. | Jisi Liu | 2016-01-28 | 74 | -0/+26665 |
| | | | | | | | | | 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. | ||||
* | Restructuring protobuf to multiple modules | nmittler | 2016-01-13 | 73 | -26454/+0 |
| | | | | | | | | | 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. | ||||
* | Down-integrate from internal code base. | Feng Xiao | 2015-12-11 | 15 | -34/+774 |
| | |||||
* | Down-integrate from google internal. | Jisi Liu | 2015-10-05 | 4 | -70/+140 |
| | |||||
* | Down-integrate from internal code base. | Feng Xiao | 2015-08-23 | 2 | -0/+134 |
| | |||||
* | Down-integrate from google3. | Feng Xiao | 2015-08-22 | 17 | -50/+291 |
| | |||||
* | Merge pull request #413 from TeBoring/master | Paul Yang | 2015-05-21 | 16 | -24/+4699 |
|\ | | | | | down-integrate internal changes | ||||
| * | down-integrate internal changes | Bo Yang | 2015-05-21 | 16 | -24/+4699 |
| | | |||||
* | | Include well-known types in Java runtime. | Feng Xiao | 2015-05-21 | 1 | -0/+65 |
|/ | | | | Change-Id: I816fe2fac7fccbcd96dd8510c7c9b5e7996aeadc | ||||
* | Clean up imports | Tamir Duberstein | 2015-04-02 | 3 | -20/+15 |
| | |||||
* | Move `UTF_8` to `Internal` | Tamir Duberstein | 2015-04-02 | 9 | -20/+20 |
| | |||||
* | Skip 3-byte test in CI | Tamir Duberstein | 2015-04-02 | 1 | -2/+5 |
| | |||||
* | DRY: Use `Charset` statics to eliminate exceptions | Tamir Duberstein | 2015-04-02 | 10 | -23/+20 |
| | |||||
* | perf: String#getBytes(Charset) vs getBytes(String) | Viktor Szathmáry | 2015-04-02 | 4 | -0/+76 |
| | |||||
* | Whitespace | Tamir Duberstein | 2015-04-02 | 7 | -22/+22 |
| | |||||
* | Down integrate from Google internal branch for C++ and Java. | Jisi Liu | 2015-02-28 | 12 | -5/+247 |
| | | | | | | | | - Maps for C++ lite - C++ Arena optimizations. - Java Lite runtime code size optimization. Change-Id: I7537a4357c1cb385d23f9e8aa7ffdfeefe079f13 | ||||
* | Propogate onChange() event when getFooBuilder() is on an oneof message | Jisi Liu | 2015-02-23 | 1 | -1/+13 |
| | | | | | | field. Change-Id: Idb5b53da5accd24038a895aba49b684eeee95814 | ||||
* | Fix Java maps reflection to call onChange to populate changes to parent | Jisi Liu | 2015-02-23 | 1 | -66/+105 |
| | | | | | | builders. Change-Id: Ibf6ae3c0fe6bc31f74b8018c81a5af461b1c24ea | ||||
* | Down-integrate from internal code base. | Feng Xiao | 2014-12-09 | 1 | -0/+7 |
| | |||||
* | Remove usage of features not supported in Java 1.6. | Feng Xiao | 2014-12-03 | 1 | -3/+2 |
| | |||||
* | Merge pull request #102 from fizbin/bytestring_serializable | Feng Xiao | 2014-11-27 | 3 | -0/+53 |
|\ | | | | | Make ByteStrings serializable with java serialization. | ||||
| * | Add tests for other ByteString subclasses | Daniel Martin | 2014-11-27 | 2 | -0/+37 |
| | | |||||
| * | Make ByteStrings serializable with java serialization. | Daniel Martin | 2014-11-25 | 1 | -0/+16 |
| | | |||||
* | | Make Java TextFormat.printToUnicodeString() escape newlines. | Feng Xiao | 2014-11-25 | 1 | -5/+13 |
|/ | | | | Fix issue #77 | ||||
* | Down-integrate from internal code base. | Feng Xiao | 2014-11-20 | 1 | -0/+13 |
| | |||||
* | Down-integrate from internal code base (C++ maps support). | Feng Xiao | 2014-11-14 | 3 | -0/+24 |
| | |||||
* | Down-integrate from internal code base. | Feng Xiao | 2014-11-10 | 33 | -52/+2784 |
| | |||||
* | Merge pull request #38 from xfxyjwf/fix17 | Feng Xiao | 2014-10-03 | 1 | -0/+16 |
|\ | | | | | Fix a bug that causes DynamicMessage.setField() to not work for repeated enum fields. | ||||
| * | Fix a bug that causes DynamicMessage.setField() to not work for repeated | Feng Xiao | 2014-10-01 | 1 | -0/+16 |
| | | | | | | | | enum fields. | ||||
* | | Fix descriptor validation logic for packed enum fields. | Feng Xiao | 2014-10-01 | 1 | -0/+27 |
|/ | |||||
* | Replace links to code.google.com/protobuf with ↵ | Feng Xiao | 2014-10-01 | 52 | -52/+52 |
| | | | | developers.google.com/protocol-buffers | ||||
* | 1, Remove unkown field support in jave TextFormat | jieluo@google.com | 2014-07-25 | 1 | -103/+0 |
| | | | | 2, Verifies the EnumValueDscriptor for DynamicMessage.Builder#setField | ||||
* | down integrate to svn | jieluo@google.com | 2014-07-18 | 33 | -45/+3078 |
| | |||||
* | Down-integrate from internal branch | xiaofeng@google.com | 2012-09-22 | 21 | -68/+3327 |
| | |||||
* | Close resources properly for java tests and examples. | liujisi@google.com | 2011-06-07 | 2 | -6/+15 |
| | |||||
* | Allow String to be used as message names. | liujisi@google.com | 2011-05-04 | 1 | -0/+20 |
| | |||||
* | Make protobuf java JDK 1.5 compatible. | liujisi@google.com | 2011-04-28 | 3 | -3/+45 |
| | |||||
* | Use fully qualified java.lang.Object in protoc java code. | liujisi@google.com | 2011-04-08 | 1 | -1/+5 |
| | |||||
* | Fix issue 256: compute the correct size for negative enum values, which need ↵ | jasonh@google.com | 2011-02-18 | 1 | -0/+15 |
| | | | | to be sign extended. | ||||
* | Escape C++ Trigraphs. | liujisi@google.com | 2010-12-21 | 1 | -0/+1 |
| | |||||
* | Submit recent changes from internal branch. See CHANGES.txt for more details. | liujisi@google.com | 2010-11-02 | 25 | -86/+2375 |
| | |||||
* | Roll back revision 313. A similar but far more exensive change was made in ↵ | kenton@google.com | 2010-09-17 | 1 | -24/+0 |
| | | | | our internal branch, which will be integrated soon. | ||||
* | Optimize Java string serialization. Patch from Evan Jones. | kenton@google.com | 2010-02-01 | 1 | -0/+24 |
| | |||||
* | More Java warning tweaks from Evan Jones. | kenton@google.com | 2010-01-28 | 1 | -0/+1 |
| | |||||
* | Fix some Java warnings. Patch from Evan Jones. | kenton@google.com | 2010-01-21 | 4 | -10/+6 |
| | |||||
* | In Java's TextFormat, correcty concatenate adjacent string literals, as C++ ↵ | kenton@google.com | 2009-12-23 | 1 | -2/+8 |
| | | | | does. Also fix a bug in handling of single-quoted strings. | ||||
* | getExtension() on an empty repeated field should return an empty list, not a ↵ | kenton@google.com | 2009-12-22 | 2 | -1/+31 |
| | | | | singular default value. | ||||
* | Massive roll-up of changes. See CHANGES.txt. | kenton@google.com | 2009-12-18 | 8 | -5/+297 |
| | |||||
* | Fix Issue 136: the memoized serialized size for packed fields may not | jasonh+personal@google.com | 2009-12-01 | 1 | -0/+22 |
| | | | | | | | | | | | | | be properly set. writeTo() may be invoked without a call to getSerializedSize(), so the generated serialization methods would write a length of 0 for non-empty packed fields. Just call getSerializedSize() at the beginning of writeTo(): although this means that we may compute the byte size needlessly when there are no packed fields, in practice, getSerializedSize() will already have been called - all of the writeTo() wrappers in AbstractMessageLite invoke it. Tested: new unittest case in WireFormatTest.java now passes | ||||
* | CodedInputStream.getTotalBytesRead(); patch from Michael Kucharski. | kenton@google.com | 2009-11-12 | 1 | -0/+7 |
| |