← all fixtures

java-protobuf-add-two-annotations

Java View before/after files on GitHub Upstream commit protocolbuffers-protobuf.git@3657ce3 java/core/src/main/java/com/google/protobuf/Internal.java
Code view:

A painting is a person's account of this edit as text, recorded independently of the node mapping - a rendering often has several equally defensible answers where the mapping has one. Deletions and insertions carry no position on the opposite side in a painting, so that panel draws no caret for them.

Before

…lines 1–32 unchanged (32 lines)
33 private Internal() {}
34
35 static final Charset UTF_8 = Charset.forName("UTF-8");
36 static final Charset ISO_8859_1 = Charset.forName("ISO-8859-1");
37
38 /** Throws an appropriate {@link NullPointerException} if the given objects is {@code null}. */
39 static <T> T checkNotNull(T obj) {
40 if (obj == null) {
41 throw new NullPointerException();
42 }
43 return obj;
44 }
45
46 /** Throws an appropriate {@link NullPointerException} if the given objects is {@code null}. */
47 static <T> T checkNotNull(T obj, String message) {
48 if (obj == null) {
49 throw new NullPointerException(message);
50 }
51 return obj;
52 }
53
…lines 54–704 unchanged (651 lines)

After

…lines 1–32 unchanged (32 lines)
33 private Internal() {}
34
35 static final Charset UTF_8 = Charset.forName("UTF-8");
36 static final Charset ISO_8859_1 = Charset.forName("ISO-8859-1");
37
38 /** Throws an appropriate {@link NullPointerException} if the given objects is {@code null}. */
39 @CanIgnoreReturnValue
40 static <T> T checkNotNull(T obj) {
41 if (obj == null) {
42 throw new NullPointerException();
43 }
44 return obj;
45 }
46
47 /** Throws an appropriate {@link NullPointerException} if the given objects is {@code null}. */
48 @CanIgnoreReturnValue
49 static <T> T checkNotNull(T obj, String message) {
50 if (obj == null) {
51 throw new NullPointerException(message);
52 }
53 return obj;
54 }
…lines 55–706 unchanged (652 lines)

Before

