← all fixtures

java-defects4j-mockito-7-genericmetadatasupport

Java View before/after files on GitHub
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–371 unchanged (371 lines)
372 registerTypeParametersOn(typeParameters);
373 }
374
375 private void readTypeVariables() {
376 for (Type type : typeVariable.getBounds()) {
377 registerTypeVariablesOn(type);
378 }
379 registerTypeVariablesOn(getActualTypeArgumentFor(typeVariable));
380 }
381
382 @Override
383 public Class<?> rawType() {
384 if (rawType == null) {
…lines 385–627 unchanged (243 lines)

After

…lines 1–372 unchanged (372 lines)
373 }
374
375 private void readTypeVariables() {
376 for (Type type : typeVariable.getBounds()) {
377 registerTypeVariablesOn(type);
378 }
379 registerTypeParametersOn(new TypeVariable[] { typeVariable });
380 registerTypeVariablesOn(getActualTypeArgumentFor(typeVariable));
381 }
382
383 @Override
384 public Class<?> rawType() {
385 if (rawType == null) {
…lines 386–628 unchanged (243 lines)

Before

program
block_comment "/*\r\n * Copyright (c) 2007 Mockito contributors\r\n * This prog"...
package_declaration
package "package"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "mockito"
. "."
identifier "internal"
. "."
identifier "util"
. "."
identifier "reflection"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "mockito"
. "."
identifier "exceptions"
. "."
identifier "base"
. "."
identifier "MockitoException"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "mockito"
. "."
identifier "internal"
. "."
identifier "util"
. "."
identifier "Checks"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "lang"
. "."
identifier "reflect"
. "."
asterisk
* "*"
; ";"
import_declaration
import "import"
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
asterisk
* "*"
; ";"
block_comment "/**\r\n * This class can retrieve generic meta-data that the c"...
class_declaration
modifiers
public "public"
abstract "abstract"
class "class"
identifier "GenericMetadataSupport"
class_body
{ "{"
line_comment "// public static MockitoLogger logger = new ConsoleMockitoLo"...
block_comment "/**\r\n * Represents actual type variables resolved for cu"...
field_declaration (+28 nodes collapsed)
method_declaration (+205 nodes collapsed)
method_declaration (+37 nodes collapsed)
method_declaration (+50 nodes collapsed)
block_comment "/**\r\n * @param typeParameter The TypeVariable parameter\r"...
method_declaration (+69 nodes collapsed)
block_comment "/**\r\n * @param wildCard The WildCard type\r\n * @retur"...
method_declaration (+69 nodes collapsed)
block_comment "/**\r\n * @return Raw type of the current instance.\r\n "...
method_declaration
modifiers
public "public"
abstract "abstract"
generic_type
type_identifier "Class"
type_arguments
< "<"
wildcard
? "?"
> ">"
identifier "rawType"
formal_parameters
( "("
) ")"
; ";"
block_comment "/**\r\n * @return Returns extra interfaces <strong>if rele"...
method_declaration (+26 nodes collapsed)
block_comment "/**\r\n * @return Returns an array with the raw types of {"...
method_declaration (+31 nodes collapsed)
block_comment "/**\r\n * @return Returns true if metadata knows about ext"...
method_declaration (+25 nodes collapsed)
block_comment "/**\r\n * @return Actual type arguments matching the type "...
method_declaration (+105 nodes collapsed)
method_declaration (+67 nodes collapsed)
block_comment "/**\r\n * Resolve current method generic return type to a "...
method_declaration (+180 nodes collapsed)
block_comment "/**\r\n * Create an new instance of {@link GenericMetadata"...
method_declaration (+125 nodes collapsed)
line_comment "////////////////////////////////////////////////////////////"...
line_comment "//// Below are specializations of GenericMetadataSupport tha"...
line_comment "////////////////////////////////////////////////////////////"...
block_comment "/**\r\n * Generic metadata implementation for {@link Class"...
class_declaration (+271 nodes collapsed)
block_comment "/**\r\n * Generic metadata implementation for \"standalone\""...
class_declaration (+122 nodes collapsed)
block_comment "/**\r\n * Generic metadata specific to {@link Parameterize"...
class_declaration (+179 nodes collapsed)
block_comment "/**\r\n * Generic metadata for {@link TypeVariable} return"...
class_declaration
modifiers
private "private"
static "static"
class "class"
identifier "TypeVariableReturnType"
superclass
extends "extends"
type_identifier "GenericMetadataSupport"
class_body
{ "{"
field_declaration
modifiers
private "private"
final "final"
type_identifier "TypeVariable"
variable_declarator
identifier "typeVariable"
; ";"
field_declaration
modifiers
private "private"
final "final"
array_type
type_identifier "TypeVariable"
dimensions
[ "["
] "]"
variable_declarator
identifier "typeParameters"
; ";"
field_declaration
modifiers
private "private"
generic_type
type_identifier "Class"
type_arguments
< "<"
wildcard
? "?"
> ">"
variable_declarator
identifier "rawType"
; ";"
constructor_declaration (+69 nodes collapsed)
method_declaration
modifiers
private "private"
void_type "void"
identifier "readTypeParameters"
formal_parameters
( "("
) ")"
block
{ "{"
expression_statement
method_invocation
identifier "registerTypeParametersOn"
argument_list
( "("
identifier "typeParameters"
) ")"
; ";"
} "}"
method_declaration
modifiers
private "private"
void_type "void"
identifier "readTypeVariables"
formal_parameters
( "("
) ")"
block
{ "{"
enhanced_for_statement (+25 nodes collapsed)
expression_statement
method_invocation
identifier "registerTypeVariablesOn"
argument_list
( "("
method_invocation
identifier "getActualTypeArgumentFor"
argument_list
( "("
identifier "typeVariable"
) ")"
) ")"
; ";"
} "}"
method_declaration (+47 nodes collapsed)
method_declaration (+170 nodes collapsed)
method_declaration (+143 nodes collapsed)
block_comment "/**\r\n * @return Returns an array with the extracted "...
method_declaration (+156 nodes collapsed)
method_declaration (+111 nodes collapsed)
} "}"
block_comment "/**\r\n * Non-Generic metadata for {@link Class} returned "...
class_declaration (+79 nodes collapsed)
block_comment "/**\r\n * Type representing bounds of a type\r\n *\r\n "...
interface_declaration (+30 nodes collapsed)
block_comment "/**\r\n * Type representing bounds of a type variable, all"...
class_declaration (+326 nodes collapsed)
block_comment "/**\r\n * Type representing bounds of a wildcard, allows t"...
class_declaration (+292 nodes collapsed)
} "}"

After

program
block_comment "/*\r\n * Copyright (c) 2007 Mockito contributors\r\n * This prog"...
package_declaration
package "package"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "mockito"
. "."
identifier "internal"
. "."
identifier "util"
. "."
identifier "reflection"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "mockito"
. "."
identifier "exceptions"
. "."
identifier "base"
. "."
identifier "MockitoException"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "mockito"
. "."
identifier "internal"
. "."
identifier "util"
. "."
identifier "Checks"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "lang"
. "."
identifier "reflect"
. "."
asterisk
* "*"
; ";"
import_declaration
import "import"
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
asterisk
* "*"
; ";"
block_comment "/**\r\n * This class can retrieve generic meta-data that the c"...
class_declaration
modifiers
public "public"
abstract "abstract"
class "class"
identifier "GenericMetadataSupport"
class_body
{ "{"
line_comment "// public static MockitoLogger logger = new ConsoleMockitoLo"...
block_comment "/**\r\n * Represents actual type variables resolved for cu"...
field_declaration (+28 nodes collapsed)
method_declaration (+205 nodes collapsed)
method_declaration (+37 nodes collapsed)
method_declaration (+50 nodes collapsed)
block_comment "/**\r\n * @param typeParameter The TypeVariable parameter\r"...
method_declaration (+69 nodes collapsed)
block_comment "/**\r\n * @param wildCard The WildCard type\r\n * @retur"...
method_declaration (+69 nodes collapsed)
block_comment "/**\r\n * @return Raw type of the current instance.\r\n "...
method_declaration
modifiers
public "public"
abstract "abstract"
generic_type
type_identifier "Class"
type_arguments
< "<"
wildcard
? "?"
> ">"
identifier "rawType"
formal_parameters
( "("
) ")"
; ";"
block_comment "/**\r\n * @return Returns extra interfaces <strong>if rele"...
method_declaration (+26 nodes collapsed)
block_comment "/**\r\n * @return Returns an array with the raw types of {"...
method_declaration (+31 nodes collapsed)
block_comment "/**\r\n * @return Returns true if metadata knows about ext"...
method_declaration (+25 nodes collapsed)
block_comment "/**\r\n * @return Actual type arguments matching the type "...
method_declaration (+105 nodes collapsed)
method_declaration (+67 nodes collapsed)
block_comment "/**\r\n * Resolve current method generic return type to a "...
method_declaration (+180 nodes collapsed)
block_comment "/**\r\n * Create an new instance of {@link GenericMetadata"...
method_declaration (+125 nodes collapsed)
line_comment "////////////////////////////////////////////////////////////"...
line_comment "//// Below are specializations of GenericMetadataSupport tha"...
line_comment "////////////////////////////////////////////////////////////"...
block_comment "/**\r\n * Generic metadata implementation for {@link Class"...
class_declaration (+271 nodes collapsed)
block_comment "/**\r\n * Generic metadata implementation for \"standalone\""...
class_declaration (+122 nodes collapsed)
block_comment "/**\r\n * Generic metadata specific to {@link Parameterize"...
class_declaration (+179 nodes collapsed)
block_comment "/**\r\n * Generic metadata for {@link TypeVariable} return"...
class_declaration
modifiers
private "private"
static "static"
class "class"
identifier "TypeVariableReturnType"
superclass
extends "extends"
type_identifier "GenericMetadataSupport"
class_body
{ "{"
field_declaration
modifiers
private "private"
final "final"
type_identifier "TypeVariable"
variable_declarator
identifier "typeVariable"
; ";"
field_declaration
modifiers
private "private"
final "final"
array_type
type_identifier "TypeVariable"
dimensions
[ "["
] "]"
variable_declarator
identifier "typeParameters"
; ";"
field_declaration
modifiers
private "private"
generic_type
type_identifier "Class"
type_arguments
< "<"
wildcard
? "?"
> ">"
variable_declarator
identifier "rawType"
; ";"
constructor_declaration (+69 nodes collapsed)
method_declaration
modifiers
private "private"
void_type "void"
identifier "readTypeParameters"
formal_parameters
( "("
) ")"
block
{ "{"
expression_statement
method_invocation
identifier "registerTypeParametersOn"
argument_list
( "("
identifier "typeParameters"
) ")"
; ";"
} "}"
method_declaration
modifiers
private "private"
void_type "void"
identifier "readTypeVariables"
formal_parameters
( "("
) ")"
block
{ "{"
enhanced_for_statement (+25 nodes collapsed)
expression_statement
method_invocation
identifier "registerTypeParametersOn"
argument_list
( "("
array_creation_expression
new "new"
type_identifier "TypeVariable"
dimensions
[ "["
] "]"
array_initializer
{ "{"
identifier "typeVariable"
} "}"
) ")"
; ";"
expression_statement
method_invocation
identifier "registerTypeVariablesOn"
argument_list
( "("
method_invocation
identifier "getActualTypeArgumentFor"
argument_list
( "("
identifier "typeVariable"
) ")"
) ")"
; ";"
} "}"
method_declaration (+47 nodes collapsed)
method_declaration (+170 nodes collapsed)
method_declaration (+143 nodes collapsed)
block_comment "/**\r\n * @return Returns an array with the extracted "...
method_declaration (+156 nodes collapsed)
method_declaration (+111 nodes collapsed)
} "}"
block_comment "/**\r\n * Non-Generic metadata for {@link Class} returned "...
class_declaration (+79 nodes collapsed)
block_comment "/**\r\n * Type representing bounds of a type\r\n *\r\n "...
interface_declaration (+30 nodes collapsed)
block_comment "/**\r\n * Type representing bounds of a type variable, all"...
class_declaration (+326 nodes collapsed)
block_comment "/**\r\n * Type representing bounds of a wildcard, allows t"...
class_declaration (+292 nodes collapsed)
} "}"