aboutsummaryrefslogtreecommitdiff
path: root/java/src
Commit message (Collapse)AuthorAgeFilesLines
* Remove accidentally restored deleted files.Jisi Liu2016-05-066-1492/+0
|
* Down integrate from Google internal.Jisi Liu2016-04-286-0/+1492
|
* Restructuring protobuf to multiple modulesnmittler2016-01-13139-55685/+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 Xiao2015-12-1136-661/+1734
|
* Fix typo in LazyField javadocDave Hughes2015-11-241-2/+2
| | | "equals".equals("euqals") == false
* Down-integrate from google internal.Jisi Liu2015-10-058-359/+524
|
* Fix javadoc errors.Feng Xiao2015-08-274-24/+25
|
* Delete incorrectly placed test file.Feng Xiao2015-08-251-132/+0
|
* Cherry-pick Java utf8 change.Feng Xiao2015-08-242-1/+144
|
* Down-integrate from internal code base.Feng Xiao2015-08-232-0/+134
|
* Down-integrate from google3.Feng Xiao2015-08-2232-247/+882
|
* Merge pull request #413 from TeBoring/masterPaul Yang2015-05-2132-202/+7126
|\ | | | | down-integrate internal changes
| * down-integrate internal changesBo Yang2015-05-2132-202/+7126
| |
* | Include well-known types in Java runtime.Feng Xiao2015-05-211-0/+65
|/ | | | Change-Id: I816fe2fac7fccbcd96dd8510c7c9b5e7996aeadc
* Clean up importsTamir Duberstein2015-04-028-27/+16
|
* Move `UTF_8` to `Internal`Tamir Duberstein2015-04-0214-34/+33
|
* Skip 3-byte test in CITamir Duberstein2015-04-021-2/+5
|
* DRY: Use `Charset` statics to eliminate exceptionsTamir Duberstein2015-04-0216-76/+51
|
* perf: String#getBytes(Charset) vs getBytes(String)Viktor Szathmáry2015-04-027-28/+117
|
* WhitespaceTamir Duberstein2015-04-0212-86/+86
|
* Down integrate from Google internal branch for C++ and Java.Jisi Liu2015-02-2827-210/+1011
| | | | | | | | - Maps for C++ lite - C++ Arena optimizations. - Java Lite runtime code size optimization. Change-Id: I7537a4357c1cb385d23f9e8aa7ffdfeefe079f13
* Merge pull request #216 from cnauroth/Parser-JavaDocJisi Liu2015-02-261-2/+2
|\ | | | | Correct JavaDoc return value documentation for Parser#parseDelimitedFrom...
| * Correct JavaDoc return value documentation for Parser#parseDelimitedFrom.cnauroth2015-02-231-2/+2
| |
* | Propogate onChange() event when getFooBuilder() is on an oneof messageJisi Liu2015-02-231-1/+13
| | | | | | | | | | | | field. Change-Id: Idb5b53da5accd24038a895aba49b684eeee95814
* | Fix Java maps reflection to call onChange to populate changes to parentJisi Liu2015-02-232-89/+132
|/ | | | | | builders. Change-Id: Ibf6ae3c0fe6bc31f74b8018c81a5af461b1c24ea
* Down-integrate from internal code base.Feng Xiao2014-12-092-1/+8
|
* Remove usage of features not supported in Java 1.6.Feng Xiao2014-12-031-3/+2
|
* Merge pull request #102 from fizbin/bytestring_serializableFeng Xiao2014-11-277-1/+90
|\ | | | | Make ByteStrings serializable with java serialization.
| * Add tests for other ByteString subclassesDaniel Martin2014-11-272-0/+37
| |
| * Make ByteStrings serializable with java serialization.Daniel Martin2014-11-255-1/+53
| |
* | Make Java TextFormat.printToUnicodeString() escape newlines.Feng Xiao2014-11-252-6/+15
| | | | | | | | Fix issue #77
* | Fix javadoc warnings.Feng Xiao2014-11-252-14/+14
|/
* Down-integrate from internal code base.Feng Xiao2014-11-203-22/+26
|
* Down-integrate from internal code base (C++ maps support).Feng Xiao2014-11-146-17/+49
|
* Merge branch 'typofixes-vlajos-20141108' of ↵Feng Xiao2014-11-114-7/+7
|\ | | | | | | | | | | | | https://github.com/vlajos/protobuf into typo Conflicts: src/google/protobuf/compiler/java/java_file.cc
| * typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-084-7/+7
| |
* | Down-integrate from internal code base.Feng Xiao2014-11-1055-280/+5347
|/
* Merge pull request #38 from xfxyjwf/fix17Feng Xiao2014-10-032-3/+38
|\ | | | | Fix a bug that causes DynamicMessage.setField() to not work for repeated enum fields.
| * Update verification methods' names.Feng Xiao2014-10-021-6/+8
| |
| * Fix a bug that causes DynamicMessage.setField() to not work for repeatedFeng Xiao2014-10-012-2/+35
| | | | | | | | enum fields.
* | Fix descriptor validation logic for packed enum fields.Feng Xiao2014-10-012-7/+34
|/
* Replace links to code.google.com/protobuf with ↵Feng Xiao2014-10-01100-100/+100
| | | | developers.google.com/protocol-buffers
* 1, Remove unkown field support in jave TextFormatjieluo@google.com2014-07-253-118/+19
| | | | 2, Verifies the EnumValueDscriptor for DynamicMessage.Builder#setField
* add LazyFieldLite.javajieluo@google.com2014-07-191-0/+176
|
* add printUnicode methods in TextFormatjieluo@google.com2014-07-181-0/+20
|
* down integrate to svnjieluo@google.com2014-07-1863-1332/+7578
|
* Fix Java compile issues under JDK 1.5xiaofeng@google.com2012-11-305-17/+15
|
* Down-integrate from internal branchxiaofeng@google.com2012-09-2254-697/+7846
|
* Close resources properly for java tests and examples.liujisi@google.com2011-06-072-6/+15
|
* Allow String to be used as message names.liujisi@google.com2011-05-041-0/+20
|