program
line_comment "// Protocol Buffers - Google's data interchange format"
line_comment "// Copyright 2008 Google Inc. All rights reserved."
line_comment "//"
line_comment "// Use of this source code is governed by a BSD-style"
line_comment "// license that can be found in the LICENSE file or at"
line_comment "// https://developers.google.com/open-source/licenses/bsd"
package_declaration
package "package"
scoped_identifier
scoped_identifier
identifier "com"
. "."
identifier "google"
. "."
identifier "protobuf"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "lang"
. "."
identifier "reflect"
. "."
identifier "Method"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "nio"
. "."
identifier "Buffer"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "nio"
. "."
identifier "ByteBuffer"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "nio"
. "."
identifier "charset"
. "."
identifier "Charset"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "AbstractList"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "AbstractMap"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "AbstractSet"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "Arrays"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "Iterator"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "List"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "Map"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "RandomAccess"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "Set"
; ";"
block_comment "/**\n * The classes contained within are used internally by t"...
class_declaration
modifiers
public "public"
final "final"
class "class"
identifier "Internal"
class_body
{ "{"
constructor_declaration
modifiers
private "private"
identifier "Internal"
formal_parameters
( "("
) ")"
constructor_body
{ "{"
} "}"
field_declaration
modifiers
static "static"
final "final"
type_identifier "Charset"
variable_declarator
identifier "UTF_8"
= "="
method_invocation
identifier "Charset"
. "."
identifier "forName"
argument_list
( "("
string_literal
" "\""
string_fragment "UTF-8"
" "\""
) ")"
; ";"
field_declaration
modifiers
static "static"
final "final"
type_identifier "Charset"
variable_declarator
identifier "ISO_8859_1"
= "="
method_invocation
identifier "Charset"
. "."
identifier "forName"
argument_list
( "("
string_literal
" "\""
string_fragment "ISO-8859-1"
" "\""
) ")"
; ";"
block_comment "/** Throws an appropriate {@link NullPointerException} if th"...
method_declaration
modifiers
static "static"
type_parameters
< "<"
type_parameter
type_identifier "T"
> ">"
type_identifier "T"
identifier "checkNotNull"
formal_parameters
( "("
formal_parameter
type_identifier "T"
identifier "obj"
) ")"
block (+28 nodes collapsed)
block_comment "/** Throws an appropriate {@link NullPointerException} if th"...
method_declaration
modifiers
static "static"
type_parameters
< "<"
type_parameter
type_identifier "T"
> ">"
type_identifier "T"
identifier "checkNotNull"
formal_parameters
( "("
formal_parameter
type_identifier "T"
identifier "obj"
, ","
formal_parameter
type_identifier "String"
identifier "message"
) ")"
block (+29 nodes collapsed)
block_comment "/**\n * Helper called by generated code to construct defaul"...
method_declaration (+34 nodes collapsed)
block_comment "/**\n * Helper called by generated code to construct defaul"...
method_declaration (+33 nodes collapsed)
block_comment "/**\n * Helper called by generated code to construct defaul"...
method_declaration (+31 nodes collapsed)
block_comment "/**\n * Helper called by generated code to construct defaul"...
method_declaration (+31 nodes collapsed)
block_comment "/**\n * Create a new ByteBuffer and copy all the content of"...
method_declaration (+100 nodes collapsed)
block_comment "/**\n * Helper called by generated code to determine if a b"...
method_declaration (+25 nodes collapsed)
block_comment "/** Like {@link #isValidUtf8(ByteString)} but for byte array"...
method_declaration (+31 nodes collapsed)
block_comment "/** Helper method to get the UTF-8 bytes of a string. */"
method_declaration (+31 nodes collapsed)
block_comment "/** Helper method to convert a byte array to a string using "...
method_declaration (+32 nodes collapsed)
block_comment "/**\n * Interface for an enum value or value descriptor, to"...
interface_declaration
modifiers
public "public"
interface "interface"
identifier "EnumLite"
interface_body
{ "{"
method_declaration
integral_type
int "int"
identifier "getNumber"
formal_parameters
( "("
) ")"
; ";"
} "}"
block_comment "/**\n * Interface for an object which maps integers to {@li"...
interface_declaration (+27 nodes collapsed)
block_comment "/** Interface for an object which verifies integers are in r"...
interface_declaration
modifiers
public "public"
interface "interface"
identifier "EnumVerifier"
interface_body
{ "{"
method_declaration
boolean_type "boolean"
identifier "isInRange"
formal_parameters
( "("
formal_parameter
integral_type
int "int"
identifier "number"
) ")"
; ";"
} "}"
block_comment "/**\n * Helper method for implementing {@link Message#hashC"...
method_declaration (+38 nodes collapsed)
block_comment "/**\n * Helper method for implementing {@link Message#hashC"...
method_declaration (+25 nodes collapsed)
block_comment "/**\n * Helper method for implementing {@link Message#hashC"...
method_declaration (+26 nodes collapsed)
block_comment "/** Helper method for implementing {@link Message#hashCode()"...
method_declaration (+64 nodes collapsed)
block_comment "/** Helper method for implementing {@link Message#equals(Obj"...
method_declaration (+138 nodes collapsed)
block_comment "/** Helper method for implementing {@link Message#hashCode()"...
method_declaration (+71 nodes collapsed)
block_comment "/** Helper method for implementing {@link Message#hashCode()"...
method_declaration (+43 nodes collapsed)
block_comment "/** Helper method for implementing {@link LiteralByteString#"...
method_declaration (+67 nodes collapsed)
block_comment "/** Helper method for continuously hashing bytes. */"
method_declaration (+81 nodes collapsed)
block_comment "/** Helper method for implementing {@link Message#equals(Obj"...
method_declaration (+106 nodes collapsed)
block_comment "/** Helper method for implementing {@link Message#equals(Obj"...
method_declaration (+126 nodes collapsed)
block_comment "/** Helper method for implementing {@link Message#hashCode()"...
method_declaration (+61 nodes collapsed)
field_declaration
modifiers
private "private"
static "static"
final "final"
integral_type
int "int"
variable_declarator
identifier "DEFAULT_BUFFER_SIZE"
= "="
decimal_integer_literal "4096"
; ";"
block_comment "/** Helper method for implementing {@link Message#hashCode()"...
method_declaration (+274 nodes collapsed)
method_declaration (+104 nodes collapsed)
block_comment "/** An empty byte array constant used in generated code. */"
field_declaration (+23 nodes collapsed)
block_comment "/** An empty byte array constant used in generated code. */"
field_declaration
modifiers
public "public"
static "static"
final "final"
type_identifier "ByteBuffer"
variable_declarator
identifier "EMPTY_BYTE_BUFFER"
= "="
method_invocation
identifier "ByteBuffer"
. "."
identifier "wrap"
argument_list
( "("
identifier "EMPTY_BYTE_ARRAY"
) ")"
; ";"
block_comment "/** An empty coded input stream constant used in generated c"...
field_declaration
modifiers
public "public"
static "static"
final "final"
type_identifier "CodedInputStream"
variable_declarator
identifier "EMPTY_CODED_INPUT_STREAM"
= "="
method_invocation
identifier "CodedInputStream"
. "."
identifier "newInstance"
argument_list
( "("
identifier "EMPTY_BYTE_ARRAY"
) ")"
; ";"
block_comment "/** Helper method to merge two MessageLite instances. */"
method_declaration (+52 nodes collapsed)
block_comment "/**\n * Provides an immutable view of {@code List<T>} aroun"...
class_declaration (+169 nodes collapsed)
block_comment "/**\n * Provides an immutable view of {@code List<T>} aroun"...
class_declaration (+188 nodes collapsed)
block_comment "/** Wrap around a {@code Map<K, RealValue>} and provide a {@"...
class_declaration (+1148 nodes collapsed)
block_comment "/**\n * Extends {@link List} to add the capability to make "...
interface_declaration (+58 nodes collapsed)
block_comment "/**\n * A {@link java.util.List} implementation that avoids"...
interface_declaration (+81 nodes collapsed)
block_comment "/**\n * A {@link java.util.List} implementation that avoids"...
interface_declaration (+77 nodes collapsed)
block_comment "/**\n * A {@link java.util.List} implementation that avoids"...
interface_declaration (+81 nodes collapsed)
block_comment "/**\n * A {@link java.util.List} implementation that avoids"...
interface_declaration (+81 nodes collapsed)
block_comment "/**\n * A {@link java.util.List} implementation that avoids"...
interface_declaration (+81 nodes collapsed)
} "}"

