aboutsummaryrefslogtreecommitdiff
path: root/java/src/main
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #102 from fizbin/bytestring_serializableFeng Xiao2014-11-274-1/+37
|\ | | | | Make ByteStrings serializable with java serialization.
| * Make ByteStrings serializable with java serialization.Daniel Martin2014-11-254-1/+37
| |
* | Make Java TextFormat.printToUnicodeString() escape newlines.Feng Xiao2014-11-251-1/+2
| | | | | | | | Fix issue #77
* | Fix javadoc warnings.Feng Xiao2014-11-252-14/+14
|/
* Down-integrate from internal code base.Feng Xiao2014-11-202-22/+13
|
* Down-integrate from internal code base (C++ maps support).Feng Xiao2014-11-143-17/+25
|
* 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-1022-228/+2563
|/
* Merge pull request #38 from xfxyjwf/fix17Feng Xiao2014-10-031-3/+22
|\ | | | | 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-011-2/+19
| | | | | | | | enum fields.
* | Fix descriptor validation logic for packed enum fields.Feng Xiao2014-10-011-7/+7
|/
* Replace links to code.google.com/protobuf with ↵Feng Xiao2014-10-0148-48/+48
| | | | developers.google.com/protocol-buffers
* 1, Remove unkown field support in jave TextFormatjieluo@google.com2014-07-252-15/+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-1830-1287/+4500
|
* Fix Java compile issues under JDK 1.5xiaofeng@google.com2012-11-305-17/+15
|
* Down-integrate from internal branchxiaofeng@google.com2012-09-2233-629/+4519
|
* Fix incomplete comments.liujisi@google.com2011-04-281-1/+1
|
* Make protobuf java JDK 1.5 compatible.liujisi@google.com2011-04-285-32/+32
|
* Fix issue 256: compute the correct size for negative enum values, which need ↵jasonh@google.com2011-02-181-1/+1
| | | | to be sign extended.
* Fix issues: 200 202 211 215 237 246.liujisi@google.com2010-12-063-1/+3
|
* Fix issues: 166 167 172 175 181 188 192 194 195.liujisi@google.com2010-12-031-1/+3
|
* Submit recent changes from internal branch. See CHANGES.txt for more details.liujisi@google.com2010-11-0222-641/+3765
|
* Roll back revision 313. A similar but far more exensive change was made in ↵kenton@google.com2010-09-171-17/+0
| | | | our internal branch, which will be integrated soon.
* Optimize Java string serialization. Patch from Evan Jones.kenton@google.com2010-02-011-0/+17
|
* More Java warning tweaks from Evan Jones.kenton@google.com2010-01-282-4/+5
|
* Fix some Java warnings. Patch from Evan Jones.kenton@google.com2010-01-215-14/+9
|
* Tweak doc comments.kenton@google.com2010-01-084-0/+24
|
* Address comments from various code reviews.kenton@google.com2010-01-071-1/+7
|
* In Java's TextFormat, correcty concatenate adjacent string literals, as C++ ↵kenton@google.com2009-12-232-5/+44
| | | | does. Also fix a bug in handling of single-quoted strings.
* Make extension identifiers final. This improves security when untrusted ↵kenton@google.com2009-12-222-59/+69
| | | | code is present in the same class loader. In order to get around initialization ordering issues, I simply made the constructor for extension identifiers take no arguments and deferred initialization to an internalInit() method, which generated code will always call during init.
* getExtension() on an empty repeated field should return an empty list, not a ↵kenton@google.com2009-12-221-1/+4
| | | | singular default value.
* Clarify that pushLimit() does not limit the number of bytes CodedInputStream ↵kenton@google.com2009-12-221-0/+8
| | | | will read from the underlying InputStream.
* Massive roll-up of changes. See CHANGES.txt.kenton@google.com2009-12-1813-106/+212
|
* CodedInputStream.getTotalBytesRead(); patch from Michael Kucharski.kenton@google.com2009-11-121-2/+14
|
* Optimize Java serialization of small messages to streams. Patch from Evan ↵kenton@google.com2009-11-022-2/+21
| | | | Jones.
* Remove more of the stuff that was supposed to be removed in r190.kenton@google.com2009-08-081-19/+2
|
* doc comment tweakskenton@google.com2009-08-081-2/+2
|
* Remove semi-broken Java thread-local builder freelist 'optimization'. Maybe ↵kenton@google.com2009-08-071-74/+1
| | | | bring back later in optional form.
* Gigantic descriptors shouldn't overflow the Java string literal size limit.kenton@google.com2009-08-071-2/+10
|
* Remove @Override annotations that cause compiler errors on Java 1.5.temporal2009-08-011-1/+0
|
* Submit recent changes from internal branch, including "lite mode" forkenton@google.com2009-07-2923-2228/+4028
| | | | | C++ and Java. See CHANGES.txt for more details.
* Down-integrate some code from an internal branch. (More to come.)kenton@google.com2009-07-241-1/+0
|
* Integrate recent changes from Google-internal code tree. See CHANGES.txtkenton@google.com2009-04-2510-10/+370
| | | | | for details.
* Submit files missing from previous submit.kenton@google.com2009-02-101-0/+58
|
* Push out changes from internal codebase.kenton@google.com2009-01-2210-214/+653
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All Languages * Repeated fields of primitive types (types other that string, group, and nested messages) may now use the option [packed = true] to get a more efficient encoding. In the new encoding, the entire list is written as a single byte blob using the "length-delimited" wire type. Within this blob, the individual values are encoded the same way they would be normally except without a tag before each value (thus, they are tightly "packed"). C++ * UnknownFieldSet now supports STL-like iteration. * Message interface has method ParseFromBoundedZeroCopyStream() which parses a limited number of bytes from an input stream rather than parsing until EOF. Java * Fixed bug where Message.mergeFrom(Message) failed to merge extensions. * Message interface has new method toBuilder() which is equivalent to newBuilderForType().mergeFrom(this). * All enums now implement the ProtocolMessageEnum interface. * Setting a field to null now throws NullPointerException. * Fixed tendency for TextFormat's parsing to overflow the stack when parsing large string values. The underlying problem is with Java's regex implementation (which unfortunately uses recursive backtracking rather than building an NFA). Worked around by making use of possesive quantifiers. Python * Updated RPC interfaces to allow for blocking operation. A client may now pass None for a callback when making an RPC, in which case the call will block until the response is received, and the response object will be returned directly to the caller. This interface change cannot be used in practice until RPC implementations are updated to implement it.
* Integrate changes from internal code.kenton@google.com2008-11-215-7/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | protoc * Enum values may now have custom options, using syntax similar to field options. * Fixed bug where .proto files which use custom options but don't actually define them (i.e. they import another .proto file defining the options) had to explicitly import descriptor.proto. * Adjacent string literals in .proto files will now be concatenated, like in C. C++ * Generated message classes now have a Swap() method which efficiently swaps the contents of two objects. * All message classes now have a SpaceUsed() method which returns an estimate of the number of bytes of allocated memory currently owned by the object. This is particularly useful when you are reusing a single message object to improve performance but want to make sure it doesn't bloat up too large. * New method Message::SerializeAsString() returns a string containing the serialized data. May be more convenient than calling SerializeToString(string*). * In debug mode, log error messages when string-type fields are found to contain bytes that are not valid UTF-8. * Fixed bug where a message with multiple extension ranges couldn't parse extensions. * Fixed bug where MergeFrom(const Message&) didn't do anything if invoked on a message that contained no fields (but possibly contained extensions). * Fixed ShortDebugString() to not be O(n^2). Durr. * Fixed crash in TextFormat parsing if the first token in the input caused a tokenization error. Java * New overload of mergeFrom() which parses a slice of a byte array instead of the whole thing. * New method ByteString.asReadOnlyByteBuffer() does what it sounds like. * Improved performance of isInitialized() when optimizing for code size. Python * Corrected ListFields() signature in Message base class to match what subclasses actually implement. * Some minor refactoring.