After

program
line_comment "// Protocol Buffers - Google's data interchange format"
line_comment "// Copyright 2008 Google Inc. All rights reserved."
line_comment "//"
line_comment "// Use of this source code is governed by a BSD-style"
line_comment "// license that can be found in the LICENSE file or at"
line_comment "// https://developers.google.com/open-source/licenses/bsd"
package_declaration
package "package"
scoped_identifier
scoped_identifier
identifier "com"
. "."
identifier "google"
. "."
identifier "protobuf"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "lang"
. "."
identifier "reflect"
. "."
identifier "Method"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "nio"
. "."
identifier "Buffer"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "nio"
. "."
identifier "ByteBuffer"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "nio"
. "."
identifier "charset"
. "."
identifier "Charset"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "AbstractList"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "AbstractMap"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "AbstractSet"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "Arrays"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "Iterator"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "List"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "Map"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "RandomAccess"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "Set"
; ";"
block_comment "/**\n * The classes contained within are used internally by t"...
class_declaration
modifiers
public "public"
final "final"
class "class"
identifier "Internal"
class_body
{ "{"
constructor_declaration
modifiers
private "private"
identifier "Internal"
formal_parameters
( "("
) ")"
constructor_body
{ "{"
} "}"
field_declaration
modifiers
static "static"
final "final"
type_identifier "Charset"
variable_declarator
identifier "UTF_8"
= "="
method_invocation
identifier "Charset"
. "."
identifier "forName"
argument_list
( "("
string_literal
" "\""
string_fragment "UTF-8"
" "\""
) ")"
; ";"
field_declaration
modifiers
static "static"
final "final"
type_identifier "Charset"
variable_declarator
identifier "ISO_8859_1"
= "="
method_invocation
identifier "Charset"
. "."
identifier "forName"
argument_list
( "("
string_literal
" "\""
string_fragment "ISO-8859-1"
" "\""
) ")"
; ";"
block_comment "/** Throws an appropriate {@link NullPointerException} if th"...
method_declaration
modifiers
marker_annotation
@ "@"
identifier "CanIgnoreReturnValue"
static "static"
type_parameters
< "<"
type_parameter
type_identifier "T"
> ">"
type_identifier "T"
identifier "checkNotNull"
formal_parameters
( "("
formal_parameter
type_identifier "T"
identifier "obj"
) ")"
block (+28 nodes collapsed)
block_comment "/** Throws an appropriate {@link NullPointerException} if th"...
method_declaration
modifiers
marker_annotation
@ "@"
identifier "CanIgnoreReturnValue"
static "static"
type_parameters
< "<"
type_parameter
type_identifier "T"
> ">"
type_identifier "T"
identifier "checkNotNull"
formal_parameters
( "("
formal_parameter
type_identifier "T"
identifier "obj"
, ","
formal_parameter
type_identifier "String"
identifier "message"
) ")"
block (+29 nodes collapsed)
block_comment "/**\n * Helper called by generated code to construct defaul"...
method_declaration (+34 nodes collapsed)
block_comment "/**\n * Helper called by generated code to construct defaul"...
method_declaration (+33 nodes collapsed)
block_comment "/**\n * Helper called by generated code to construct defaul"...
method_declaration (+31 nodes collapsed)
block_comment "/**\n * Helper called by generated code to construct defaul"...
method_declaration (+31 nodes collapsed)
block_comment "/**\n * Create a new ByteBuffer and copy all the content of"...
method_declaration (+100 nodes collapsed)
block_comment "/**\n * Helper called by generated code to determine if a b"...
method_declaration (+25 nodes collapsed)
block_comment "/** Like {@link #isValidUtf8(ByteString)} but for byte array"...
method_declaration (+31 nodes collapsed)
block_comment "/** Helper method to get the UTF-8 bytes of a string. */"
method_declaration (+31 nodes collapsed)
block_comment "/** Helper method to convert a byte array to a string using "...
method_declaration (+32 nodes collapsed)
block_comment "/**\n * Interface for an enum value or value descriptor, to"...
interface_declaration
modifiers
public "public"
interface "interface"
identifier "EnumLite"
interface_body
{ "{"
method_declaration
integral_type
int "int"
identifier "getNumber"
formal_parameters
( "("
) ")"
; ";"
} "}"
block_comment "/**\n * Interface for an object which maps integers to {@li"...
interface_declaration (+27 nodes collapsed)
block_comment "/** Interface for an object which verifies integers are in r"...
interface_declaration
modifiers
public "public"
interface "interface"
identifier "EnumVerifier"
interface_body
{ "{"
method_declaration
boolean_type "boolean"
identifier "isInRange"
formal_parameters
( "("
formal_parameter
integral_type
int "int"
identifier "number"
) ")"
; ";"
} "}"
block_comment "/**\n * Helper method for implementing {@link Message#hashC"...
method_declaration (+38 nodes collapsed)
block_comment "/**\n * Helper method for implementing {@link Message#hashC"...
method_declaration (+25 nodes collapsed)
block_comment "/**\n * Helper method for implementing {@link Message#hashC"...
method_declaration (+26 nodes collapsed)
block_comment "/** Helper method for implementing {@link Message#hashCode()"...
method_declaration (+64 nodes collapsed)
block_comment "/** Helper method for implementing {@link Message#equals(Obj"...
method_declaration (+138 nodes collapsed)
block_comment "/** Helper method for implementing {@link Message#hashCode()"...
method_declaration (+71 nodes collapsed)
block_comment "/** Helper method for implementing {@link Message#hashCode()"...
method_declaration (+43 nodes collapsed)
block_comment "/** Helper method for implementing {@link LiteralByteString#"...
method_declaration (+67 nodes collapsed)
block_comment "/** Helper method for continuously hashing bytes. */"
method_declaration (+81 nodes collapsed)
block_comment "/** Helper method for implementing {@link Message#equals(Obj"...
method_declaration (+106 nodes collapsed)
block_comment "/** Helper method for implementing {@link Message#equals(Obj"...
method_declaration (+126 nodes collapsed)
block_comment "/** Helper method for implementing {@link Message#hashCode()"...
method_declaration (+61 nodes collapsed)
field_declaration
modifiers
private "private"
static "static"
final "final"
integral_type
int "int"
variable_declarator
identifier "DEFAULT_BUFFER_SIZE"
= "="
decimal_integer_literal "4096"
; ";"
block_comment "/** Helper method for implementing {@link Message#hashCode()"...
method_declaration (+274 nodes collapsed)
method_declaration (+104 nodes collapsed)
block_comment "/** An empty byte array constant used in generated code. */"
field_declaration (+23 nodes collapsed)
block_comment "/** An empty byte array constant used in generated code. */"
field_declaration
modifiers
public "public"
static "static"
final "final"
type_identifier "ByteBuffer"
variable_declarator
identifier "EMPTY_BYTE_BUFFER"
= "="
method_invocation
identifier "ByteBuffer"
. "."
identifier "wrap"
argument_list
( "("
identifier "EMPTY_BYTE_ARRAY"
) ")"
; ";"
block_comment "/** An empty coded input stream constant used in generated c"...
field_declaration
modifiers
public "public"
static "static"
final "final"
type_identifier "CodedInputStream"
variable_declarator
identifier "EMPTY_CODED_INPUT_STREAM"
= "="
method_invocation
identifier "CodedInputStream"
. "."
identifier "newInstance"
argument_list
( "("
identifier "EMPTY_BYTE_ARRAY"
) ")"
; ";"
block_comment "/** Helper method to merge two MessageLite instances. */"
method_declaration (+52 nodes collapsed)
block_comment "/**\n * Provides an immutable view of {@code List<T>} aroun"...
class_declaration (+169 nodes collapsed)
block_comment "/**\n * Provides an immutable view of {@code List<T>} aroun"...
class_declaration (+188 nodes collapsed)
block_comment "/** Wrap around a {@code Map<K, RealValue>} and provide a {@"...
class_declaration (+1148 nodes collapsed)
block_comment "/**\n * Extends {@link List} to add the capability to make "...
interface_declaration (+58 nodes collapsed)
block_comment "/**\n * A {@link java.util.List} implementation that avoids"...
interface_declaration (+81 nodes collapsed)
block_comment "/**\n * A {@link java.util.List} implementation that avoids"...
interface_declaration (+77 nodes collapsed)
block_comment "/**\n * A {@link java.util.List} implementation that avoids"...
interface_declaration (+81 nodes collapsed)
block_comment "/**\n * A {@link java.util.List} implementation that avoids"...
interface_declaration (+81 nodes collapsed)
block_comment "/**\n * A {@link java.util.List} implementation that avoids"...
interface_declaration (+81 nodes collapsed)
} "}"