From 65fef39a4cbf5ea6b74d8d4b15c3f01a4dd06a52 Mon Sep 17 00:00:00 2001 From: Matt Hargett Date: Mon, 25 Jul 2022 21:43:54 -0700 Subject: [PATCH 001/108] Initial Lua type grammar --- .../sourceforge/pmd/lang/lua/antlr4/Lua.g4 | 77 +++++++++++++++++-- 1 file changed, 71 insertions(+), 6 deletions(-) diff --git a/pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4 b/pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4 index 59c0b86a60..12773b012a 100644 --- a/pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4 +++ b/pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4 @@ -71,12 +71,13 @@ chunk ; block - : stat* laststat? + : (stat ';'?)* (laststat ';'?)? ; stat : ';' | varlist '=' explist + | var compoundop exp | functioncall | label | 'break' @@ -85,11 +86,12 @@ stat | 'while' exp 'do' block 'end' | 'repeat' block 'until' exp | 'if' exp 'then' block ('elseif' exp 'then' block)* ('else' block)? 'end' - | 'for' NAME '=' exp ',' exp (',' exp)? 'do' block 'end' - | 'for' namelist 'in' explist 'do' block 'end' + | 'for' binding '=' exp ',' exp (',' exp)? 'do' block 'end' + | 'for' bindinglist 'in' explist 'do' block 'end' | 'function' funcname funcbody | 'local' 'function' NAME funcbody - | 'local' attnamelist ('=' explist)? + | 'local' bindinglist ('=' explist)? + | ('export')? 'type' NAME ('<' GenericTypeParameterList '>')? '=' Type ; attnamelist @@ -101,7 +103,7 @@ attrib ; laststat - : 'return' explist? | 'break' | 'continue' ';'? + : 'return' explist? | 'break' | 'continue' ; label @@ -120,6 +122,12 @@ namelist : NAME (',' NAME)* ; +binding + : NAME (':' Type ('?')?)? + ; + +bindinglist: binding (',' bindinglist)?; + explist : (exp ',')* exp ; @@ -131,6 +139,7 @@ exp | '...' | functiondef | prefixexp + | ifelseexp | tableconstructor | exp operatorPower exp | operatorUnary exp @@ -143,6 +152,8 @@ exp | exp operatorBitwise exp ; +ifelseexp: 'if' exp 'then' exp ('elseif' exp 'then' exp)* 'else' exp; + prefixexp : varOrExp nameAndArgs* ; @@ -176,7 +187,7 @@ functiondef ; funcbody - : '(' parlist? ')' block 'end' + : ('<' NAME '>')? '(' parlist? ')' block (':' '...'? NAME ) 'end' // GenericTypeParameterList and ReturnType ; parlist @@ -199,6 +210,8 @@ fieldsep : ',' | ';' ; +compoundop: '+=' | '-=' | '*=' | '/=' | '%=' | '^=' | '..='; + operatorOr : 'or'; @@ -234,6 +247,58 @@ string : NORMALSTRING | CHARSTRING | LONGSTRING ; +SimpleType + : 'nil' + | SingletonType + | NAME /* ('.' NAME)? */ ('<' TypeParams '>')? + | 'typeof' '(' NAME ('(' ')')? | '...' ')' // can't use `exp`, manually handle common cases + | TableType + | FunctionType + ; + +SingletonType + : NORMALSTRING | CHARSTRING + | 'true' + | 'false' + ; + +Type + : SimpleType ('?')? + | SimpleType ('?')? ('|' Type) // can't use Type because it's mutually left-recursive + | SimpleType ('?')? ('&' Type) // can't use Type because it's mutually left-recursive + ; + +GenericTypePackParameter: NAME '...' ('=' (('(' (TypeList)? ')') | VariadicTypePack | GenericTypePack))?; // TypePack must be inlined here + +GenericTypeParameterList: NAME ('=' Type)? (',' GenericTypeParameterList)? | GenericTypePackParameter (',' GenericTypePackParameter)*; + +TypeList: Type (',' Type)? | VariadicTypePack; + +TypeParams: (Type | VariadicTypePack | GenericTypePack) (',' TypeParams)?; // had to remove TypePack + +// TypePack: + +GenericTypePack: NAME '...'; + +VariadicTypePack: '...' Type; + +ReturnType: Type | '(' Type ',' Type ')' | '(' ')'; // can't use TypePack, inline common cases + +TableIndexer: '[' Type ']' ':' Type; + +TableProp: NAME ':' Type; + +TablePropOrIndexer + : TableProp | TableIndexer; + +PropList + : TablePropOrIndexer ((','|';') TablePropOrIndexer)* (','|';')?; + +TableType + : '{' PropList '}'; + +FunctionType: ('<' GenericTypeParameterList '>')? '(' (TypeList)? ')' '->' (Type | '(' ')' | '(' (TypeList) ')'); // inline ReturnType to avoid greediness + // LEXER NAME From 8aaa1302cccf913c3658f207f137bd9c05367749 Mon Sep 17 00:00:00 2001 From: Matt Hargett Date: Tue, 26 Jul 2022 00:13:35 -0700 Subject: [PATCH 002/108] Support all Luau type extension syntax available in all test corpus sources. Add a regression test for a few of the things that required tweaks. --- .../sourceforge/pmd/lang/lua/antlr4/Lua.g4 | 80 ++++--- .../sourceforge/pmd/cpd/LuaTokenizerTest.java | 5 + .../lang/lua/cpd/testdata/regressionTest.lua | 24 +++ .../lang/lua/cpd/testdata/regressionTest.txt | 203 ++++++++++++++++++ 4 files changed, 271 insertions(+), 41 deletions(-) create mode 100644 pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/regressionTest.lua create mode 100644 pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/regressionTest.txt diff --git a/pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4 b/pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4 index 12773b012a..62ac80363d 100644 --- a/pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4 +++ b/pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4 @@ -102,20 +102,28 @@ attrib : ('<' NAME '>')? ; -laststat - : 'return' explist? | 'break' | 'continue' - ; - label : '::' NAME '::' ; +laststat + : 'return' explist? | 'break' | 'continue' + ; + funcname : NAME ('.' NAME)* (':' NAME)? ; -varlist - : var (',' var)* +funcbody + : ('<' GenericTypeParameterList '>')? '(' parlist? ')' (':' '...'? ReturnType ) block 'end' // GenericTypeParameterList and ReturnType + ; + +parlist + : bindinglist (',' '...')? | '...' + ; + +explist + : (exp ',')* exp ; namelist @@ -128,32 +136,14 @@ binding bindinglist: binding (',' bindinglist)?; -explist - : (exp ',')* exp +var + : (NAME | '(' exp ')' varSuffix) varSuffix* ; -exp - : 'nil' | 'false' | 'true' - | number - | string - | '...' - | functiondef - | prefixexp - | ifelseexp - | tableconstructor - | exp operatorPower exp - | operatorUnary exp - | exp operatorMulDivMod exp - | exp operatorAddSub exp - | exp operatorStrcat exp - | exp operatorComparison exp - | exp operatorAnd exp - | exp operatorOr exp - | exp operatorBitwise exp +varlist + : var (',' var)* ; -ifelseexp: 'if' exp 'then' exp ('elseif' exp 'then' exp)* 'else' exp; - prefixexp : varOrExp nameAndArgs* ; @@ -162,12 +152,26 @@ functioncall : varOrExp nameAndArgs+ ; -varOrExp - : var | '(' exp ')' +exp + : (asexp | operatorUnary exp) ( binop exp )* ; -var - : (NAME | '(' exp ')' varSuffix) varSuffix* +ifelseexp: 'if' exp 'then' exp ('elseif' exp 'then' exp)* 'else' exp; + +asexp: simpleexp ('::' Type)?; + +simpleexp + : 'nil' | 'false' | 'true' + | number + | string + | '...' + | 'function' funcbody + | prefixexp + | ifelseexp + | tableconstructor; + +varOrExp + : var | '(' exp ')' ; varSuffix @@ -186,14 +190,6 @@ functiondef : 'function' funcbody ; -funcbody - : ('<' NAME '>')? '(' parlist? ')' block (':' '...'? NAME ) 'end' // GenericTypeParameterList and ReturnType - ; - -parlist - : namelist (',' '...')? | '...' - ; - tableconstructor : '{' fieldlist? '}' ; @@ -212,6 +208,8 @@ fieldsep compoundop: '+=' | '-=' | '*=' | '/=' | '%=' | '^=' | '..='; +binop: operatorAddSub | operatorMulDivMod | operatorPower | operatorStrcat | operatorComparison | operatorAnd | operatorOr | operatorBitwise; + operatorOr : 'or'; @@ -276,7 +274,7 @@ TypeList: Type (',' Type)? | VariadicTypePack; TypeParams: (Type | VariadicTypePack | GenericTypePack) (',' TypeParams)?; // had to remove TypePack -// TypePack: +// TypePack: inlined everywhere to avoid overly greedy match when out-of-context GenericTypePack: NAME '...'; diff --git a/pmd-lua/src/test/java/net/sourceforge/pmd/cpd/LuaTokenizerTest.java b/pmd-lua/src/test/java/net/sourceforge/pmd/cpd/LuaTokenizerTest.java index 76d18a3ffa..ccbd16450d 100644 --- a/pmd-lua/src/test/java/net/sourceforge/pmd/cpd/LuaTokenizerTest.java +++ b/pmd-lua/src/test/java/net/sourceforge/pmd/cpd/LuaTokenizerTest.java @@ -39,4 +39,9 @@ public class LuaTokenizerTest extends CpdTextComparisonTest { public void testTabWidth() { doTest("tabWidth"); } + + @Test + public void testRegression() { + doTest("regressionTest"); + } } diff --git a/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/regressionTest.lua b/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/regressionTest.lua new file mode 100644 index 0000000000..6b46463859 --- /dev/null +++ b/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/regressionTest.lua @@ -0,0 +1,24 @@ +--!strict +type Array = { T } +local x = 31337 +local _negativeLiteral = -3 +local _negativeVariable = -x +local _notLiteral = not true +local _notVariable = not x +local _length = #{x} +export type Function = (...any) -> T... + +return function (req, ...: boolean): ({[string|number]: any}, string, Function<...any>) + local body = string.format("%s %s\n", req.method, req.path) + local res = { + code = 200, + { "Content-Type", "text/plain" }, + { "Content-Length", #body } :: Array, + } :: { [any]: number | Array } + if req.keepAlive then + res[#res + 1] = { "Connection", "Keep-Alive" } + res[#res + 2] = { ... } + end + + return res, body, function(...): ...any return ... end +end \ No newline at end of file diff --git a/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/regressionTest.txt b/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/regressionTest.txt new file mode 100644 index 0000000000..f02a9b767c --- /dev/null +++ b/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/regressionTest.txt @@ -0,0 +1,203 @@ + [Image] or [Truncated image[ Bcol Ecol +L2 + [type] 1 4 + [Array] 6 10 + [<] 11 11 + [T] 12 12 + [=] 14 14 + [any] 16 18 + [>] 19 19 + [=] 21 21 + [{] 23 23 + [T] 25 25 + [}] 27 27 +L3 + [local] 1 5 + [x] 7 7 + [=] 9 9 + [31337] 11 15 +L4 + [local] 1 5 + [_negativeLiteral] 7 22 + [=] 24 24 + [-] 26 26 + [3] 27 27 +L5 + [local] 1 5 + [_negativeVariable] 7 23 + [=] 25 25 + [-] 27 27 + [x] 28 28 +L6 + [local] 1 5 + [_notLiteral] 7 17 + [=] 19 19 + [not] 21 23 + [true] 25 28 +L7 + [local] 1 5 + [_notVariable] 7 18 + [=] 20 20 + [not] 22 24 + [x] 26 26 +L8 + [local] 1 5 + [_length] 7 13 + [=] 15 15 + [#] 17 17 + [{] 18 18 + [x] 19 19 + [}] 20 20 +L9 + [export] 1 6 + [type] 8 11 + [Function] 13 20 + [<] 21 21 + [T...] 22 25 + [=] 27 27 + [...any] 29 34 + [>] 35 35 + [=] 37 37 + [(] 39 39 + [...any] 40 45 + [)] 46 46 + [-] 48 48 + [>] 49 49 + [T...] 51 54 +L11 + [return] 1 6 + [function] 8 15 + [(] 17 17 + [req] 18 20 + [,] 21 21 + [...] 23 25 + [:] 26 26 + [boolean] 28 34 + [)] 35 35 + [:] 36 36 + [(] 38 38 + [{] 39 39 + [\[] 40 40 + [string|number] 41 53 + [\]] 54 54 + [:] 55 55 + [any] 57 59 + [}] 60 60 + [,] 61 61 + [string] 63 68 + [,] 69 69 + [Function<...any>] 71 86 + [)] 87 87 +L12 + [local] 3 7 + [body] 9 12 + [=] 14 14 + [string] 16 21 + [.] 22 22 + [format] 23 28 + [(] 29 29 + ["%s %s\\n"] 30 38 + [,] 39 39 + [req] 41 43 + [.] 44 44 + [method] 45 50 + [,] 51 51 + [req] 53 55 + [.] 56 56 + [path] 57 60 + [)] 61 61 +L13 + [local] 3 7 + [res] 9 11 + [=] 13 13 + [{] 15 15 +L14 + [code] 5 8 + [=] 10 10 + [200] 12 14 + [,] 15 15 +L15 + [{] 5 5 + ["Content-Type"] 7 20 + [,] 21 21 + ["text/plain"] 23 34 + [}] 36 36 + [,] 37 37 +L16 + [{] 5 5 + ["Content-Length"] 7 22 + [,] 23 23 + [#] 25 25 + [body] 26 29 + [}] 31 31 + [::] 33 34 + [Array] 36 45 + [,] 46 46 +L17 + [}] 3 3 + [::] 5 6 + [{] 8 8 + [\[] 10 10 + [any] 11 13 + [\]] 14 14 + [:] 15 15 + [number] 17 22 + [|] 24 24 + [Array] 26 30 + [<] 31 31 + [string] 32 37 + [|] 39 39 + [boolean] 41 47 + [>] 48 48 + [}] 50 50 +L18 + [if] 3 4 + [req] 6 8 + [.] 9 9 + [keepAlive] 10 18 + [then] 20 23 +L19 + [res] 5 7 + [\[] 8 8 + [#] 9 9 + [res] 10 12 + [+] 14 14 + [1] 16 16 + [\]] 17 17 + [=] 19 19 + [{] 21 21 + ["Connection"] 23 34 + [,] 35 35 + ["Keep-Alive"] 37 48 + [}] 50 50 +L20 + [res] 5 7 + [\[] 8 8 + [#] 9 9 + [res] 10 12 + [+] 14 14 + [2] 16 16 + [\]] 17 17 + [=] 19 19 + [{] 21 21 + [...] 23 25 + [}] 27 27 +L21 + [end] 3 5 +L23 + [return] 3 8 + [res] 10 12 + [,] 13 13 + [body] 15 18 + [,] 19 19 + [function] 21 28 + [(] 29 29 + [...)] 30 33 + [:] 34 34 + [...any] 36 41 + [return] 43 48 + [...] 50 52 + [end] 54 56 +L24 + [end] 1 3 +EOF From cfb8374611107702191b7dc379c3f146087ea096 Mon Sep 17 00:00:00 2001 From: Matt Hargett Date: Tue, 26 Jul 2022 13:25:14 -0700 Subject: [PATCH 003/108] Capture more syntax scenarios in the regression test, update the snapshot. --- .../lang/lua/cpd/testdata/regressionTest.lua | 12 +- .../lang/lua/cpd/testdata/regressionTest.txt | 128 +++++++++++------- 2 files changed, 89 insertions(+), 51 deletions(-) diff --git a/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/regressionTest.lua b/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/regressionTest.lua index 6b46463859..1c391a37a6 100644 --- a/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/regressionTest.lua +++ b/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/regressionTest.lua @@ -8,17 +8,19 @@ local _notVariable = not x local _length = #{x} export type Function = (...any) -> T... -return function (req, ...: boolean): ({[string|number]: any}, string, Function<...any>) +return function (req, ...: boolean): ({[string|number]: T}, string, Function<...any>) local body = string.format("%s %s\n", req.method, req.path) local res = { code = 200, { "Content-Type", "text/plain" }, { "Content-Length", #body } :: Array, } :: { [any]: number | Array } - if req.keepAlive then - res[#res + 1] = { "Connection", "Keep-Alive" } - res[#res + 2] = { ... } + if (req :: any).keepAlive then + local socketType: "Connection" | "Pingback" | "" = "" :: "" + socketType = "Connection" :: "Connection" + res[#res + 1] = { socketType :: string, "Keep-Alive" } + res[#res - 2] = { ... } end - return res, body, function(...): ...any return ... end + return (res :: any) :: { T }, body, function(...): ...any return ... end end \ No newline at end of file diff --git a/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/regressionTest.txt b/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/regressionTest.txt index f02a9b767c..2be84bbb8a 100644 --- a/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/regressionTest.txt +++ b/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/regressionTest.txt @@ -67,27 +67,30 @@ L9 L11 [return] 1 6 [function] 8 15 - [(] 17 17 - [req] 18 20 - [,] 21 21 - [...] 23 25 - [:] 26 26 - [boolean] 28 34 - [)] 35 35 - [:] 36 36 - [(] 38 38 - [{] 39 39 - [\[] 40 40 - [string|number] 41 53 - [\]] 54 54 - [:] 55 55 - [any] 57 59 - [}] 60 60 - [,] 61 61 - [string] 63 68 - [,] 69 69 - [Function<...any>] 71 86 - [)] 87 87 + [<] 17 17 + [T] 18 18 + [>] 19 19 + [(] 20 20 + [req] 21 23 + [,] 24 24 + [...] 26 28 + [:] 29 29 + [boolean] 31 37 + [)] 38 38 + [:] 39 39 + [(] 41 41 + [{] 42 42 + [\[] 43 43 + [string|number] 44 56 + [\]] 57 57 + [:] 58 58 + [T] 60 60 + [}] 61 61 + [,] 62 62 + [string] 64 69 + [,] 70 70 + [Function<...any>] 72 87 + [)] 88 88 L12 [local] 3 7 [body] 9 12 @@ -152,11 +155,34 @@ L17 [}] 50 50 L18 [if] 3 4 - [req] 6 8 - [.] 9 9 - [keepAlive] 10 18 - [then] 20 23 + [(] 6 6 + [req] 7 9 + [::] 11 12 + [any] 14 16 + [)] 17 17 + [.] 18 18 + [keepAlive] 19 27 + [then] 29 32 L19 + [local] 5 9 + [socketType] 11 20 + [:] 21 21 + ["Connection"] 23 34 + [|] 36 36 + ["Pingback"] 38 47 + [|] 49 49 + [""] 51 52 + [=] 54 54 + [""] 56 57 + [::] 59 60 + [""] 62 63 +L20 + [socketType] 5 14 + [=] 16 16 + ["Connection"] 18 29 + [::] 31 32 + ["Connection"] 34 45 +L21 [res] 5 7 [\[] 8 8 [#] 9 9 @@ -166,38 +192,48 @@ L19 [\]] 17 17 [=] 19 19 [{] 21 21 - ["Connection"] 23 34 - [,] 35 35 - ["Keep-Alive"] 37 48 - [}] 50 50 -L20 + [socketType] 23 32 + [::] 34 35 + [string] 37 42 + [,] 43 43 + ["Keep-Alive"] 45 56 + [}] 58 58 +L22 [res] 5 7 [\[] 8 8 [#] 9 9 [res] 10 12 - [+] 14 14 + [-] 14 14 [2] 16 16 [\]] 17 17 [=] 19 19 [{] 21 21 [...] 23 25 [}] 27 27 -L21 - [end] 3 5 L23 + [end] 3 5 +L25 [return] 3 8 - [res] 10 12 - [,] 13 13 - [body] 15 18 - [,] 19 19 - [function] 21 28 - [(] 29 29 - [...)] 30 33 - [:] 34 34 - [...any] 36 41 - [return] 43 48 - [...] 50 52 - [end] 54 56 -L24 + [(] 10 10 + [res] 11 13 + [::] 15 16 + [any] 18 20 + [)] 21 21 + [::] 23 24 + [{] 26 26 + [T] 28 28 + [}] 30 30 + [,] 31 31 + [body] 33 36 + [,] 37 37 + [function] 39 46 + [(] 47 47 + [...)] 48 51 + [:] 52 52 + [...any] 54 59 + [return] 61 66 + [...] 68 70 + [end] 72 74 +L26 [end] 1 3 EOF From 3d6fab0782464562aee9a0f7d72971de4d0efc9e Mon Sep 17 00:00:00 2001 From: Matt Hargett Date: Tue, 26 Jul 2022 13:29:19 -0700 Subject: [PATCH 004/108] rename new snapshot artifact to better express intent --- .../src/test/java/net/sourceforge/pmd/cpd/LuaTokenizerTest.java | 2 +- .../lang/lua/cpd/testdata/{regressionTest.lua => luauTypes.lua} | 0 .../lang/lua/cpd/testdata/{regressionTest.txt => luauTypes.txt} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/{regressionTest.lua => luauTypes.lua} (100%) rename pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/{regressionTest.txt => luauTypes.txt} (100%) diff --git a/pmd-lua/src/test/java/net/sourceforge/pmd/cpd/LuaTokenizerTest.java b/pmd-lua/src/test/java/net/sourceforge/pmd/cpd/LuaTokenizerTest.java index ccbd16450d..83b39442a1 100644 --- a/pmd-lua/src/test/java/net/sourceforge/pmd/cpd/LuaTokenizerTest.java +++ b/pmd-lua/src/test/java/net/sourceforge/pmd/cpd/LuaTokenizerTest.java @@ -42,6 +42,6 @@ public class LuaTokenizerTest extends CpdTextComparisonTest { @Test public void testRegression() { - doTest("regressionTest"); + doTest("luauTypes"); } } diff --git a/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/regressionTest.lua b/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.lua similarity index 100% rename from pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/regressionTest.lua rename to pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.lua diff --git a/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/regressionTest.txt b/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.txt similarity index 100% rename from pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/regressionTest.txt rename to pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.txt From 68eaf06e1a9aeaef5607f4f60a478b2a109204fc Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 28 Jul 2022 11:55:51 +0200 Subject: [PATCH 005/108] [doc] Add proposal for architecture decision records --- docs/_data/sidebars/pmd_sidebar.yml | 3 ++ docs/pages/pmd/projectdocs/decisions.md | 14 +++++ docs/pages/pmd/projectdocs/decisions/adr-1.md | 52 +++++++++++++++++++ .../pmd/projectdocs/decisions/adr-NNN.md | 27 ++++++++++ 4 files changed, 96 insertions(+) create mode 100644 docs/pages/pmd/projectdocs/decisions.md create mode 100644 docs/pages/pmd/projectdocs/decisions/adr-1.md create mode 100644 docs/pages/pmd/projectdocs/decisions/adr-NNN.md diff --git a/docs/_data/sidebars/pmd_sidebar.yml b/docs/_data/sidebars/pmd_sidebar.yml index f7ab16ddb0..476a38b2b4 100644 --- a/docs/_data/sidebars/pmd_sidebar.yml +++ b/docs/_data/sidebars/pmd_sidebar.yml @@ -469,6 +469,9 @@ entries: - title: Old release notes url: /pmd_release_notes_old.html output: web, pdf + - title: Decisions + url: /pmd_projectdocs_decisions.html + output: web, pdf - title: null output: web, pdf subfolders: diff --git a/docs/pages/pmd/projectdocs/decisions.md b/docs/pages/pmd/projectdocs/decisions.md new file mode 100644 index 0000000000..fd130d53af --- /dev/null +++ b/docs/pages/pmd/projectdocs/decisions.md @@ -0,0 +1,14 @@ +--- +title: Architecture Design Decisions +sidebar: pmd_sidebar +permalink: pmd_projectdocs_decisions.html +last_updated: July 2022 +--- + +
    +{% for page in site.pages %} + {% if page.adr == true and page.adr_status != "" %} +
  • {{ page.title }} ({{ page.adr_status }})
    • + {% endif %} +{% endfor %} +
diff --git a/docs/pages/pmd/projectdocs/decisions/adr-1.md b/docs/pages/pmd/projectdocs/decisions/adr-1.md new file mode 100644 index 0000000000..e7208f9761 --- /dev/null +++ b/docs/pages/pmd/projectdocs/decisions/adr-1.md @@ -0,0 +1,52 @@ +--- +title: ADR 1 - Use architecture decision records +sidebar: pmd_sidebar +permalink: pmd_projectdocs_decisions_adr_1.html +sidebaractiveurl: /pmd_projectdocs_decisions.html +adr: true +# Proposed / Accepted / Deprecated / Superseded +adr_status: "Proposed" +last_updated: July 2022 +--- + +# Context + +PMD has grown over 20 years as an open-source project. Along the way many decisions have been made, but they are not +explicitly documented. PMD is also developed by many individuals and the original developers might +not even be around anymore. + +Without having documentation records about decisions it is hard for new developers to understand the reasons +of past decisions. This might lead to either ignore these past (unknown) decisions and change it without +fully understanding its consequences. This could create new issues down the road, e.g. a decision supporting +a requirement that is not tested. + +On the other hand, accepting the past decisions without challenging it might slow down the project and +possible innovations. It could lead to a situation where the developers are afraid to change anything +in order to not break the system. + +Past decisions have been made within context and the context can change. Therefore, past decisions can still be +valid today, or they don't apply anymore. In that case, the decision should be revisited. + +See also the blog post [Documenting Architecture Decisions](https://cognitect.com/blog/2011/11/15/documenting-architecture-decisions) +by Michael Nygard. + +There are many templates around to choose from. +gives a nice summary. + +# Decision + +We will document the decisions we make as a project as a collection of "Architecture Decision Records". +In order to keep it simple, we will use only a simple template proposed by Michael Nygard. +The documents are stored together with the source code and are part of the generated documentation site. + +# Status + +{{ page.adr_status }} + +# Consequences + +Explicitly documenting decisions has the benefit that new developers joining the projects know about the decisions +and can read the context and consequences of the decisions. This will likely also improve the overall quality +as the decisions need to be formulated and written down. Everybody is on the same page. + +However, this also adds additional tasks, and it takes time to write down and document the decisions. diff --git a/docs/pages/pmd/projectdocs/decisions/adr-NNN.md b/docs/pages/pmd/projectdocs/decisions/adr-NNN.md new file mode 100644 index 0000000000..53ece1ee44 --- /dev/null +++ b/docs/pages/pmd/projectdocs/decisions/adr-NNN.md @@ -0,0 +1,27 @@ +--- +title: ADR NNN - Template +sidebar: pmd_sidebar +permalink: pmd_projectdocs_decisions_adr_NNN.html +adr: true +# Proposed / Accepted / Deprecated / Superseded +adr_status: "" +last_updated: July 2022 +--- + + + +# Context + +What is the issue that we're seeing that is motivating this decision or change? + +# Decision + +What is the change that we're proposing and/or doing? + +# Status + +{{ page.adr_status }} + +# Consequences + +What becomes easier or more difficult to do because of this change? From cbbe0e0cb0c6cf9fc25bcea4ffe3be1f9611fbe1 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 28 Jul 2022 14:29:02 +0200 Subject: [PATCH 006/108] [doc] Add "ADR 2 - Policy on the use of Kotlin for development" --- docs/pages/pmd/projectdocs/decisions/adr-2.md | 65 +++++++++++++++++++ .../pmd/projectdocs/decisions/adr-NNN.md | 1 + 2 files changed, 66 insertions(+) create mode 100644 docs/pages/pmd/projectdocs/decisions/adr-2.md diff --git a/docs/pages/pmd/projectdocs/decisions/adr-2.md b/docs/pages/pmd/projectdocs/decisions/adr-2.md new file mode 100644 index 0000000000..b02030f9af --- /dev/null +++ b/docs/pages/pmd/projectdocs/decisions/adr-2.md @@ -0,0 +1,65 @@ +--- +title: ADR 2 - Policy on the use of Kotlin for development +sidebar: pmd_sidebar +permalink: pmd_projectdocs_decisions_adr_2.html +sidebaractiveurl: /pmd_projectdocs_decisions.html +adr: true +# Proposed / Accepted / Deprecated / Superseded +adr_status: "Proposed" +last_updated: July 2022 +--- + +# Context + +We currently use Kotlin only for unit tests at some places (e.g. pmd-lang-test module provides a couple of base +test classes). We were cautious to expand Kotlin because of poor development support outside JetBrain's +IntelliJ IDEA. E.g. the [Kotlin Plugin for Eclipse](https://marketplace.eclipse.org/content/kotlin-plugin-eclipse) +doesn't work properly as described in the reviews. + +For VS Code there is a [Kotlin Plugin](https://marketplace.visualstudio.com/items?itemName=mathiasfrohlich.Kotlin) +with basic features. Online IDEs like gitpod.io and GitHub Codespaces are often based on VS Code. + +Using Kotlin means, that we accept, that PMD can only be developed with IntelliJ IDEA. This feels like a vendor lock-in. + +Also, bringing in a mix of languages might make maintenance a bit harder and make it harder for new contributors. +However - PMD is a tool that deals with many, many languages anyway, so this is maybe not a real argument. + +Nevertheless, extending the usage of Kotlin within PMD can also increase contributions. + +# Decision + +We are generally open to the idea to increase usage of Kotlin within PMD. In order to gain experience +and to keep it within bounds and therefore maintainable we came up with the following rules: + +* The module `pmd-core` should stay in plain Java. This helps in keeping binary compatibility when changing sources. + `pmd-core` contains the main APIs for all language modules. We currently release all modules at the same time, + so this is not a real problem for now. But that might change in the future: Because only few language modules have + actual changes per release, it doesn't really make sense to release everything as long as the modules stay + compatible. But that's another story. +* For (unit) testing, Kotlin can be used in `pmd-core` and in the language modules. The test frameworks can also + use Kotlin (`pmd-test` doesn't yet, `pmd-lang-test` does already). +* Additionally: from now on, we allow to have the individual language modules be implemented in different languages + when it makes sense. So, a language module might decide to use plain Java (like now) or also Kotlin + (or other languages if it fits). +* When mixing languages (e.g. Java + Kotlin), we need to care that the modules can still be used with plain Java. + E.g. when writing custom rules: `pmd-java` provides a couple of APIs for rules (like symbol table, type resolution) + and we should not force the users to use Kotlin (at least not for language modules which already exist and + for which users might have written custom rules in Java already). +* It is also possible to write the entire language module in Kotlin only. Then the rules would be written in Kotlin + as well. And the possible problems when mixing languages are gone. But that applies only for new language modules. + For compatibility reasons an existing language modules shouldn't be rewritten into Kotlin. That would be a + major version change. + +# Status + +{{ page.adr_status }} + +# Consequences + +Allowing more Kotlin in PMD can attract new contributions. It might make it easier to develop small DSLs. +Also, other languages than Kotlin could be used, e.g. for `pmd-scala` Scala might make sense. + +On the other side, other IDEs than IntelliJ IDEA will have a difficult time to deal with PMD's source code. +Eclipse can't be used practically anymore. + +Maintaining a polyglot code base with multiple languages is likely to be more challenging. diff --git a/docs/pages/pmd/projectdocs/decisions/adr-NNN.md b/docs/pages/pmd/projectdocs/decisions/adr-NNN.md index 53ece1ee44..8388f98136 100644 --- a/docs/pages/pmd/projectdocs/decisions/adr-NNN.md +++ b/docs/pages/pmd/projectdocs/decisions/adr-NNN.md @@ -2,6 +2,7 @@ title: ADR NNN - Template sidebar: pmd_sidebar permalink: pmd_projectdocs_decisions_adr_NNN.html +sidebaractiveurl: /pmd_projectdocs_decisions.html adr: true # Proposed / Accepted / Deprecated / Superseded adr_status: "" From 738c19b398d44be450a720707356c26ba1a2cffb Mon Sep 17 00:00:00 2001 From: Lynn <109954313+LynnBroe@users.noreply.github.com> Date: Wed, 24 Aug 2022 14:41:50 +0800 Subject: [PATCH 007/108] Update UnusedPrivateFieldRule.java revise SpyBean about unusedprivatefield --- .../pmd/lang/java/rule/bestpractices/UnusedPrivateFieldRule.java | 1 + 1 file changed, 1 insertion(+) diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedPrivateFieldRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedPrivateFieldRule.java index 06133f4bf4..7d89eb19c5 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedPrivateFieldRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedPrivateFieldRule.java @@ -58,6 +58,7 @@ public class UnusedPrivateFieldRule extends AbstractLombokAwareRule { defaultValues.add("org.mockito.Mock"); defaultValues.add("org.mockito.Spy"); defaultValues.add("org.springframework.boot.test.mock.mockito.MockBean"); + defaultValues.add("org.springframework.boot.test.mock.mockito.SpyBean"); return defaultValues; } From 292ec8983319049721ac9d3ce8dae7fc0ee2fd4f Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Wed, 24 Aug 2022 11:23:56 +0200 Subject: [PATCH 008/108] [java] ConstructorCallsOverridableMethod should consider method calls with var access Fixes #4099 --- docs/pages/release_notes.md | 3 +++ ...ConstructorCallsOverridableMethodRule.java | 10 +++++++-- .../xml/ConstructorCallsOverridableMethod.xml | 22 +++++++++++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md index b8f8783555..a952fb3e2b 100644 --- a/docs/pages/release_notes.md +++ b/docs/pages/release_notes.md @@ -16,6 +16,9 @@ This is a {{ site.pmd.release_type }} release. ### Fixed Issues +* java-errorprone + * [#4099](https://github.com/pmd/pmd/issues/4099): \[java] ConstructorCallsOverridableMethod should consider method calls with var access + ### API Changes ### External Contributions diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java index 740842f9fc..f099ea315e 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java @@ -38,6 +38,7 @@ import net.sourceforge.pmd.lang.java.ast.ASTReferenceType; import net.sourceforge.pmd.lang.java.ast.ASTType; import net.sourceforge.pmd.lang.java.ast.AccessNode; import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule; +import net.sourceforge.pmd.lang.java.typeresolution.typedefinition.JavaTypeDefinition; /** * Searches through all methods and constructors called from constructors. It @@ -1083,8 +1084,13 @@ public final class ConstructorCallsOverridableMethodRule extends AbstractJavaRul type = "long"; } } else if (arg.getChild(0) instanceof ASTName) { - // ASTName n = (ASTName)arg.getChild(0); - type = "ref"; + ASTName n = (ASTName) (arg.getChild(0)); + JavaTypeDefinition typeDefinition = n.getTypeDefinition(); + if (typeDefinition != null) { + type = typeDefinition.getType().getName(); + } else { + type = "ref"; + } } } argumentTypes.add(type); diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml index f6fc70406f..1d0ac78c9b 100644 --- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml +++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml @@ -320,4 +320,26 @@ import java.lang.annotation.*; } ]]> + + [java] ConstructorCallsOverridableMethod should consider method calls with var access #4099 + 2 + 4,11 + + From bc21be40722cee3e0fbff3f99734ca4be02722f7 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Wed, 24 Aug 2022 12:18:48 +0200 Subject: [PATCH 009/108] Fix handling of reference types --- .../ConstructorCallsOverridableMethodRule.java | 7 ++++++- .../xml/ConstructorCallsOverridableMethod.xml | 10 ++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java index f099ea315e..9e60c58230 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java @@ -1048,7 +1048,12 @@ public final class ConstructorCallsOverridableMethodRule extends AbstractJavaRul if (type.getChild(0) instanceof ASTPrimitiveType) { parameterTypes.add(type.getChild(0).getImage()); } else if (type.getChild(0) instanceof ASTReferenceType) { - parameterTypes.add("ref"); + JavaTypeDefinition typeDefinition = type.getTypeDefinition(); + if (typeDefinition != null) { + parameterTypes.add(typeDefinition.getType().getName()); + } else { + parameterTypes.add("ref"); + } } else { parameterTypes.add(""); } diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml index 1d0ac78c9b..bb4568c073 100644 --- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml +++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml @@ -322,8 +322,8 @@ import java.lang.annotation.*; [java] ConstructorCallsOverridableMethod should consider method calls with var access #4099 - 2 - 4,11 + 3 + 4,11,18 From 596f1296001ede2c4047f767b08bc196cc72f9de Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Wed, 24 Aug 2022 15:04:43 +0200 Subject: [PATCH 010/108] Fix False positive with public method call on new instance --- ...ConstructorCallsOverridableMethodRule.java | 18 ++++++------ .../xml/ConstructorCallsOverridableMethod.xml | 28 +++++++++++++++++++ 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java index 9e60c58230..343498ba38 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java @@ -14,6 +14,7 @@ import java.util.Set; import java.util.TreeMap; import net.sourceforge.pmd.lang.ast.Node; +import net.sourceforge.pmd.lang.java.ast.ASTAllocationExpression; import net.sourceforge.pmd.lang.java.ast.ASTAnnotationTypeDeclaration; import net.sourceforge.pmd.lang.java.ast.ASTArgumentList; import net.sourceforge.pmd.lang.java.ast.ASTArguments; @@ -275,21 +276,18 @@ public final class ConstructorCallsOverridableMethodRule extends AbstractJavaRul // check prefix type match ASTPrimaryPrefix child2 = (ASTPrimaryPrefix) child; if (getNameFromPrefix(child2) == null) { - if (child2.getImage() == null) { + if (child2.usesThisModifier()) { thisIndex = x; break; - } else { - // happens when super is used - // [super.method(): image = 'method'] + } else if (child2.usesSuperModifier()) { superFirst = true; thisIndex = x; - // the true super is at an unusable - // index because super.method() has only - // 2 nodes [method=0,()=1] - // as opposed to the 3 you might expect - // and which this.method() actually has. - // [this=0,method=1.()=2] break; + } else if (child2.getFirstChildOfType(ASTAllocationExpression.class) != null) { + // change of scope - the method call is neither on this or super, + // but on a different instance. + // ignore this method call + return null; } } } diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml index bb4568c073..82903ec954 100644 --- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml +++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml @@ -346,6 +346,34 @@ class Foo3 { } public void bar(String s) {} } +]]> + + + False positive with public method call on new instance + 2 + 4,5 + From 64675dc60045cf1465d52fd5cba4f7f5e133459f Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Wed, 24 Aug 2022 15:35:44 +0200 Subject: [PATCH 011/108] Fix handling of array types --- ...ConstructorCallsOverridableMethodRule.java | 20 +++++------- .../xml/ConstructorCallsOverridableMethod.xml | 32 +++++++++++++++++-- 2 files changed, 38 insertions(+), 14 deletions(-) diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java index 343498ba38..24389963d3 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java @@ -33,10 +33,9 @@ import net.sourceforge.pmd.lang.java.ast.ASTName; import net.sourceforge.pmd.lang.java.ast.ASTPrimaryExpression; import net.sourceforge.pmd.lang.java.ast.ASTPrimaryPrefix; import net.sourceforge.pmd.lang.java.ast.ASTPrimarySuffix; -import net.sourceforge.pmd.lang.java.ast.ASTPrimitiveType; import net.sourceforge.pmd.lang.java.ast.ASTRecordDeclaration; -import net.sourceforge.pmd.lang.java.ast.ASTReferenceType; import net.sourceforge.pmd.lang.java.ast.ASTType; +import net.sourceforge.pmd.lang.java.ast.ASTVariableDeclaratorId; import net.sourceforge.pmd.lang.java.ast.AccessNode; import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule; import net.sourceforge.pmd.lang.java.typeresolution.typedefinition.JavaTypeDefinition; @@ -1043,17 +1042,14 @@ public final class ConstructorCallsOverridableMethodRule extends AbstractJavaRul if (parameters != null) { for (ASTFormalParameter p : parameters) { ASTType type = p.getFirstChildOfType(ASTType.class); - if (type.getChild(0) instanceof ASTPrimitiveType) { - parameterTypes.add(type.getChild(0).getImage()); - } else if (type.getChild(0) instanceof ASTReferenceType) { - JavaTypeDefinition typeDefinition = type.getTypeDefinition(); - if (typeDefinition != null) { - parameterTypes.add(typeDefinition.getType().getName()); - } else { - parameterTypes.add("ref"); - } + ASTVariableDeclaratorId varId = p.getFirstChildOfType(ASTVariableDeclaratorId.class); + + JavaTypeDefinition typeDefinition = type.getTypeDefinition(); + if (typeDefinition != null) { + typeDefinition = typeDefinition.withDimensions(varId.getArrayDepth()); + parameterTypes.add(typeDefinition.getType().getName()); } else { - parameterTypes.add(""); + parameterTypes.add("ref"); } } } diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml index 82903ec954..e68d1bfc0a 100644 --- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml +++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml @@ -322,8 +322,8 @@ import java.lang.annotation.*; [java] ConstructorCallsOverridableMethod should consider method calls with var access #4099 - 3 - 4,11,18 + 7 + 4,11,18,25,32,39,46 From a4afb5966745d16b1771ea57811c998d69daa7a9 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Wed, 24 Aug 2022 15:53:13 +0200 Subject: [PATCH 012/108] Fix handling of varargs --- ...ConstructorCallsOverridableMethodRule.java | 3 +++ .../xml/ConstructorCallsOverridableMethod.xml | 21 +++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java index 24389963d3..a38495bd5d 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java @@ -1047,6 +1047,9 @@ public final class ConstructorCallsOverridableMethodRule extends AbstractJavaRul JavaTypeDefinition typeDefinition = type.getTypeDefinition(); if (typeDefinition != null) { typeDefinition = typeDefinition.withDimensions(varId.getArrayDepth()); + if (p.isVarargs()) { + typeDefinition = typeDefinition.withDimensions(1); + } parameterTypes.add(typeDefinition.getType().getName()); } else { parameterTypes.add("ref"); diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml index e68d1bfc0a..2fa3ae0229 100644 --- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml +++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml @@ -322,9 +322,12 @@ import java.lang.annotation.*; [java] ConstructorCallsOverridableMethod should consider method calls with var access #4099 - 7 - 4,11,18,25,32,39,46 + 9 + 7,14,21,28,35,42,49,56,63 { + public Foo9(Set arg) { + bar(arg); // should report a warning at this line + } + public void bar(Collection s) {} // base type +} ]]> From 5f0cb7d757cab81c33a15b487122a7d610a04835 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Wed, 24 Aug 2022 16:18:09 +0200 Subject: [PATCH 013/108] Support subtyping --- ...ConstructorCallsOverridableMethodRule.java | 156 ++++++++---------- 1 file changed, 71 insertions(+), 85 deletions(-) diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java index a38495bd5d..fb69536e23 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java @@ -18,7 +18,6 @@ import net.sourceforge.pmd.lang.java.ast.ASTAllocationExpression; import net.sourceforge.pmd.lang.java.ast.ASTAnnotationTypeDeclaration; import net.sourceforge.pmd.lang.java.ast.ASTArgumentList; import net.sourceforge.pmd.lang.java.ast.ASTArguments; -import net.sourceforge.pmd.lang.java.ast.ASTBooleanLiteral; import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceDeclaration; import net.sourceforge.pmd.lang.java.ast.ASTCompilationUnit; import net.sourceforge.pmd.lang.java.ast.ASTConstructorDeclaration; @@ -179,11 +178,11 @@ public final class ConstructorCallsOverridableMethodRule extends AbstractJavaRul private List referenceNames; private List qualifierNames; private int argumentSize; - private List argumentTypes; + private List> argumentTypes; private boolean superCall; private MethodInvocation(ASTPrimaryExpression ape, List qualifierNames, List referenceNames, - String name, int argumentSize, List argumentTypes, boolean superCall) { + String name, int argumentSize, List> argumentTypes, boolean superCall) { this.ape = ape; this.qualifierNames = qualifierNames; this.referenceNames = referenceNames; @@ -205,7 +204,7 @@ public final class ConstructorCallsOverridableMethodRule extends AbstractJavaRul return argumentSize; } - public List getArgumentTypes() { + public List> getArgumentTypes() { return argumentTypes; } @@ -221,6 +220,15 @@ public final class ConstructorCallsOverridableMethodRule extends AbstractJavaRul return ape; } + public boolean matches(ASTMethodDeclaration methodDeclaration) { + String methName = methodDeclaration.getName(); + int count = methodDeclaration.getArity(); + List> parameterTypes = getMethodDeclaratorParameterTypes(methodDeclaration); + return methName.equals(getName()) + && getArgumentCount() == count + && compareParameterAndArgumentTypes(parameterTypes, getArgumentTypes()); + } + public static MethodInvocation getMethod(ASTPrimaryExpression node) { MethodInvocation meth = null; int i = node.getNumChildren(); @@ -238,7 +246,7 @@ public final class ConstructorCallsOverridableMethodRule extends AbstractJavaRul String methodName = null; ASTArguments args = (ASTArguments) lastNode.getChild(0); int numOfArguments = args.size(); - List argumentTypes = ConstructorCallsOverridableMethodRule.getArgumentTypes(args); + List> argumentTypes = ConstructorCallsOverridableMethodRule.getArgumentTypes(args); boolean superFirst = false; int thisIndex = -1; @@ -448,7 +456,7 @@ public final class ConstructorCallsOverridableMethodRule extends AbstractJavaRul private ASTExplicitConstructorInvocation eci; private String name; private int count = 0; - private List argumentTypes = new ArrayList<>(); + private List> argumentTypes = new ArrayList<>(); ConstructorInvocation(ASTExplicitConstructorInvocation eci) { this.eci = eci; @@ -469,13 +477,19 @@ public final class ConstructorCallsOverridableMethodRule extends AbstractJavaRul return count; } - public List getArgumentTypes() { + public List> getArgumentTypes() { return argumentTypes; } public String getName() { return name; } + + public boolean matches(ASTConstructorDeclaration constructorDeclaration) { + int matchConstArgCount = constructorDeclaration.getArity(); + List> parameterTypes = getMethodDeclaratorParameterTypes(constructorDeclaration); + return matchConstArgCount == getArgumentCount() && compareParameterAndArgumentTypes(parameterTypes, getArgumentTypes()); + } } private static final class MethodHolder { @@ -673,14 +687,8 @@ public final class ConstructorCallsOverridableMethodRule extends AbstractJavaRul for (MethodInvocation meth : getCurrentEvalPackage().calledMethods) { // check against each dangerous method in class for (MethodHolder h : getCurrentEvalPackage().allMethodsOfClass.keySet()) { - if (h.isDangerous()) { - String methName = h.getASTMethodDeclaration().getName(); - int count = h.getASTMethodDeclaration().getArity(); - List parameterTypes = getMethodDeclaratorParameterTypes(h.getASTMethodDeclaration()); - if (methName.equals(meth.getName()) && meth.getArgumentCount() == count - && parameterTypes.equals(meth.getArgumentTypes())) { - addViolation(data, meth.getASTPrimaryExpression(), "method '" + h.getCalled() + "'"); - } + if (h.isDangerous() && meth.matches(h.getASTMethodDeclaration())) { + addViolation(data, meth.getASTPrimaryExpression(), "method '" + h.getCalled() + "'"); } } } @@ -737,19 +745,13 @@ public final class ConstructorCallsOverridableMethodRule extends AbstractJavaRul // System.out.println("Called meth is " + meth); for (MethodHolder h3 : classMethodMap.keySet()) { // need to skip self here h == h3 - if (h3.isDangerous()) { - String matchMethodName = h3.getASTMethodDeclaration().getName(); - int matchMethodParamCount = h3.getASTMethodDeclaration().getArity(); - List parameterTypes = getMethodDeclaratorParameterTypes(h3.getASTMethodDeclaration()); + if (h3.isDangerous() && meth.matches(h3.getASTMethodDeclaration())) { // System.out.println("matching " + matchMethodName + " // to " + meth.getName()); - if (matchMethodName.equals(meth.getName()) && matchMethodParamCount == meth.getArgumentCount() - && parameterTypes.equals(meth.getArgumentTypes())) { - h.setDangerous(); - h.setCalledMethod(matchMethodName); - found = true; - break; - } + h.setDangerous(); + h.setCalledMethod(meth.getName()); + found = true; + break; } } } @@ -786,19 +788,13 @@ public final class ConstructorCallsOverridableMethodRule extends AbstractJavaRul // check each of the already evaluated methods: need to // optimize this out for (MethodHolder h : evaluatedMethods) { - if (h.isDangerous()) { - String matchName = h.getASTMethodDeclaration().getName(); - int matchParamCount = h.getASTMethodDeclaration().getArity(); - List parameterTypes = getMethodDeclaratorParameterTypes(h.getASTMethodDeclaration()); - if (methName.equals(matchName) && methArgCount == matchParamCount - && parameterTypes.equals(meth.getArgumentTypes())) { - ch.setDangerous(true); - // System.out.println("evaluateDangerOfConstructors1 - // setting dangerous constructor with " + - // ch.getASTConstructorDeclaration().getParameterCount() - // + " params"); - break; - } + if (h.isDangerous() && meth.matches(h.getASTMethodDeclaration())) { + ch.setDangerous(true); + // System.out.println("evaluateDangerOfConstructors1 + // setting dangerous constructor with " + + // ch.getASTConstructorDeclaration().getParameterCount() + // + " params"); + break; } } } @@ -825,23 +821,18 @@ public final class ConstructorCallsOverridableMethodRule extends AbstractJavaRul } // if its not dangerous then evaluate if it should be // if it calls dangerous constructor mark it as dangerous - int cCount = calledC.getArgumentCount(); for (Iterator innerConstIter = classConstructorMap.keySet().iterator(); innerConstIter .hasNext() && !ch.isDangerous();) { // forget skipping self because that introduces another // check for each, but only 1 hit ConstructorHolder h2 = innerConstIter.next(); - if (h2.isDangerous()) { - int matchConstArgCount = h2.getASTConstructorDeclaration().getArity(); - List parameterTypes = getMethodDeclaratorParameterTypes(h2.getASTConstructorDeclaration()); - if (matchConstArgCount == cCount && parameterTypes.equals(calledC.getArgumentTypes())) { - ch.setDangerous(true); - found = true; - // System.out.println("evaluateDangerOfConstructors2 - // setting dangerous constructor with " + - // ch.getASTConstructorDeclaration().getParameterCount() - // + " params"); - } + if (h2.isDangerous() && calledC.matches(h2.getASTConstructorDeclaration())) { + ch.setDangerous(true); + found = true; + // System.out.println("evaluateDangerOfConstructors2 + // setting dangerous constructor with " + + // ch.getASTConstructorDeclaration().getParameterCount() + // + " params"); } } } @@ -1036,9 +1027,9 @@ public final class ConstructorCallsOverridableMethodRule extends AbstractJavaRul return name; } - private static List getMethodDeclaratorParameterTypes(ASTMethodOrConstructorDeclaration methodOrConstructorDeclarator) { + private static List> getMethodDeclaratorParameterTypes(ASTMethodOrConstructorDeclaration methodOrConstructorDeclarator) { ASTFormalParameters parameters = methodOrConstructorDeclarator.getFirstDescendantOfType(ASTFormalParameters.class); - List parameterTypes = new ArrayList<>(); + List> parameterTypes = new ArrayList<>(); if (parameters != null) { for (ASTFormalParameter p : parameters) { ASTType type = p.getFirstChildOfType(ASTType.class); @@ -1050,54 +1041,49 @@ public final class ConstructorCallsOverridableMethodRule extends AbstractJavaRul if (p.isVarargs()) { typeDefinition = typeDefinition.withDimensions(1); } - parameterTypes.add(typeDefinition.getType().getName()); + parameterTypes.add(typeDefinition.getType()); } else { - parameterTypes.add("ref"); + parameterTypes.add(null); // unknown type } } } return parameterTypes; } - private static List getArgumentTypes(ASTArguments args) { - List argumentTypes = new ArrayList<>(); + private static List> getArgumentTypes(ASTArguments args) { + List> argumentTypes = new ArrayList<>(); ASTArgumentList argumentList = args.getFirstChildOfType(ASTArgumentList.class); if (argumentList != null) { for (int a = 0; a < argumentList.getNumChildren(); a++) { Node expression = argumentList.getChild(a); ASTPrimaryPrefix arg = expression.getFirstDescendantOfType(ASTPrimaryPrefix.class); - String type = ""; - if (arg != null && arg.getNumChildren() > 0) { - if (arg.getChild(0) instanceof ASTLiteral) { - ASTLiteral lit = (ASTLiteral) arg.getChild(0); - if (lit.isCharLiteral()) { - type = "char"; - } else if (lit.isFloatLiteral()) { - type = "float"; - } else if (lit.isIntLiteral()) { - type = "int"; - } else if (lit.isStringLiteral()) { - type = "String"; - } else if (lit.getNumChildren() > 0 && lit.getChild(0) instanceof ASTBooleanLiteral) { - type = "boolean"; - } else if (lit.isDoubleLiteral()) { - type = "double"; - } else if (lit.isLongLiteral()) { - type = "long"; - } - } else if (arg.getChild(0) instanceof ASTName) { - ASTName n = (ASTName) (arg.getChild(0)); - JavaTypeDefinition typeDefinition = n.getTypeDefinition(); - if (typeDefinition != null) { - type = typeDefinition.getType().getName(); - } else { - type = "ref"; - } - } + Class type = null; + JavaTypeDefinition typeDefinition = arg.getTypeDefinition(); + if (typeDefinition != null) { + type = typeDefinition.getType(); } argumentTypes.add(type); } } return argumentTypes; } + + private static boolean compareParameterAndArgumentTypes(List> parameters, List> arguments) { + if (parameters.size() != arguments.size()) { + return false; + } + + for (int i = 0; i < parameters.size(); i++) { + Class param = parameters.get(i); + Class argument = arguments.get(i); + + if (param != null && argument != null + && param != argument + && !param.isAssignableFrom(argument)) { + return false; + } + } + + return true; + } } From f58719f7a6ea2292c5f2e053efefb844ca6d3d0e Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Wed, 24 Aug 2022 16:33:38 +0200 Subject: [PATCH 014/108] Fix NPE --- .../ConstructorCallsOverridableMethodRule.java | 8 ++++++-- .../xml/ConstructorCallsOverridableMethod.xml | 11 +++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java index fb69536e23..31488b455d 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java @@ -11,6 +11,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.StringTokenizer; import java.util.TreeMap; import net.sourceforge.pmd.lang.ast.Node; @@ -390,8 +391,11 @@ public final class ConstructorCallsOverridableMethodRule extends AbstractJavaRul String toParse = getNameFromPrefix(child); // System.out.println("parsing for var names in : " // + toParse); - java.util.StringTokenizer st = new java.util.StringTokenizer(toParse, "."); - while (st.hasMoreTokens()) { + StringTokenizer st = null; + if (toParse != null) { + st = new StringTokenizer(toParse, "."); + } + while (st != null && st.hasMoreTokens()) { String value = st.nextToken(); if (!st.hasMoreTokens()) { if (i == 2) { diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml index 2fa3ae0229..4714a3f953 100644 --- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml +++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml @@ -419,6 +419,17 @@ class Foo { public void publicMethod() { } } +]]> + + + NPE when trying to find method name of method call + 0 + From e3145b0e36f9ed24d85a7af855033af06957f9b0 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Wed, 24 Aug 2022 16:38:04 +0200 Subject: [PATCH 015/108] Fix PMD - unused local variables --- .../rule/errorprone/ConstructorCallsOverridableMethodRule.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java index 31488b455d..3a642ed7ff 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java @@ -787,8 +787,6 @@ public final class ConstructorCallsOverridableMethodRule extends AbstractJavaRul // but were never evaluated, // they need reevaluation MethodInvocation meth = calledMethsIter.next(); // CCE - String methName = meth.getName(); - int methArgCount = meth.getArgumentCount(); // check each of the already evaluated methods: need to // optimize this out for (MethodHolder h : evaluatedMethods) { From c374d3934fe08fce176bebd14c328e569c65b6d4 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Wed, 31 Aug 2022 19:52:02 +0200 Subject: [PATCH 016/108] Bump pmd from 6.48.0 to 6.49.0 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index bfe3fe4c34..9036d17f18 100644 --- a/pom.xml +++ b/pom.xml @@ -407,22 +407,22 @@ net.sourceforge.pmd pmd-core - 6.48.0 + 6.49.0 net.sourceforge.pmd pmd-java - 6.48.0 + 6.49.0 net.sourceforge.pmd pmd-jsp - 6.48.0 + 6.49.0 net.sourceforge.pmd pmd-javascript - 6.48.0 + 6.49.0 From ca2ee055626cd251d1718e96762639063681b46b Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 1 Sep 2022 10:49:48 +0200 Subject: [PATCH 017/108] [doc] Add page for 3rd party rulesets --- docs/_data/sidebars/pmd_sidebar.yml | 3 ++ docs/pages/pmd/projectdocs/trivia/news.md | 31 ++++++++++++++++----- docs/pages/pmd/userdocs/3rdpartyrulesets.md | 27 ++++++++++++++++++ 3 files changed, 54 insertions(+), 7 deletions(-) create mode 100644 docs/pages/pmd/userdocs/3rdpartyrulesets.md diff --git a/docs/_data/sidebars/pmd_sidebar.yml b/docs/_data/sidebars/pmd_sidebar.yml index f7ab16ddb0..e0e3854f86 100644 --- a/docs/_data/sidebars/pmd_sidebar.yml +++ b/docs/_data/sidebars/pmd_sidebar.yml @@ -58,6 +58,9 @@ entries: - title: PMD Report formats url: /pmd_userdocs_report_formats.html output: web, pdf + - title: 3rd party rulesets + output: web, pdf + url: /pmd_userdocs_3rdpartyrulesets.html - title: null output: web, pdf subfolders: diff --git a/docs/pages/pmd/projectdocs/trivia/news.md b/docs/pages/pmd/projectdocs/trivia/news.md index 8fb06bbd4c..2cf8db566d 100644 --- a/docs/pages/pmd/projectdocs/trivia/news.md +++ b/docs/pages/pmd/projectdocs/trivia/news.md @@ -9,26 +9,43 @@ author: Tom Copeland ### Salesforce / Apex Language Module +* October 2020 - [Salesforce CLI Scanner Custom XPath Rules - Part 1](https://bobbuzzard.blogspot.com/2020/10/salesforce-cli-scanner-custom-xpath.html), + [Salesforce CLI Scanner Custom XPath Rules - Part 2](http://bobbuzzard.blogspot.com/2020/10/salesforce-cli-scanner-custom-xpath_11.html) + by [Keir Bowden](https://twitter.com/bob_buzzard) + * March 2020 - [Helping Salesforce developers create readable and maintainable Apex code](https://gearset.com/blog/helping-sf-developers-create-readable-and-maintainable-apex-code) * July 2019 - [Apex PMD \| Static code analysis - Apex Hours](https://youtu.be/34PxAHtAavU) -* June 2019 - [Pluralsight](https://www.pluralsight.com/authors/don-robins) Course about leveraging PMD usage for Salesforce by [Robert Sösemann](https://github.com/rsoesemann) (Apex Language Module Contributor) [Play by Play: Automated Code Analysis in Salesforce - a Tools Deep-Dive](https://www.pluralsight.com/courses/play-by-play-automated-code-analysis-in-salesforce) +* June 2019 - [Pluralsight](https://www.pluralsight.com/authors/don-robins) Course about leveraging PMD usage for + Salesforce by [Robert Sösemann](https://github.com/rsoesemann) (Apex Language Module Contributor) + [Play by Play: Automated Code Analysis in Salesforce - a Tools Deep-Dive](https://www.pluralsight.com/courses/play-by-play-automated-code-analysis-in-salesforce) -* June 2018 - [Salesforce Way Podcast](https://salesforceway.com/podcast/podcast/) with [Robert Sösemann](https://github.com/rsoesemann) [Static Code Analysis with PMD for Apex](https://salesforceway.com/podcast/podcast/static-code-analysis-with-pmd-for-apex/) +* June 2018 - [Salesforce Way Podcast](https://salesforceway.com/podcast/podcast/) with + [Robert Sösemann](https://github.com/rsoesemann) [Static Code Analysis with PMD for Apex](https://salesforceway.com/podcast/podcast/static-code-analysis-with-pmd-for-apex/) -* January 2018 - [Webinar: How to contribute Apex rules to PMD with Robert Sösemann](https://www.youtube.com/watch?v=7_Ex9WWS_3Q) +* January 2018 - [Webinar: How to contribute Apex rules to PMD with Robert Sösemann](https://www.youtube.com/watch?v=7_Ex9WWS_3Q) -* August 2017 - Webinar about how to use PMD with The Welkin Suite Salesforce IDE - Author [Robert Sösemann](https://github.com/rsoesemann) - [Improving your Apex Code Quality with PMD in The Welkin Suite](https://www.youtube.com/watch?v=Ypyiy5b6huc) +* August 2017 - Webinar about how to use PMD with The Welkin Suite Salesforce IDE - Author + [Robert Sösemann](https://github.com/rsoesemann) - [Improving your Apex Code Quality with PMD in The Welkin Suite](https://www.youtube.com/watch?v=Ypyiy5b6huc) -* November 2016 - Recording of [Robert Sösemann](https://github.com/rsoesemann)'s Session at Salesforce Dreamforce Conference about enforcing Clean Code in the Salesforce world using PMD and other tools [Clean Apex Code with Automatic Code Metrics](https://www.youtube.com/watch?v=bW7m6y6bEug) +* November 2016 - Recording of [Robert Sösemann](https://github.com/rsoesemann)'s Session at Salesforce Dreamforce + Conference about enforcing Clean Code in the Salesforce world using PMD and other tools + [Clean Apex Code with Automatic Code Metrics](https://www.youtube.com/watch?v=bW7m6y6bEug) ### PMD in general and other Language Modules -* February 2021 - Artem Krosheninnikov's talk about Quality Assurance Automation: [Artem Krosheninnikov, Wrike - How static analysis can help in QAA processes](https://www.youtube.com/watch?v=L42zH5ne074) +* February 2021 - Artem Krosheninnikov's talk about Quality Assurance Automation: + [Artem Krosheninnikov, Wrike - How static analysis can help in QAA processes]( + https://www.youtube.com/watch?v=L42zH5ne074) -* May 2019 - [Code quality assurance with PMD – An extensible static code analyser for Java and other languages](https://www.datarespons.com/code-quality-assurance-with-pmd/) +* December 2020 - Jeroen Borgers' talk about finding performance bugs with PMD: + [J-Fall Virtual 2020: Jeroen Borgers - Fixing your performance and concurrency bugs before they bite you]( + https://www.youtube.com/watch?v=Z_sT38KTRNk) + +* May 2019 - [Code quality assurance with PMD – An extensible static code analyser for Java and other languages]( + https://www.datarespons.com/code-quality-assurance-with-pmd/) * February 2012 - Romain Pelisse's lightning talk at FOSDEM 2012 about "PMD5: What can it do for you?". [Video recording is available](http://video.fosdem.org/2012/lightningtalks/PMD5.webm). diff --git a/docs/pages/pmd/userdocs/3rdpartyrulesets.md b/docs/pages/pmd/userdocs/3rdpartyrulesets.md new file mode 100644 index 0000000000..ecbfee2818 --- /dev/null +++ b/docs/pages/pmd/userdocs/3rdpartyrulesets.md @@ -0,0 +1,27 @@ +--- +title: 3rd party rulesets +tags: [rule_references, userdocs] +summary: Lists rulesets and rules from the community +permalink: pmd_userdocs_3rdpartyrulesets.html +last_updated: September 2022 +--- + +## For Java + +* **jPinpoint rules:** PMD rule set for performance aware Java and Kotlin coding. + * +* **arch4u-pmd** is a library with pmd rules that bring new regulations related to known problems in REST API, logging, + monitoring, etc., including reconfigured default pmd rules to decrease false-positive violations during usage of + well-known frameworks like Spring, Quarkus, etc. + * +* Sample ruleset from **maxdocs**, a multi markup wiki engine. + * +* Sample ruleset from **geotools**, an open source Java library that provides tools for geospatial data. + * + * + + +## For Apex +* **unhappy-soup**, a repository with problematic Salesforce code to showcase PMD, the SFDX Scanner CLI + * + From ba0f2a2bfd0d3b4c3cd7a62fb5682dc4ad0e01ef Mon Sep 17 00:00:00 2001 From: LynnBroe Date: Mon, 5 Sep 2022 21:16:13 +0800 Subject: [PATCH 018/108] Update UnusedPrivateField.xml --- .../rule/bestpractices/xml/UnusedPrivateField.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/UnusedPrivateField.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/UnusedPrivateField.xml index 3574634255..3b6c0af121 100644 --- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/UnusedPrivateField.xml +++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/UnusedPrivateField.xml @@ -742,6 +742,19 @@ public class MyTest { void test() { target.methodToTest(); } +} + ]]> + + + + #4037 false positive with Spring @SpyBean + 0 + From 0f99ef0c3c5168356f8785e7d3ba289df397820d Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Tue, 6 Sep 2022 18:33:26 +0200 Subject: [PATCH 019/108] [html] Bump jsoup from 1.14.3 to 1.15.3 Fixes https://github.com/pmd/pmd/security/dependabot/23 CVE-2022-36033 https://github.com/advisories/GHSA-gp7f-rwcx-9369 --- pmd-html/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmd-html/pom.xml b/pmd-html/pom.xml index bbd5c0a746..cab9828d2d 100644 --- a/pmd-html/pom.xml +++ b/pmd-html/pom.xml @@ -31,7 +31,7 @@ org.jsoup jsoup - 1.14.3 + 1.15.3 From 898454510d2a3d89dcf5b5aedb3dd4f025077d03 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Tue, 6 Sep 2022 19:28:11 +0200 Subject: [PATCH 020/108] [doc] Update ADRs from PR review comments --- docs/pages/pmd/projectdocs/decisions.md | 2 +- docs/pages/pmd/projectdocs/decisions/adr-1.md | 22 ++++++++++++++++--- docs/pages/pmd/projectdocs/decisions/adr-2.md | 20 ++++++++++------- .../pmd/projectdocs/decisions/adr-NNN.md | 8 ++++++- 4 files changed, 39 insertions(+), 13 deletions(-) diff --git a/docs/pages/pmd/projectdocs/decisions.md b/docs/pages/pmd/projectdocs/decisions.md index fd130d53af..af0258c29c 100644 --- a/docs/pages/pmd/projectdocs/decisions.md +++ b/docs/pages/pmd/projectdocs/decisions.md @@ -1,5 +1,5 @@ --- -title: Architecture Design Decisions +title: Architecture Decisions sidebar: pmd_sidebar permalink: pmd_projectdocs_decisions.html last_updated: July 2022 diff --git a/docs/pages/pmd/projectdocs/decisions/adr-1.md b/docs/pages/pmd/projectdocs/decisions/adr-1.md index e7208f9761..07bf1f84fa 100644 --- a/docs/pages/pmd/projectdocs/decisions/adr-1.md +++ b/docs/pages/pmd/projectdocs/decisions/adr-1.md @@ -6,7 +6,7 @@ sidebaractiveurl: /pmd_projectdocs_decisions.html adr: true # Proposed / Accepted / Deprecated / Superseded adr_status: "Proposed" -last_updated: July 2022 +last_updated: September 2022 --- # Context @@ -31,7 +31,7 @@ See also the blog post [Documenting Architecture Decisions](https://cognitect.co by Michael Nygard. There are many templates around to choose from. -gives a nice summary. +gives a nice summary. The page gives a good overview on ADR and for adr-related tooling. # Decision @@ -39,9 +39,19 @@ We will document the decisions we make as a project as a collection of "Architec In order to keep it simple, we will use only a simple template proposed by Michael Nygard. The documents are stored together with the source code and are part of the generated documentation site. +A new ADR should be proposed with a pull request to open the discussion. +The initial status of the new ADR is "Proposed". When maintainer consensus is reached during the PR +review, then the status is changed to "Accepted" when the PR is merged. +A new entry in the "Change History" section should be added, when the PR is merged. + +In order to propose a change to an existing ADR a new pull request should be opened which modifies the ADR. +The change can be to amend the ADR or to challenge it and maybe deprecate it. A new entry in the +"Change History" section should be added to summary the change. When maintainer consensus is reached +during the PR review, then the PR can be merged and the ADR is updated. + # Status -{{ page.adr_status }} +{{ page.adr_status }} (Last updated: {{ page.last_updated }}) # Consequences @@ -50,3 +60,9 @@ and can read the context and consequences of the decisions. This will likely als as the decisions need to be formulated and written down. Everybody is on the same page. However, this also adds additional tasks, and it takes time to write down and document the decisions. + +# Change History + +2022-09-06: Added section "Change History" to the template. Added "Last updated" to "Status" section. + +2022-07-28: Proposed initial version. diff --git a/docs/pages/pmd/projectdocs/decisions/adr-2.md b/docs/pages/pmd/projectdocs/decisions/adr-2.md index b02030f9af..1e77d6af2c 100644 --- a/docs/pages/pmd/projectdocs/decisions/adr-2.md +++ b/docs/pages/pmd/projectdocs/decisions/adr-2.md @@ -6,7 +6,7 @@ sidebaractiveurl: /pmd_projectdocs_decisions.html adr: true # Proposed / Accepted / Deprecated / Superseded adr_status: "Proposed" -last_updated: July 2022 +last_updated: September 2022 --- # Context @@ -39,27 +39,31 @@ and to keep it within bounds and therefore maintainable we came up with the foll * For (unit) testing, Kotlin can be used in `pmd-core` and in the language modules. The test frameworks can also use Kotlin (`pmd-test` doesn't yet, `pmd-lang-test` does already). * Additionally: from now on, we allow to have the individual language modules be implemented in different languages - when it makes sense. So, a language module might decide to use plain Java (like now) or also Kotlin - (or other languages if it fits). + when it makes sense. So, a language module might decide to use plain Java (like now) or also Kotlin. * When mixing languages (e.g. Java + Kotlin), we need to care that the modules can still be used with plain Java. E.g. when writing custom rules: `pmd-java` provides a couple of APIs for rules (like symbol table, type resolution) and we should not force the users to use Kotlin (at least not for language modules which already exist and for which users might have written custom rules in Java already). * It is also possible to write the entire language module in Kotlin only. Then the rules would be written in Kotlin as well. And the possible problems when mixing languages are gone. But that applies only for new language modules. - For compatibility reasons an existing language modules shouldn't be rewritten into Kotlin. That would be a +* When refactoring an existing language module from Java only to introduce Kotlin, care needs to be taken to + not make incompatible changes. If compatibility (binary or source) can't be maintained, then that would be a major version change. # Status -{{ page.adr_status }} +{{ page.adr_status }} (Last updated: {{ page.last_updated }}) # Consequences Allowing more Kotlin in PMD can attract new contributions. It might make it easier to develop small DSLs. -Also, other languages than Kotlin could be used, e.g. for `pmd-scala` Scala might make sense. +In the future we might also consider to use other languages than Kotlin, e.g. for `pmd-scala` Scala might make sense. -On the other side, other IDEs than IntelliJ IDEA will have a difficult time to deal with PMD's source code. -Eclipse can't be used practically anymore. +On the other side, other IDEs than IntelliJ IDEA will have a difficult time to deal with PMD's source code +when Kotlin is used. Eclipse can't be used practically anymore. Maintaining a polyglot code base with multiple languages is likely to be more challenging. + +# Change History + +2022-07-28: Proposed initial version. diff --git a/docs/pages/pmd/projectdocs/decisions/adr-NNN.md b/docs/pages/pmd/projectdocs/decisions/adr-NNN.md index 8388f98136..b18a9b2866 100644 --- a/docs/pages/pmd/projectdocs/decisions/adr-NNN.md +++ b/docs/pages/pmd/projectdocs/decisions/adr-NNN.md @@ -21,8 +21,14 @@ What is the change that we're proposing and/or doing? # Status -{{ page.adr_status }} +{{ page.adr_status }} (Last updated: {{ page.last_updated }}) # Consequences What becomes easier or more difficult to do because of this change? + +# Change History + +YYYY-MM-DD: Add xyz. + +YYYY-MM-DD: Proposed initial version. From 026015954abc5ec65ba021f6926f854f1f536e26 Mon Sep 17 00:00:00 2001 From: Matt Hargett Date: Wed, 7 Sep 2022 19:29:55 -0700 Subject: [PATCH 021/108] Move rules from lexer to parser. Fix some bugs found in manual testing. Add bugs found via manual testing to new lua test file. --- .../sourceforge/pmd/lang/lua/antlr4/Lua.g4 | 92 +++++++++-------- .../pmd/lang/lua/cpd/testdata/luauTypes.lua | 4 + .../pmd/lang/lua/cpd/testdata/luauTypes.txt | 99 ++++++++++++++----- 3 files changed, 128 insertions(+), 67 deletions(-) diff --git a/pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4 b/pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4 index 62ac80363d..1f84395d51 100644 --- a/pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4 +++ b/pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4 @@ -91,7 +91,7 @@ stat | 'function' funcname funcbody | 'local' 'function' NAME funcbody | 'local' bindinglist ('=' explist)? - | ('export')? 'type' NAME ('<' GenericTypeParameterList '>')? '=' Type + | ('export')? 'type' NAME ('<' genericTypeParameterList '>')? '=' type ; attnamelist @@ -115,7 +115,7 @@ funcname ; funcbody - : ('<' GenericTypeParameterList '>')? '(' parlist? ')' (':' '...'? ReturnType ) block 'end' // GenericTypeParameterList and ReturnType + : ('<' genericTypeParameterList '>')? '(' parlist? ')' (':' '...'? returnType ) block 'end' // genericTypeParameterList and returnType ; parlist @@ -131,7 +131,7 @@ namelist ; binding - : NAME (':' Type ('?')?)? + : NAME (':' type ('?')?)? ; bindinglist: binding (',' bindinglist)?; @@ -158,10 +158,10 @@ exp ifelseexp: 'if' exp 'then' exp ('elseif' exp 'then' exp)* 'else' exp; -asexp: simpleexp ('::' Type)?; +asexp: simpleexp ('::' type)?; simpleexp - : 'nil' | 'false' | 'true' + : NIL | BOOLEAN | number | string | '...' @@ -242,73 +242,81 @@ number ; string - : NORMALSTRING | CHARSTRING | LONGSTRING + : NORMALSTRING | LONGSTRING ; -SimpleType - : 'nil' - | SingletonType - | NAME /* ('.' NAME)? */ ('<' TypeParams '>')? +simpleType + : NIL + | singletonType + | NAME ('.' NAME)? ('<' typeParams '>')? | 'typeof' '(' NAME ('(' ')')? | '...' ')' // can't use `exp`, manually handle common cases - | TableType - | FunctionType + | tableType + | functionType ; -SingletonType - : NORMALSTRING | CHARSTRING - | 'true' - | 'false' +singletonType + : NORMALSTRING | BOOLEAN ; -Type - : SimpleType ('?')? - | SimpleType ('?')? ('|' Type) // can't use Type because it's mutually left-recursive - | SimpleType ('?')? ('&' Type) // can't use Type because it's mutually left-recursive +type + : simpleType ('?')? + | simpleType ('?')? ('|' type) // can't use type because it's mutually left-recursive + | simpleType ('?')? ('&' type) // can't use type because it's mutually left-recursive ; -GenericTypePackParameter: NAME '...' ('=' (('(' (TypeList)? ')') | VariadicTypePack | GenericTypePack))?; // TypePack must be inlined here +genericTypePackParameter: NAME '...' ('=' (('(' (typeList)? ')') | variadicTypePack | genericTypePack))?; // typePack must be inlined here -GenericTypeParameterList: NAME ('=' Type)? (',' GenericTypeParameterList)? | GenericTypePackParameter (',' GenericTypePackParameter)*; +genericTypeParameterList: NAME ('=' type)? (',' genericTypeParameterList)? | genericTypePackParameter (',' genericTypePackParameter)*; -TypeList: Type (',' Type)? | VariadicTypePack; +typeList: type (',' type)? | variadicTypePack; -TypeParams: (Type | VariadicTypePack | GenericTypePack) (',' TypeParams)?; // had to remove TypePack +typeParams: (type | variadicTypePack | genericTypePack) (',' typeParams)?; // had to remove typePack -// TypePack: inlined everywhere to avoid overly greedy match when out-of-context +// typePack: inlined everywhere to avoid overly greedy match when out-of-context -GenericTypePack: NAME '...'; +genericTypePack: NAME '...'; -VariadicTypePack: '...' Type; +variadicTypePack: '...' type; -ReturnType: Type | '(' Type ',' Type ')' | '(' ')'; // can't use TypePack, inline common cases +returnType: variadicTypePack | '(' typeList ')' | '(' ')'; // can't use typePack, inline common cases -TableIndexer: '[' Type ']' ':' Type; +tableIndexer: '[' type ']' ':' type; -TableProp: NAME ':' Type; +tableProp: NAME ':' type; -TablePropOrIndexer - : TableProp | TableIndexer; +tablePropOrIndexer + : tableProp | tableIndexer; -PropList - : TablePropOrIndexer ((','|';') TablePropOrIndexer)* (','|';')?; +propList + : tablePropOrIndexer ((','|';') tablePropOrIndexer)* (','|';')?; -TableType - : '{' PropList '}'; +tableType + : '{' propList '}'; + +functionType: ('<' genericTypeParameterList '>')? '(' (typeList)? ')' '->' returnType; + +require + : 'require' '(' (NAME ('.' NAME)*) | NORMALSTRING ')' ('::' type)? + ; -FunctionType: ('<' GenericTypeParameterList '>')? '(' (TypeList)? ')' '->' (Type | '(' ')' | '(' (TypeList) ')'); // inline ReturnType to avoid greediness // LEXER +NIL + : 'nil' + ; + +BOOLEAN + : 'true' | 'false' + ; + NAME : [a-zA-Z_][a-zA-Z_0-9]* ; NORMALSTRING : '"' ( EscapeSequence | ~('\\'|'"') )* '"' - ; - -CHARSTRING - : '\'' ( EscapeSequence | ~('\''|'\\') )* '\'' + | '\'' ( EscapeSequence | ~('\\'|'\'') )* '\'' ; LONGSTRING @@ -401,7 +409,7 @@ LINE_COMMENT ; WS - : [ \t\u000C\r\n]+ -> skip + : [ \n\r\t\u000B\u000C\u0000]+ -> channel(HIDDEN) ; SHEBANG diff --git a/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.lua b/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.lua index 1c391a37a6..2294030324 100644 --- a/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.lua +++ b/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.lua @@ -7,6 +7,10 @@ local _notLiteral = not true local _notVariable = not x local _length = #{x} export type Function = (...any) -> T... +local _PlatformService = nil +local game = require(script.Parent.game) :: any +pcall(function() _PlatformService = game:GetService('PlatformService') end) + return function (req, ...: boolean): ({[string|number]: T}, string, Function<...any>) local body = string.format("%s %s\n", req.method, req.path) diff --git a/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.txt b/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.txt index 2be84bbb8a..7eb53efa9e 100644 --- a/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.txt +++ b/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.txt @@ -53,18 +53,56 @@ L9 [type] 8 11 [Function] 13 20 [<] 21 21 - [T...] 22 25 + [T] 22 22 + [...] 23 25 [=] 27 27 - [...any] 29 34 + [...] 29 31 + [any] 32 34 [>] 35 35 [=] 37 37 [(] 39 39 - [...any] 40 45 + [...] 40 42 + [any] 43 45 [)] 46 46 - [-] 48 48 - [>] 49 49 - [T...] 51 54 + [->] 48 49 + [T] 51 51 + [...] 52 54 +L10 + [local] 1 5 + [_PlatformService] 7 22 + [=] 24 24 + [nil] 26 28 L11 + [local] 1 5 + [game] 7 10 + [=] 12 12 + [require] 14 20 + [(] 21 21 + [script] 22 27 + [.] 28 28 + [Parent] 29 34 + [.] 35 35 + [game] 36 39 + [)] 40 40 + [::] 42 43 + [any] 45 47 +L12 + [pcall] 1 5 + [(] 6 6 + [function] 7 14 + [(] 15 15 + [)] 16 16 + [_PlatformService] 18 33 + [=] 35 35 + [game] 37 40 + [:] 41 41 + [GetService] 42 51 + [(] 52 52 + ['PlatformService'] 53 69 + [)] 70 70 + [end] 72 74 + [)] 75 75 +L15 [return] 1 6 [function] 8 15 [<] 17 17 @@ -81,7 +119,9 @@ L11 [(] 41 41 [{] 42 42 [\[] 43 43 - [string|number] 44 56 + [string] 44 49 + [|] 50 50 + [number] 51 56 [\]] 57 57 [:] 58 58 [T] 60 60 @@ -89,9 +129,13 @@ L11 [,] 62 62 [string] 64 69 [,] 70 70 - [Function<...any>] 72 87 + [Function] 72 79 + [<] 80 80 + [...] 81 83 + [any] 84 86 + [>] 87 87 [)] 88 88 -L12 +L16 [local] 3 7 [body] 9 12 [=] 14 14 @@ -109,24 +153,24 @@ L12 [.] 56 56 [path] 57 60 [)] 61 61 -L13 +L17 [local] 3 7 [res] 9 11 [=] 13 13 [{] 15 15 -L14 +L18 [code] 5 8 [=] 10 10 [200] 12 14 [,] 15 15 -L15 +L19 [{] 5 5 ["Content-Type"] 7 20 [,] 21 21 ["text/plain"] 23 34 [}] 36 36 [,] 37 37 -L16 +L20 [{] 5 5 ["Content-Length"] 7 22 [,] 23 23 @@ -134,9 +178,12 @@ L16 [body] 26 29 [}] 31 31 [::] 33 34 - [Array] 36 45 + [Array] 36 40 + [<] 41 41 + [any] 42 44 + [>] 45 45 [,] 46 46 -L17 +L21 [}] 3 3 [::] 5 6 [{] 8 8 @@ -153,7 +200,7 @@ L17 [boolean] 41 47 [>] 48 48 [}] 50 50 -L18 +L22 [if] 3 4 [(] 6 6 [req] 7 9 @@ -163,7 +210,7 @@ L18 [.] 18 18 [keepAlive] 19 27 [then] 29 32 -L19 +L23 [local] 5 9 [socketType] 11 20 [:] 21 21 @@ -176,13 +223,13 @@ L19 [""] 56 57 [::] 59 60 [""] 62 63 -L20 +L24 [socketType] 5 14 [=] 16 16 ["Connection"] 18 29 [::] 31 32 ["Connection"] 34 45 -L21 +L25 [res] 5 7 [\[] 8 8 [#] 9 9 @@ -198,7 +245,7 @@ L21 [,] 43 43 ["Keep-Alive"] 45 56 [}] 58 58 -L22 +L26 [res] 5 7 [\[] 8 8 [#] 9 9 @@ -210,9 +257,9 @@ L22 [{] 21 21 [...] 23 25 [}] 27 27 -L23 +L27 [end] 3 5 -L25 +L29 [return] 3 8 [(] 10 10 [res] 11 13 @@ -228,12 +275,14 @@ L25 [,] 37 37 [function] 39 46 [(] 47 47 - [...)] 48 51 + [...] 48 50 + [)] 51 51 [:] 52 52 - [...any] 54 59 + [...] 54 56 + [any] 57 59 [return] 61 66 [...] 68 70 [end] 72 74 -L26 +L30 [end] 1 3 EOF From 7cf9c6571e16b5ee786f1a1ee1fd15101c2956fc Mon Sep 17 00:00:00 2001 From: Matt Hargett Date: Wed, 7 Sep 2022 19:37:13 -0700 Subject: [PATCH 022/108] add an if-expression twist --- .../pmd/lang/lua/cpd/testdata/luauTypes.lua | 2 +- .../pmd/lang/lua/cpd/testdata/luauTypes.txt | 33 ++++++++++++------- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.lua b/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.lua index 2294030324..6afb9b7c56 100644 --- a/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.lua +++ b/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.lua @@ -26,5 +26,5 @@ return function (req, ...: boolean): ({[string|number]: T}, string, Function< res[#res - 2] = { ... } end - return (res :: any) :: { T }, body, function(...): ...any return ... end + return (res :: any) :: { T }, (if req then body else "") :: string, function(...): ...any return ... end end \ No newline at end of file diff --git a/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.txt b/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.txt index 7eb53efa9e..1517afea84 100644 --- a/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.txt +++ b/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.txt @@ -271,18 +271,27 @@ L29 [T] 28 28 [}] 30 30 [,] 31 31 - [body] 33 36 - [,] 37 37 - [function] 39 46 - [(] 47 47 - [...] 48 50 - [)] 51 51 - [:] 52 52 - [...] 54 56 - [any] 57 59 - [return] 61 66 - [...] 68 70 - [end] 72 74 + [(] 33 33 + [if] 34 35 + [req] 37 39 + [then] 41 44 + [body] 46 49 + [else] 51 54 + [""] 56 57 + [)] 58 58 + [::] 60 61 + [string] 63 68 + [,] 69 69 + [function] 71 78 + [(] 79 79 + [...] 80 82 + [)] 83 83 + [:] 84 84 + [...] 86 88 + [any] 89 91 + [return] 93 98 + [...] 100 102 + [end] 104 106 L30 [end] 1 3 EOF From 7747b750914c8c3e6a21b2de728f1bf5ed1c5824 Mon Sep 17 00:00:00 2001 From: Matt Hargett Date: Thu, 8 Sep 2022 12:46:43 -0700 Subject: [PATCH 023/108] Cleanups and minor tweaks for issues found in testing across 500KLOC of open source Lua code. --- .../sourceforge/pmd/lang/lua/antlr4/Lua.g4 | 23 ++++++++++--------- .../pmd/lang/lua/cpd/testdata/luauTypes.lua | 2 +- .../pmd/lang/lua/cpd/testdata/luauTypes.txt | 6 +++-- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4 b/pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4 index 1f84395d51..30e36071ff 100644 --- a/pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4 +++ b/pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4 @@ -62,6 +62,7 @@ Tested by Matt Hargett with: - Entire codebase and test suite for neovim v0.7.2: https://github.com/neovim/neovim/tree/v0.7.2 - Entire codebase for World of Warcraft Interface: https://github.com/tomrus88/BlizzardInterfaceCode - Benchmarks and conformance test suite for Luau 0.537: https://github.com/Roblox/luau/tree/0.537 + - Entire Lua codebase for nmap 7.92 : https://github.com/nmap/nmap */ grammar Lua; @@ -115,7 +116,7 @@ funcname ; funcbody - : ('<' genericTypeParameterList '>')? '(' parlist? ')' (':' '...'? returnType ) block 'end' // genericTypeParameterList and returnType + : ('<' genericTypeParameterList '>')? '(' parlist? ')' (':' '...'? returnType ) block 'end' ; parlist @@ -249,7 +250,7 @@ simpleType : NIL | singletonType | NAME ('.' NAME)? ('<' typeParams '>')? - | 'typeof' '(' NAME ('(' ')')? | '...' ')' // can't use `exp`, manually handle common cases + | 'typeof' '(' exp ')' | tableType | functionType ; @@ -260,25 +261,25 @@ singletonType type : simpleType ('?')? - | simpleType ('?')? ('|' type) // can't use type because it's mutually left-recursive - | simpleType ('?')? ('&' type) // can't use type because it's mutually left-recursive + | type ('|' type) + | type ('&' type) ; -genericTypePackParameter: NAME '...' ('=' (('(' (typeList)? ')') | variadicTypePack | genericTypePack))?; // typePack must be inlined here +genericTypePackParameter: NAME '...' ('=' (typePack | variadicTypePack | genericTypePack))?; genericTypeParameterList: NAME ('=' type)? (',' genericTypeParameterList)? | genericTypePackParameter (',' genericTypePackParameter)*; -typeList: type (',' type)? | variadicTypePack; +typeList: type (',' typeList)? | variadicTypePack; -typeParams: (type | variadicTypePack | genericTypePack) (',' typeParams)?; // had to remove typePack +typeParams: (type | typePack | variadicTypePack | genericTypePack) (',' typeParams)?; -// typePack: inlined everywhere to avoid overly greedy match when out-of-context +typePack: '(' (typeList)? ')'; genericTypePack: NAME '...'; variadicTypePack: '...' type; -returnType: variadicTypePack | '(' typeList ')' | '(' ')'; // can't use typePack, inline common cases +returnType: type | typePack; tableIndexer: '[' type ']' ':' type; @@ -288,7 +289,7 @@ tablePropOrIndexer : tableProp | tableIndexer; propList - : tablePropOrIndexer ((','|';') tablePropOrIndexer)* (','|';')?; + : tablePropOrIndexer (fieldsep tablePropOrIndexer)* fieldsep?; tableType : '{' propList '}'; @@ -296,7 +297,7 @@ tableType functionType: ('<' genericTypeParameterList '>')? '(' (typeList)? ')' '->' returnType; require - : 'require' '(' (NAME ('.' NAME)*) | NORMALSTRING ')' ('::' type)? + : 'local'? bindinglist '=' 'require' '(' exp ')' ('.' NAME)* ('::' type)? ';'? ; diff --git a/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.lua b/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.lua index 6afb9b7c56..9e418a61de 100644 --- a/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.lua +++ b/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.lua @@ -8,7 +8,7 @@ local _notVariable = not x local _length = #{x} export type Function = (...any) -> T... local _PlatformService = nil -local game = require(script.Parent.game) :: any +local game = require(script.Parent.game).default :: any pcall(function() _PlatformService = game:GetService('PlatformService') end) diff --git a/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.txt b/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.txt index 1517afea84..ac7939686c 100644 --- a/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.txt +++ b/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.txt @@ -84,8 +84,10 @@ L11 [.] 35 35 [game] 36 39 [)] 40 40 - [::] 42 43 - [any] 45 47 + [.] 41 41 + [default] 42 48 + [::] 50 51 + [any] 53 55 L12 [pcall] 1 5 [(] 6 6 From 11b7bda8719926cc0f3363dd560ff7d81579b302 Mon Sep 17 00:00:00 2001 From: mohan-chinnappan-n Date: Fri, 9 Sep 2022 04:21:56 -0400 Subject: [PATCH 024/108] Update TreeExportCli.java missing --file arg in "Example: ast-dump --format xml --language java --file MyFile.java" added --- .../java/net/sourceforge/pmd/util/treeexport/TreeExportCli.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/TreeExportCli.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/TreeExportCli.java index cd7c7c7e99..5ad05cb9da 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/TreeExportCli.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/TreeExportCli.java @@ -139,7 +139,7 @@ public class TreeExportCli { sb.append(System.lineSeparator()) .append(System.lineSeparator()); - sb.append("Example: ast-dump --format xml --language java MyFile.java") + sb.append("Example: ast-dump --format xml --language java --file MyFile.java") .append(System.lineSeparator()); System.err.print(sb); From b8b4e513ac232711f00ed9e4b699b7a2459e1233 Mon Sep 17 00:00:00 2001 From: Matt Hargett Date: Fri, 9 Sep 2022 16:42:18 -0700 Subject: [PATCH 025/108] Support multi-line 'normal' strings. Support skipping literal sequences. More minor adjustments to make the testing corpus tokenize without errors. --- .../sourceforge/pmd/lang/lua/antlr4/Lua.g4 | 88 +++++++--- .../net/sourceforge/pmd/cpd/LuaLanguage.java | 15 +- .../net/sourceforge/pmd/cpd/LuaTokenizer.java | 166 +++++++++++++++++- .../pmd/lang/lua/cpd/testdata/luauTypes.lua | 10 +- .../pmd/lang/lua/cpd/testdata/luauTypes.txt | 69 ++++---- 5 files changed, 283 insertions(+), 65 deletions(-) diff --git a/pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4 b/pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4 index 30e36071ff..4676055f48 100644 --- a/pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4 +++ b/pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4 @@ -77,7 +77,7 @@ block stat : ';' - | varlist '=' explist + | varlist ASSIGNMENT explist | var compoundop exp | functioncall | label @@ -87,11 +87,11 @@ stat | 'while' exp 'do' block 'end' | 'repeat' block 'until' exp | 'if' exp 'then' block ('elseif' exp 'then' block)* ('else' block)? 'end' - | 'for' binding '=' exp ',' exp (',' exp)? 'do' block 'end' + | 'for' binding ASSIGNMENT exp ',' exp (',' exp)? 'do' block 'end' | 'for' bindinglist 'in' explist 'do' block 'end' | 'function' funcname funcbody - | 'local' 'function' NAME funcbody - | 'local' bindinglist ('=' explist)? + | LOCAL 'function' NAME funcbody + | LOCAL bindinglist (ASSIGNMENT explist)? | ('export')? 'type' NAME ('<' genericTypeParameterList '>')? '=' type ; @@ -116,7 +116,7 @@ funcname ; funcbody - : ('<' genericTypeParameterList '>')? '(' parlist? ')' (':' '...'? returnType ) block 'end' + : ('<' genericTypeParameterList '>')? OPEN_PARENS parlist? CLOSE_PARENS (':' '...'? returnType ) block 'end' ; parlist @@ -138,7 +138,7 @@ binding bindinglist: binding (',' bindinglist)?; var - : (NAME | '(' exp ')' varSuffix) varSuffix* + : (NAME | OPEN_PARENS exp CLOSE_PARENS varSuffix) varSuffix* ; varlist @@ -172,11 +172,11 @@ simpleexp | tableconstructor; varOrExp - : var | '(' exp ')' + : var | OPEN_PARENS exp CLOSE_PARENS ; varSuffix - : nameAndArgs* ('[' exp ']' | '.' NAME) + : nameAndArgs* (OPEN_BRACKET exp CLOSE_BRACKET | '.' NAME) ; nameAndArgs @@ -184,7 +184,7 @@ nameAndArgs ; args - : '(' explist? ')' | tableconstructor | string + : OPEN_PARENS explist? CLOSE_PARENS | tableconstructor | string ; functiondef @@ -192,7 +192,7 @@ functiondef ; tableconstructor - : '{' fieldlist? '}' + : OPEN_BRACE fieldlist? CLOSE_BRACE ; fieldlist @@ -200,7 +200,7 @@ fieldlist ; field - : '[' exp ']' '=' exp | NAME '=' exp | exp + : OPEN_BRACKET exp CLOSE_BRACKET ASSIGNMENT exp | NAME ASSIGNMENT exp | exp ; fieldsep @@ -220,6 +220,8 @@ operatorAnd operatorComparison : '<' | '>' | '<=' | '>=' | '~=' | '=='; +ASSIGNMENT: '='; + operatorStrcat : '..'; @@ -243,20 +245,20 @@ number ; string - : NORMALSTRING | LONGSTRING + : NORMAL_STRING | LONG_STRING | INTERPOLATED_STRING ; simpleType : NIL | singletonType | NAME ('.' NAME)? ('<' typeParams '>')? - | 'typeof' '(' exp ')' + | 'typeof' OPEN_PARENS exp CLOSE_PARENS | tableType | functionType ; singletonType - : NORMALSTRING | BOOLEAN + : NORMAL_STRING | BOOLEAN ; type @@ -273,7 +275,7 @@ typeList: type (',' typeList)? | variadicTypePack; typeParams: (type | typePack | variadicTypePack | genericTypePack) (',' typeParams)?; -typePack: '(' (typeList)? ')'; +typePack: OPEN_PARENS (typeList)? CLOSE_PARENS; genericTypePack: NAME '...'; @@ -281,7 +283,7 @@ variadicTypePack: '...' type; returnType: type | typePack; -tableIndexer: '[' type ']' ':' type; +tableIndexer: OPEN_BRACKET type CLOSE_BRACKET ':' type; tableProp: NAME ':' type; @@ -292,17 +294,25 @@ propList : tablePropOrIndexer (fieldsep tablePropOrIndexer)* fieldsep?; tableType - : '{' propList '}'; + : OPEN_BRACE propList CLOSE_BRACE; -functionType: ('<' genericTypeParameterList '>')? '(' (typeList)? ')' '->' returnType; +functionType: ('<' genericTypeParameterList '>')? OPEN_PARENS (typeList)? CLOSE_PARENS '->' returnType; require - : 'local'? bindinglist '=' 'require' '(' exp ')' ('.' NAME)* ('::' type)? ';'? + : 'local'? bindinglist '=' REQUIRE OPEN_PARENS exp CLOSE_PARENS ('.' NAME)* ('::' type)? ';'? ; // LEXER +LOCAL + : 'local' + ; + +REQUIRE + : 'require' + ; + NIL : 'nil' ; @@ -315,19 +325,23 @@ NAME : [a-zA-Z_][a-zA-Z_0-9]* ; -NORMALSTRING - : '"' ( EscapeSequence | ~('\\'|'"') )* '"' - | '\'' ( EscapeSequence | ~('\\'|'\'') )* '\'' +NORMAL_STRING + : '"' (~["\\\r\n\u0085\u2028\u2029] | EscapeSequence | '\\\n')* '"' + | '\'' (~['\\\r\n\u0085\u2028\u2029] | EscapeSequence | '\\\n')* '\'' ; -LONGSTRING - : '[' NESTED_STR ']' +INTERPOLATED_STRING + : '`' (~[`\\\r\n\u0085\u2028\u2029] | EscapeSequence | '\\\n')* '`' + ; + +LONG_STRING + : OPEN_BRACKET NESTED_STR CLOSE_BRACKET ; fragment NESTED_STR : '=' NESTED_STR '=' - | '[' .*? ']' + | OPEN_BRACKET .*? CLOSE_BRACKET ; INT @@ -350,6 +364,26 @@ HEX_FLOAT | '0' [xX] HexDigit+ HexExponentPart ; +OPEN_BRACE: '{'; +CLOSE_BRACE: '}'; + +OPEN_BRACKET: '['; +CLOSE_BRACKET: ']'; + +OPEN_PARENS: '('; +CLOSE_PARENS: ')'; + +NL + : '\r\n' | '\r' | '\n' + | '\u0085' // ' + | '\u2028' //'' + | '\u2029' //'' + ; + +COMMA + : ',' + ; + fragment ExponentPart : [eE] [+-]? Digit+ @@ -362,8 +396,8 @@ HexExponentPart fragment EscapeSequence - : '\\' [abfnrtvz"'|$#\\] // World of Warcraft Lua additionally escapes |$# - | '\\' '\r'? '\n' + : '\\' [abfnrtvz"'`|$#\\] // World of Warcraft Lua additionally escapes |$# + | NL | DecimalEscape | HexEscape | UtfEscape diff --git a/pmd-lua/src/main/java/net/sourceforge/pmd/cpd/LuaLanguage.java b/pmd-lua/src/main/java/net/sourceforge/pmd/cpd/LuaLanguage.java index e2a87ec878..2e485e13b8 100644 --- a/pmd-lua/src/main/java/net/sourceforge/pmd/cpd/LuaLanguage.java +++ b/pmd-lua/src/main/java/net/sourceforge/pmd/cpd/LuaLanguage.java @@ -4,15 +4,28 @@ package net.sourceforge.pmd.cpd; +import java.util.Properties; + /** * Language implementation for Lua */ public class LuaLanguage extends AbstractLanguage { + public LuaLanguage() { + this(System.getProperties()); + } + /** * Creates a new Lua Language instance. */ - public LuaLanguage() { + public LuaLanguage(Properties properties) { super("Lua", "lua", new LuaTokenizer(), ".lua"); + setProperties(properties); + } + + @Override + public final void setProperties(Properties properties) { + LuaTokenizer tokenizer = (LuaTokenizer) getTokenizer(); + tokenizer.setProperties(properties); } } diff --git a/pmd-lua/src/main/java/net/sourceforge/pmd/cpd/LuaTokenizer.java b/pmd-lua/src/main/java/net/sourceforge/pmd/cpd/LuaTokenizer.java index 23c292dbe7..8e4f354b17 100644 --- a/pmd-lua/src/main/java/net/sourceforge/pmd/cpd/LuaTokenizer.java +++ b/pmd-lua/src/main/java/net/sourceforge/pmd/cpd/LuaTokenizer.java @@ -4,8 +4,11 @@ package net.sourceforge.pmd.cpd; +import java.util.Properties; + import org.antlr.v4.runtime.CharStream; +import net.sourceforge.pmd.cpd.token.AntlrToken; import net.sourceforge.pmd.cpd.token.AntlrTokenFilter; import net.sourceforge.pmd.lang.antlr.AntlrTokenManager; import net.sourceforge.pmd.lang.lua.antlr4.LuaLexer; @@ -15,6 +18,22 @@ import net.sourceforge.pmd.lang.lua.antlr4.LuaLexer; */ public class LuaTokenizer extends AntlrTokenizer { + private boolean ignoreLiteralSequences = false; + + /** + * Sets the possible options for the C# tokenizer. + * + * @param properties the properties + * @see #OPTION_IGNORE_LITERAL_SEQUENCES + */ + public void setProperties(Properties properties) { + ignoreLiteralSequences = getBooleanProperty(properties, OPTION_IGNORE_LITERAL_SEQUENCES); + } + + private boolean getBooleanProperty(final Properties properties, final String property) { + return Boolean.parseBoolean(properties.getProperty(property, Boolean.FALSE.toString())); + } + @Override protected AntlrTokenManager getLexerForSource(SourceCode sourceCode) { CharStream charStream = AntlrTokenizer.getCharStreamFromSourceCode(sourceCode); @@ -23,6 +42,151 @@ public class LuaTokenizer extends AntlrTokenizer { @Override protected AntlrTokenFilter getTokenFilter(final AntlrTokenManager tokenManager) { - return new AntlrTokenFilter(tokenManager); + return new LuaTokenFilter(tokenManager, ignoreLiteralSequences); + } + + /** + * The {@link LuaTokenFilter} extends the {@link AntlrTokenFilter} to discard + * Lua-specific tokens. + *

+ * By default, it enables annotation-based CPD suppression. + * If the --ignoreUsings flag is provided, require() directives are filtered out. + *

+ */ + private static class LuaTokenFilter extends AntlrTokenFilter { + + private final boolean ignoreLiteralSequences; + private boolean discardingRequires = false; + private boolean discardingNL = false; + private AntlrToken discardingLiteralsUntil = null; + private boolean discardCurrent = false; + + + LuaTokenFilter(final AntlrTokenManager tokenManager, boolean ignoreLiteralSequences) { + super(tokenManager); + this.ignoreLiteralSequences = ignoreLiteralSequences; + } + + @Override + protected void analyzeToken(final AntlrToken currentToken) { + skipNewLines(currentToken); + } + + @Override + protected void analyzeTokens(final AntlrToken currentToken, final Iterable remainingTokens) { + discardCurrent = false; + skipRequires(currentToken, remainingTokens); + skipLiteralSequences(currentToken, remainingTokens); + } + + private void skipRequires(final AntlrToken currentToken, final Iterable remainingTokens) { + final int type = currentToken.getKind(); + if (type == LuaLexer.REQUIRE) { + discardingRequires = true; + } else if (type == LuaLexer.CLOSE_PARENS && discardingRequires) { + discardingRequires = false; + discardCurrent = true; + } + } + + private void skipNewLines(final AntlrToken currentToken) { + discardingNL = currentToken.getKind() == LuaLexer.NL; + } + + private void skipLiteralSequences(final AntlrToken currentToken, final Iterable remainingTokens) { + if (ignoreLiteralSequences) { + final int type = currentToken.getKind(); + if (isDiscardingLiterals()) { + if (currentToken == discardingLiteralsUntil) { // NOPMD - intentional check for reference equality + discardingLiteralsUntil = null; + discardCurrent = true; + } + } else if (type == LuaLexer.OPEN_BRACE + || type == LuaLexer.OPEN_BRACKET + || type == LuaLexer.OPEN_PARENS) { + final AntlrToken finalToken = findEndOfSequenceOfLiterals(remainingTokens); + discardingLiteralsUntil = finalToken; + } + } + } + + private AntlrToken findEndOfSequenceOfLiterals(final Iterable remainingTokens) { + boolean seenLiteral = false; + int braceCount = 0; + int bracketCount = 0; + int parenCount = 0; + for (final AntlrToken token : remainingTokens) { + switch (token.getKind()) { + case LuaLexer.INT: + case LuaLexer.NORMAL_STRING: + case LuaLexer.INTERPOLATED_STRING: + case LuaLexer.LONG_STRING: + case LuaLexer.HEX_FLOAT: + case LuaLexer.HEX: + case LuaLexer.FLOAT: + case LuaLexer.NIL: + case LuaLexer.BOOLEAN: + seenLiteral = true; + break; // can be skipped; continue to the next token + case LuaLexer.COMMA: + break; // can be skipped; continue to the next token + case LuaLexer.NL: + // this helps skip large multi-line data table sequences in Lua + break; // can be skipped; continue to the next token + case LuaLexer.ASSIGNMENT: + // this helps skip large data table sequences in Lua: { ["bob"] = "uncle", ["alice"] = "enby" } + break; // can be skipped; continue to the next token + case LuaLexer.OPEN_BRACE: + braceCount++; + break; // curly braces are allowed, as long as they're balanced + case LuaLexer.CLOSE_BRACE: + braceCount--; + if (braceCount < 0) { + // end of the list in the braces; skip all contents + return seenLiteral ? token : null; + } else { + // curly braces are not yet balanced; continue to the next token + break; + } + case LuaLexer.OPEN_BRACKET: + bracketCount++; + break; // brackets are allowed, as long as they're balanced + case LuaLexer.CLOSE_BRACKET: + bracketCount--; + if (bracketCount < 0) { + // end of the list in the brackets; skip all contents + return seenLiteral ? token : null; + } else { + // brackets are not yet balanced; continue to the next token + break; + } + case LuaLexer.OPEN_PARENS: + parenCount++; + break; // parens are allowed, as long as they're balanced + case LuaLexer.CLOSE_PARENS: + parenCount--; + if (parenCount < 0) { + // end of the list in the parens; skip all contents + return seenLiteral ? token : null; + } else { + // parens are not yet balanced; continue to the next token + break; + } + default: + // some other token than the expected ones; this is not a sequence of literals + return null; + } + } + return null; + } + + public boolean isDiscardingLiterals() { + return discardingLiteralsUntil != null; + } + + @Override + protected boolean isLanguageSpecificDiscarding() { + return discardingRequires || discardingNL || isDiscardingLiterals() || discardCurrent; + } } } diff --git a/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.lua b/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.lua index 9e418a61de..da4e9ddf80 100644 --- a/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.lua +++ b/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.lua @@ -11,18 +11,22 @@ local _PlatformService = nil local game = require(script.Parent.game).default :: any pcall(function() _PlatformService = game:GetService('PlatformService') end) - return function (req, ...: boolean): ({[string|number]: T}, string, Function<...any>) local body = string.format("%s %s\n", req.method, req.path) local res = { code = 200, { "Content-Type", "text/plain" }, - { "Content-Length", #body } :: Array, + { + "Content-Length", + #body, + ["Auth.Confirm"] = [[至：%s。]], + + } :: Array, } :: { [any]: number | Array } if (req :: any).keepAlive then local socketType: "Connection" | "Pingback" | "" = "" :: "" socketType = "Connection" :: "Connection" - res[#res + 1] = { socketType :: string, "Keep-Alive" } + res[#res + 1] = { socketType :: string, `\`${req.keepAlive}\`` } res[#res - 2] = { ... } end diff --git a/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.txt b/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.txt index ac7939686c..f1a3934c53 100644 --- a/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.txt +++ b/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.txt @@ -76,14 +76,6 @@ L11 [local] 1 5 [game] 7 10 [=] 12 12 - [require] 14 20 - [(] 21 21 - [script] 22 27 - [.] 28 28 - [Parent] 29 34 - [.] 35 35 - [game] 36 39 - [)] 40 40 [.] 41 41 [default] 42 48 [::] 50 51 @@ -104,7 +96,7 @@ L12 [)] 70 70 [end] 72 74 [)] 75 75 -L15 +L14 [return] 1 6 [function] 8 15 [<] 17 17 @@ -137,7 +129,7 @@ L15 [any] 84 86 [>] 87 87 [)] 88 88 -L16 +L15 [local] 3 7 [body] 9 12 [=] 14 14 @@ -155,37 +147,48 @@ L16 [.] 56 56 [path] 57 60 [)] 61 61 -L17 +L16 [local] 3 7 [res] 9 11 [=] 13 13 [{] 15 15 -L18 +L17 [code] 5 8 [=] 10 10 [200] 12 14 [,] 15 15 -L19 +L18 [{] 5 5 ["Content-Type"] 7 20 [,] 21 21 ["text/plain"] 23 34 [}] 36 36 [,] 37 37 -L20 +L19 [{] 5 5 +L20 ["Content-Length"] 7 22 [,] 23 23 - [#] 25 25 - [body] 26 29 - [}] 31 31 - [::] 33 34 - [Array] 36 40 - [<] 41 41 - [any] 42 44 - [>] 45 45 - [,] 46 46 L21 + [#] 7 7 + [body] 8 11 + [,] 12 12 +L22 + [\[] 7 7 + ["Auth.Confirm"] 8 21 + [\]] 22 22 + [=] 24 24 + [\[\[至：%s。\]\]] 26 34 + [,] 35 35 +L24 + [}] 5 5 + [::] 7 8 + [Array] 10 14 + [<] 15 15 + [any] 16 18 + [>] 19 19 + [,] 20 20 +L25 [}] 3 3 [::] 5 6 [{] 8 8 @@ -202,7 +205,7 @@ L21 [boolean] 41 47 [>] 48 48 [}] 50 50 -L22 +L26 [if] 3 4 [(] 6 6 [req] 7 9 @@ -212,7 +215,7 @@ L22 [.] 18 18 [keepAlive] 19 27 [then] 29 32 -L23 +L27 [local] 5 9 [socketType] 11 20 [:] 21 21 @@ -225,13 +228,13 @@ L23 [""] 56 57 [::] 59 60 [""] 62 63 -L24 +L28 [socketType] 5 14 [=] 16 16 ["Connection"] 18 29 [::] 31 32 ["Connection"] 34 45 -L25 +L29 [res] 5 7 [\[] 8 8 [#] 9 9 @@ -245,9 +248,9 @@ L25 [::] 34 35 [string] 37 42 [,] 43 43 - ["Keep-Alive"] 45 56 - [}] 58 58 -L26 + [`\\`${req.keepAlive}\\``] 45 66 + [}] 68 68 +L30 [res] 5 7 [\[] 8 8 [#] 9 9 @@ -259,9 +262,9 @@ L26 [{] 21 21 [...] 23 25 [}] 27 27 -L27 +L31 [end] 3 5 -L29 +L33 [return] 3 8 [(] 10 10 [res] 11 13 @@ -294,6 +297,6 @@ L29 [return] 93 98 [...] 100 102 [end] 104 106 -L30 +L34 [end] 1 3 EOF From 7d9a84fddebf38ce6808e9c1db6a5091baa2e5ca Mon Sep 17 00:00:00 2001 From: Matt Hargett Date: Fri, 9 Sep 2022 16:51:33 -0700 Subject: [PATCH 026/108] Format to have more consistent style with itself. Most other files appear to have mixed formatting. --- .../sourceforge/pmd/lang/lua/antlr4/Lua.g4 | 213 +++++++++++++----- 1 file changed, 154 insertions(+), 59 deletions(-) diff --git a/pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4 b/pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4 index 4676055f48..2c2603c0a2 100644 --- a/pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4 +++ b/pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4 @@ -120,7 +120,8 @@ funcbody ; parlist - : bindinglist (',' '...')? | '...' + : bindinglist (',' '...')? + | '...' ; explist @@ -135,7 +136,9 @@ binding : NAME (':' type ('?')?)? ; -bindinglist: binding (',' bindinglist)?; +bindinglist + : binding (',' bindinglist)? + ; var : (NAME | OPEN_PARENS exp CLOSE_PARENS varSuffix) varSuffix* @@ -157,9 +160,13 @@ exp : (asexp | operatorUnary exp) ( binop exp )* ; -ifelseexp: 'if' exp 'then' exp ('elseif' exp 'then' exp)* 'else' exp; +ifelseexp + : 'if' exp 'then' exp ('elseif' exp 'then' exp)* 'else' exp + ; -asexp: simpleexp ('::' type)?; +asexp + : simpleexp ('::' type)? + ; simpleexp : NIL | BOOLEAN @@ -172,7 +179,8 @@ simpleexp | tableconstructor; varOrExp - : var | OPEN_PARENS exp CLOSE_PARENS + : var + | OPEN_PARENS exp CLOSE_PARENS ; varSuffix @@ -184,7 +192,9 @@ nameAndArgs ; args - : OPEN_PARENS explist? CLOSE_PARENS | tableconstructor | string + : OPEN_PARENS explist? CLOSE_PARENS + | tableconstructor + | string ; functiondef @@ -200,16 +210,34 @@ fieldlist ; field - : OPEN_BRACKET exp CLOSE_BRACKET ASSIGNMENT exp | NAME ASSIGNMENT exp | exp + : OPEN_BRACKET exp CLOSE_BRACKET ASSIGNMENT exp + | NAME ASSIGNMENT exp + | exp ; fieldsep - : ',' | ';' + : ',' + | ';' ; -compoundop: '+=' | '-=' | '*=' | '/=' | '%=' | '^=' | '..='; +compoundop + : '+=' + | '-=' + + | '*=' + | '/=' + | '%=' + | '^=' + | '..='; -binop: operatorAddSub | operatorMulDivMod | operatorPower | operatorStrcat | operatorComparison | operatorAnd | operatorOr | operatorBitwise; +binop: operatorAddSub + | operatorMulDivMod + | operatorPower + | operatorStrcat + | operatorComparison + | operatorAnd + | operatorOr + | operatorBitwise; operatorOr : 'or'; @@ -218,34 +246,62 @@ operatorAnd : 'and'; operatorComparison - : '<' | '>' | '<=' | '>=' | '~=' | '=='; + : '<' + | '>' + | '<=' + | '>=' + | '~=' + | '==' + ; -ASSIGNMENT: '='; +ASSIGNMENT + : '=' + ; operatorStrcat : '..'; operatorAddSub - : '+' | '-'; + : '+' + | '-' + ; operatorMulDivMod - : '*' | '/' | '%' | '//'; + : '*' + | '/' + | '%' + | '//' + ; operatorBitwise - : '&' | '|' | '~' | '<<' | '>>'; + : '&' + | '|' + | '~' + | '<<' + | '>>' + ; operatorUnary - : 'not' | '#' | '-' | '~'; + : 'not' + | '#' + | '-' + | '~' + ; operatorPower : '^'; number - : INT | HEX | FLOAT | HEX_FLOAT + : INT + | HEX + | FLOAT + | HEX_FLOAT ; string - : NORMAL_STRING | LONG_STRING | INTERPOLATED_STRING + : NORMAL_STRING + | LONG_STRING + | INTERPOLATED_STRING ; simpleType @@ -258,7 +314,8 @@ simpleType ; singletonType - : NORMAL_STRING | BOOLEAN + : NORMAL_STRING + | BOOLEAN ; type @@ -267,41 +324,64 @@ type | type ('&' type) ; -genericTypePackParameter: NAME '...' ('=' (typePack | variadicTypePack | genericTypePack))?; - -genericTypeParameterList: NAME ('=' type)? (',' genericTypeParameterList)? | genericTypePackParameter (',' genericTypePackParameter)*; - -typeList: type (',' typeList)? | variadicTypePack; - -typeParams: (type | typePack | variadicTypePack | genericTypePack) (',' typeParams)?; - -typePack: OPEN_PARENS (typeList)? CLOSE_PARENS; - -genericTypePack: NAME '...'; - -variadicTypePack: '...' type; - -returnType: type | typePack; - -tableIndexer: OPEN_BRACKET type CLOSE_BRACKET ':' type; - -tableProp: NAME ':' type; - -tablePropOrIndexer - : tableProp | tableIndexer; - -propList - : tablePropOrIndexer (fieldsep tablePropOrIndexer)* fieldsep?; - -tableType - : OPEN_BRACE propList CLOSE_BRACE; - -functionType: ('<' genericTypeParameterList '>')? OPEN_PARENS (typeList)? CLOSE_PARENS '->' returnType; - -require - : 'local'? bindinglist '=' REQUIRE OPEN_PARENS exp CLOSE_PARENS ('.' NAME)* ('::' type)? ';'? +genericTypePackParameter + : NAME '...' ('=' (typePack | variadicTypePack | genericTypePack))? ; +genericTypeParameterList + : NAME ('=' type)? (',' genericTypeParameterList)? + | genericTypePackParameter (',' genericTypePackParameter)* + ; + +typeList + : type (',' typeList)? | variadicTypePack + ; + +typeParams + : (type | typePack | variadicTypePack | genericTypePack) (',' typeParams)? + ; + +typePack + : OPEN_PARENS (typeList)? CLOSE_PARENS + ; + +genericTypePack + : NAME '...' + ; + +variadicTypePack + : '...' type + ; + +returnType + : type + | typePack + ; + +tableIndexer + : OPEN_BRACKET type CLOSE_BRACKET ':' type + ; + +tableProp + : NAME ':' type + ; + +tablePropOrIndexer + : tableProp + | tableIndexer + ; + +propList + : tablePropOrIndexer (fieldsep tablePropOrIndexer)* fieldsep? + ; + +tableType + : OPEN_BRACE propList CLOSE_BRACE + ; + +functionType + : ('<' genericTypeParameterList '>')? OPEN_PARENS (typeList)? CLOSE_PARENS '->' returnType + ; // LEXER @@ -318,7 +398,8 @@ NIL ; BOOLEAN - : 'true' | 'false' + : 'true' + | 'false' ; NAME @@ -364,14 +445,28 @@ HEX_FLOAT | '0' [xX] HexDigit+ HexExponentPart ; -OPEN_BRACE: '{'; -CLOSE_BRACE: '}'; +OPEN_BRACE + : '{' + ; -OPEN_BRACKET: '['; -CLOSE_BRACKET: ']'; +CLOSE_BRACE + : '}' + ; -OPEN_PARENS: '('; -CLOSE_PARENS: ')'; +OPEN_BRACKET + : '[' + ; +CLOSE_BRACKET + : ']' + ; + +OPEN_PARENS: + '(' + ; + +CLOSE_PARENS + : ')' + ; NL : '\r\n' | '\r' | '\n' From 01ea52f90c428dbcb0eeaf4b9262f12b4e6d16ed Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Sat, 10 Sep 2022 10:34:25 +0200 Subject: [PATCH 027/108] [cli] Fix java version detection in run.sh Fixes #4118 --- docs/pages/release_notes.md | 2 ++ pmd-dist/src/main/resources/scripts/run.sh | 20 +++++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md index b8f8783555..2afc096898 100644 --- a/docs/pages/release_notes.md +++ b/docs/pages/release_notes.md @@ -15,6 +15,8 @@ This is a {{ site.pmd.release_type }} release. ### New and noteworthy ### Fixed Issues +* cli + * [#4118](https://github.com/pmd/pmd/issues/4118): \[cli] run.sh designer reports "integer expression expected" ### API Changes diff --git a/pmd-dist/src/main/resources/scripts/run.sh b/pmd-dist/src/main/resources/scripts/run.sh index 1501db12bc..ece76fc949 100755 --- a/pmd-dist/src/main/resources/scripts/run.sh +++ b/pmd-dist/src/main/resources/scripts/run.sh @@ -2,7 +2,7 @@ usage() { echo "Usage:" - echo " $(basename $0) [-h|-v] ..." + echo " $(basename "$0") [-h|-v] ..." echo "" echo "application-name: valid options are: $(valid_app_options)" echo "-h print this help" @@ -60,9 +60,9 @@ java_heapsize_settings() { set_lib_dir() { - if [ -z ${LIB_DIR} ]; then + if [ -z "${LIB_DIR}" ]; then # Allow for symlinks to this script - if [ -L $0 ]; then + if [ -L "$0" ]; then local script_real_loc=$(readlink "$0") else local script_real_loc=$0 @@ -83,23 +83,25 @@ check_lib_dir() { } function script_exit() { - echo $1 >&2 + echo "$1" >&2 exit 1 } determine_java_version() { local full_ver=$(java -version 2>&1) - # java_ver is eg "18" for java 1.8, "90" for java 9.0, "100" for java 10.0.x - readonly java_ver=$(echo $full_ver | sed -n '{ + # java_ver is eg "80" for java 1.8, "90" for java 9.0, "100" for java 10.0.x + readonly java_ver=$(echo "$full_ver" | sed -n '{ # replace early access versions, e.g. 11-ea with 11.0.0 s/-ea/.0.0/ # replace versions such as 10 with 10.0.0 s/version "\([0-9]\{1,\}\)"/version "\1.0.0"/ + # replace old java versions 1.x.* (java 1.7, java 1.8) with x.* + s/version "1\.\(.*\)"/version "\1"/ # extract the major and minor parts of the version - s/^.* version "\(.*\)\.\(.*\)\..*".*$/\1\2/p + s/^.* version "\([0-9]\{1,\}\)\.\([0-9]\{1,\}\).*".*$/\1\2/p }') # java_vendor is either java (oracle) or openjdk - readonly java_vendor=$(echo $full_ver | sed -n -e 's/^\(.*\) version .*$/\1/p') + readonly java_vendor=$(echo "$full_ver" | sed -n -e 's/^\(.*\) version .*$/\1/p') } jre_specific_vm_options() { @@ -197,7 +199,7 @@ case "${APPNAME}" in readonly CLASSNAME="net.sourceforge.pmd.util.treeexport.TreeExportCli" ;; *) - echo "${APPNAME} is NOT a valid application name, valid options are:$(valid_app_options)" + echo "${APPNAME} is NOT a valid application name, valid options are: $(valid_app_options)" ;; esac From 0b6a9ce0a7126bfcfccda40320b7a16d8bab73c8 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Sat, 10 Sep 2022 10:46:04 +0200 Subject: [PATCH 028/108] Add manual test script --- .../src/test/resources/scripts/runtest.sh | 88 +++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100755 pmd-dist/src/test/resources/scripts/runtest.sh diff --git a/pmd-dist/src/test/resources/scripts/runtest.sh b/pmd-dist/src/test/resources/scripts/runtest.sh new file mode 100755 index 0000000000..34185ddb1c --- /dev/null +++ b/pmd-dist/src/test/resources/scripts/runtest.sh @@ -0,0 +1,88 @@ +#!/bin/bash +# BSD-style license; for more info see http://pmd.sourceforge.net/license.html + +# +# Simple manual test script +# - code is copied from run.sh to be tested here (so please check, it might be out of sync) +# - mostly the function "determine_java_version" is tested here +# - just run it with "./runtest.sh" and look at the output +# - test cases are at the end of this script +# + +export LANG=en_US.UTF-8 + +FULL_JAVA_VERSION="" + +get_full_java_version() { + #java -version 2>&1 + #echo "openjdk version \"11.0.6\" 2022-08-12" + echo "$FULL_JAVA_VERSION" +} + +determine_java_version() { + local full_ver=$(get_full_java_version) + # java_ver is eg "80" for java 1.8, "90" for java 9.0, "100" for java 10.0.x + java_ver=$(echo "$full_ver" | sed -n '{ + # replace early access versions, e.g. 11-ea with 11.0.0 + s/-ea/.0.0/ + # replace versions such as 10 with 10.0.0 + s/version "\([0-9]\{1,\}\)"/version "\1.0.0"/ + # replace old java versions 1.x.* (java 1.7, java 1.8) with x.* + s/version "1\.\(.*\)"/version "\1"/ + # extract the major and minor parts of the version + s/^.* version "\([0-9]\{1,\}\)\.\([0-9]\{1,\}\).*".*$/\1\2/p + }') + # java_vendor is either java (oracle) or openjdk + java_vendor=$(echo "$full_ver" | sed -n -e 's/^\(.*\) version .*$/\1/p') +} + +jre_specific_vm_options() { + options="" + if [ "$java_ver" -ge 70 ] && [ "$java_ver" -lt 80 ] + then + options="detected java 7" + elif [ "$java_ver" -ge 80 ] && [ "$java_ver" -lt 90 ] + then + options="detected java 8" + elif [ "$java_ver" -ge 90 ] && [ "$java_ver" -lt 110 ] && [ "$java_vendor" = "java" ] + then + options="detected java 9 or 10 from oracle" + elif [ "$java_vendor" = "openjdk" ] || ( [ "$java_vendor" = "java" ] && [ "$java_ver" -ge 110 ] ) + then + options="detected java 11 from oracle or any openjdk" + fi + echo $options +} + +run_test() { + FULL_JAVA_VERSION="$1" + EXPECTED_VENDOR="$2" + EXPECTED_VER="$3" + EXPECTED="$4" + echo "Testing: '${FULL_JAVA_VERSION}'" + determine_java_version + java_opts="$(jre_specific_vm_options)" + echo -n "java_ver: $java_ver " + if [ "$EXPECTED_VER" = "$java_ver" ]; then echo -e "\e[32mOK\e[0m"; else echo -e "\e[31mFAILED\e[0m"; fi + echo -n "java_vendor: $java_vendor " + if [ "$EXPECTED_VENDOR" = "$java_vendor" ]; then echo -e "\e[32mOK\e[0m"; else echo -e "\e[31mFAILED\e[0m"; fi + echo -n "java_opts: $java_opts " + if [ "$EXPECTED" = "$java_opts" ]; then echo -e "\e[32mOK\e[0m"; else echo -e "\e[31mFAILED\e[0m - expected: ${EXPECTED}"; fi + echo +} + +run_test "java version \"1.7.0_80\"" "java" "70" "detected java 7" +run_test "openjdk version \"1.7.0_352\"" "openjdk" "70" "detected java 7" +run_test "java version \"1.8.0_271\"" "java" "80" "detected java 8" +run_test "openjdk version \"1.8.0_345\"" "openjdk" "80" "detected java 8" +run_test "java version \"9.0.4\"" "java" "90" "detected java 9 or 10 from oracle" +run_test "openjdk version \"9.0.4\"" "openjdk" "90" "detected java 11 from oracle or any openjdk" +run_test "java version \"10.0.2\" 2018-07-17" "java" "100" "detected java 9 or 10 from oracle" +run_test "openjdk version \"11.0.6\" 2022-08-12" "openjdk" "110" "detected java 11 from oracle or any openjdk" +run_test "openjdk version \"11.0.6.1\" 2022-08-12" "openjdk" "110" "detected java 11 from oracle or any openjdk" +run_test "java version \"11.0.13\" 2021-10-19 LTS" "java" "110" "detected java 11 from oracle or any openjdk" +run_test "openjdk version \"17.0.4\" 2022-08-12" "openjdk" "170" "detected java 11 from oracle or any openjdk" +run_test "openjdk version \"17.1.4\" 2022-08-12" "openjdk" "171" "detected java 11 from oracle or any openjdk" +run_test "openjdk version \"17.0.4.1\" 2022-08-12" "openjdk" "170" "detected java 11 from oracle or any openjdk" +run_test "openjdk version \"18.0.2.1\" 2022-08-18" "openjdk" "180" "detected java 11 from oracle or any openjdk" +run_test "openjdk version \"19-ea\" 2022-09-20" "openjdk" "190" "detected java 11 from oracle or any openjdk" From 48269572ebcdc3791a2f48c3583b15454c46a006 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Sat, 10 Sep 2022 15:41:58 +0200 Subject: [PATCH 029/108] Use the same jversion convention in designer.bat java 1.8.0: 80 java 9.0: 90 java 17.0: 170 --- .../src/main/resources/scripts/designer.bat | 28 +++-- .../test/resources/scripts/designertest.bat | 103 ++++++++++++++++++ 2 files changed, 120 insertions(+), 11 deletions(-) create mode 100644 pmd-dist/src/test/resources/scripts/designertest.bat diff --git a/pmd-dist/src/main/resources/scripts/designer.bat b/pmd-dist/src/main/resources/scripts/designer.bat index bc3cbb9188..a53623c28c 100644 --- a/pmd-dist/src/main/resources/scripts/designer.bat +++ b/pmd-dist/src/main/resources/scripts/designer.bat @@ -4,35 +4,41 @@ set OPTS= set MAIN_CLASS=net.sourceforge.pmd.util.fxdesigner.DesignerStarter -:: sets the jver variable to the java version, eg 901 for 9.0.1+x or 180 for 1.8.0_171-b11 +:: sets the jver variable to the java version, eg 90 for 9.0.1+x or 80 for 1.8.0_171-b11 or 110 for 11.0.6.1 :: sets the jvendor variable to either java (oracle) or openjdk for /f tokens^=1^,3^,4^,5^ delims^=.-_+^"^ %%j in ('java -version 2^>^&1 ^| find "version"') do ( set jvendor=%%j if %%l EQU ea ( - set /A "jver=%%k00" + set /A "jver=%%k0" ) else ( - set /A jver=%%k%%l%%m + if %%k EQU 1 ( + :: for java version 1.7.x, 1.8.x, ignore the first 1. + set /A "jver=%%l%%m" + ) else ( + set /A "jver=%%k%%l" + ) ) ) + Set "jreopts=" :: oracle java 9 and 10 has javafx included as a module -if /I "%jvendor%" EQU "java" ( - if %jver% GEQ 900 ( - if %jver% LSS 1100 ( +if /I %jvendor% == java ( + if %jver% GEQ 90 ( + if %jver% LSS 110 ( :: enable reflection - Set jreopts=--add-opens javafx.controls/javafx.scene.control.skin=ALL-UNNAMED + set jreopts=--add-opens javafx.controls/javafx.scene.control.skin=ALL-UNNAMED ) ) ) set "_needjfxlib=0" -if /I "%jvendor%" EQU "openjdk" set _needjfxlib=1 -if /I "%jvendor%" EQU "java" ( - if %jver% GEQ 1100 set _needjfxlib=1 +if /I %jvendor% == openjdk set _needjfxlib=1 +if /I %jvendor% == java ( + if %jver% GEQ 110 set _needjfxlib=1 ) if %_needjfxlib% EQU 1 ( - if %jver% LSS 1000 ( + if %jver% LSS 100 ( echo For openjfx at least java 10 is required. pause exit diff --git a/pmd-dist/src/test/resources/scripts/designertest.bat b/pmd-dist/src/test/resources/scripts/designertest.bat new file mode 100644 index 0000000000..d43a5ff146 --- /dev/null +++ b/pmd-dist/src/test/resources/scripts/designertest.bat @@ -0,0 +1,103 @@ +@echo off + +:: BSD-style license; for more info see http://pmd.sourceforge.net/license.html + +:: +:: Simple manual test script +:: - code is copied from designer.bat to be tested here (so please check, it might be out of sync) +:: - mostly the function "determine_java_version" is tested here +:: - just run it with "designertest.bat" and look at the output +:: - test cases are at the end of this script +:: + +GOTO :main + +:determine_java_version +:: sets the jver variable to the java version, eg 90 for 9.0.1+x or 80 for 1.8.0_171-b11 or 110 for 11.0.6.1 +:: sets the jvendor variable to either java (oracle) or openjdk +for /f tokens^=1^,3^,4^,5^ delims^=.-_+^"^ %%j in (%full_version%) do ( + set jvendor=%%j + if %%l EQU ea ( + set /A "jver=%%k0" + ) else ( + if %%k EQU 1 ( + :: for java version 1.7.x, 1.8.x, ignore the first 1. + set /A "jver=%%l%%m" + ) else ( + set /A "jver=%%k%%l" + ) + ) +) + +set detection= +if %jver% GEQ 70 ( + if %jver% LSS 80 ( + set detection="detected java 7" + ) +) +if [%detection%] == [] ( + if %jver% GEQ 80 ( + if %jver% LSS 90 ( + set detection="detected java 8" + ) + ) +) +if [%detection%] == [] ( + if %jver% GEQ 90 ( + if %jver% LSS 110 ( + if %jvendor% == java ( + set detection="detected java 9 or 10 from oracle" + ) + ) + ) +) +if [%detection%] == [] ( + if %jvendor% == openjdk ( + set detection="detected java 11 from oracle or any openjdk" + ) +) +if [%detection%] == [] ( + if %jvendor% == java ( + if %jver% GEQ 110 ( + set detection="detected java 11 from oracle or any openjdk" + ) + ) +) + +EXIT /B + + + +:run_test +set full_version=%1 +set expected_vendor=%2 +set expected_version=%3 +set expected_detection=%4 + +CALL :determine_java_version + +echo full_version: %full_version% +if %jver% == %expected_version% ( echo jver: %jver% OK ) ELSE ( echo jver: %jver% EXPECTED: %expected_version%  ) +if %jvendor% == %expected_vendor% ( echo jvendor: %jvendor% OK ) ELSE ( echo jvendor: %jvendor% EXPECTED: %expected_vendor%  ) +if [%detection%] == [%expected_detection%] ( echo detection: %detection% OK ) ELSE ( echo detection: %detection% EXPECTED: %expected_detection%  ) +echo. + +EXIT /B + +:main + +CALL :run_test "java version ""1.7.0_80""" java 70 "detected java 7" +CALL :run_test "openjdk version ""1.7.0_352""" openjdk 70 "detected java 7" +CALL :run_test "java version ""1.8.0_271""" java 80 "detected java 8" +CALL :run_test "openjdk version ""1.8.0_345""" openjdk 80 "detected java 8" +CALL :run_test "java version ""9.0.4""" java 90 "detected java 9 or 10 from oracle" +CALL :run_test "openjdk version ""9.0.4""" openjdk 90 "detected java 11 from oracle or any openjdk" +CALL :run_test "java version ""10.0.2"" 2018-07-17" java 100 "detected java 9 or 10 from oracle" +CALL :run_test "openjdk version ""11.0.6"" 2022-08-12" openjdk 110 "detected java 11 from oracle or any openjdk" +CALL :run_test "openjdk version ""11.0.6.1"" 2022-08-12" openjdk 110 "detected java 11 from oracle or any openjdk" +CALL :run_test "java version ""11.0.13"" 2021-10-19 LTS" java 110 "detected java 11 from oracle or any openjdk" +CALL :run_test "openjdk version ""17.0.4"" 2022-08-12" openjdk 170 "detected java 11 from oracle or any openjdk" +CALL :run_test "openjdk version ""17.1.4"" 2022-08-12" openjdk 171 "detected java 11 from oracle or any openjdk" +CALL :run_test "openjdk version ""17.0.4.1"" 2022-08-12" openjdk 170 "detected java 11 from oracle or any openjdk" +CALL :run_test "openjdk version ""18.0.2.1"" 2022-08-18" openjdk 180 "detected java 11 from oracle or any openjdk" +CALL :run_test "openjdk version ""19-ea"" 2022-09-20" openjdk 190 "detected java 11 from oracle or any openjdk" From 9a46adf8a9787277f47613bfbccfdbd97d8ee578 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Sat, 10 Sep 2022 16:54:24 +0200 Subject: [PATCH 030/108] Bump maven-pmd-plugin from 3.18.0 to 3.19.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9036d17f18..9037678aa3 100644 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,7 @@ 3.0.0-M5 9.3 3.1.2 - 3.18.0 + 3.19.0 1.10.12 3.2.0 4.7.2 From 15100104425fe9372a686036a3c9628ef82e807f Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Sat, 10 Sep 2022 16:54:52 +0200 Subject: [PATCH 031/108] Bump maven-checkstyle-plugin from 3.1.2 to 3.2.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9037678aa3..d54fd0c10e 100644 --- a/pom.xml +++ b/pom.xml @@ -93,7 +93,7 @@ 5.0 3.0.0-M5 9.3 - 3.1.2 + 3.2.0 3.19.0 1.10.12 3.2.0 From 940252bafcbd6fedf4465297b4ebe5972df47554 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Sat, 10 Sep 2022 16:55:03 +0200 Subject: [PATCH 032/108] Bump checkstyle from 9.3 to 10.3.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d54fd0c10e..992a104099 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ 5.0 3.0.0-M5 - 9.3 + 10.3.3 3.2.0 3.19.0 1.10.12 From ba262675af36840e8fb5ca1042a1b7d94a95248e Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Sat, 10 Sep 2022 17:14:59 +0200 Subject: [PATCH 033/108] Bump org.yaml:snakeyaml from 1.30 to 1.31 Fixes https://github.com/advisories/GHSA-3mc7-4q67-w48m Fixes https://github.com/pmd/pmd/security/dependabot/24 Fixes CVE-2022-25857 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 992a104099..bece94f2d0 100644 --- a/pom.xml +++ b/pom.xml @@ -770,7 +770,7 @@ org.yaml snakeyaml - 1.30 + 1.31 From dba3a76312f69f08c9833dcabc35976b25789eb7 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Sun, 11 Sep 2022 11:09:29 +0200 Subject: [PATCH 034/108] Add @mohan-chinnappan-n as a contributor --- .all-contributorsrc | 12 +++++++++++- docs/pages/pmd/projectdocs/credits.md | 25 +++++++++++++------------ 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 908c5cc8cb..3120c1af00 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -6798,7 +6798,8 @@ "contributions": [ "doc" ] - },{ + }, + { "login": "pacvz", "name": "pacvz", "avatar_url": "https://avatars.githubusercontent.com/u/35453365?v=4", @@ -6806,6 +6807,15 @@ "contributions": [ "code" ] + }, + { + "login": "mohan-chinnappan-n", + "name": "mohan-chinnappan-n", + "avatar_url": "https://avatars.githubusercontent.com/u/5963194?v=4", + "profile": "https://mohan-chinnappan-n.github.io/about/cv.html", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/docs/pages/pmd/projectdocs/credits.md b/docs/pages/pmd/projectdocs/credits.md index 536ffc76a9..53a6336d25 100644 --- a/docs/pages/pmd/projectdocs/credits.md +++ b/docs/pages/pmd/projectdocs/credits.md @@ -863,111 +863,112 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
meandonlyme
🐛
mikesive
🐛
milossesic
🐛 +
mohan-chinnappan-n
💻
mriddell95
🐛
mrlzh
🐛
msloan
🐛 -
mucharlaravalika
🐛 +
mucharlaravalika
🐛
mvenneman
🐛
nareshl119
🐛
nicolas-harraudeau-sonarsource
🐛
noerremark
🐛
novsirion
🐛
oggboy
🐛 -
oinume
🐛 +
oinume
🐛
orimarko
💻 🐛
pacvz
💻
pallavi agarwal
🐛
parksungrin
🐛
patpatpat123
🐛
patriksevallius
🐛 -
pbrajesh1
🐛 +
pbrajesh1
🐛
phoenix384
🐛
piotrszymanski-sc
💻
plan3d
🐛
poojasix
🐛
prabhushrikant
🐛
pujitha8783
🐛 -
r-r-a-j
🐛 +
r-r-a-j
🐛
raghujayjunk
🐛
rajeshveera
🐛
rajeswarreddy88
🐛
recdevs
🐛
reudismam
💻 🐛
rijkt
🐛 -
rillig-tk
🐛 +
rillig-tk
🐛
rmohan20
💻 🐛
rxmicro
🐛
ryan-gustafson
💻 🐛
sabi0
🐛
scais
🐛
sebbASF
🐛 -
sergeygorbaty
💻 +
sergeygorbaty
💻
shilko2013
🐛
shiomiyan
📖
simeonKondr
🐛
snajberk
🐛
sniperrifle2004
🐛
snuyanzin
🐛 💻 -
sratz
🐛 +
sratz
🐛
stonio
🐛
sturton
💻 🐛
sudharmohan
🐛
suruchidawar
🐛
svenfinitiv
🐛
tashiscool
🐛 -
test-git-hook
🐛 +
test-git-hook
🐛
testation21
💻 🐛
thanosa
🐛
tiandiyixian
🐛
tobwoerk
🐛
tprouvot
🐛 💻
trentchilders
🐛 -
triandicAnt
🐛 +
triandicAnt
🐛
trishul14
🐛
tsui
🐛
winhkey
🐛
witherspore
🐛
wjljack
🐛
wuchiuwong
🐛 -
xingsong
🐛 +
xingsong
🐛
xioayuge
🐛
xnYi9wRezm
💻 🐛
xuanuy
🐛
xyf0921
🐛
yalechen-cyw3
🐛
yasuharu-sato
🐛 -
zenglian
🐛 +
zenglian
🐛
zgrzyt93
💻 🐛
zh3ng
🐛
zt_soft
🐛
ztt79
🐛
zzzzfeng
🐛
Árpád Magosányi
🐛 -
任贵杰
🐛 +
任贵杰
🐛
茅延安
💻 From 91d8930e9111c35ac38691e49d32b4361110d01f Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Sun, 11 Sep 2022 11:09:46 +0200 Subject: [PATCH 035/108] [doc] Update release notes (#4116) --- docs/pages/release_notes.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md index b8f8783555..84d0bc0712 100644 --- a/docs/pages/release_notes.md +++ b/docs/pages/release_notes.md @@ -15,10 +15,12 @@ This is a {{ site.pmd.release_type }} release. ### New and noteworthy ### Fixed Issues +* [#4116](https://github.com/pmd/pmd/pull/4116): \[core] Missing --file arg in TreeExport CLI example ### API Changes ### External Contributions +* [#4116](https://github.com/pmd/pmd/pull/4116): \[core] Fix missing --file arg in TreeExport CLI example - [@mohan-chinnappan-n](https://github.com/mohan-chinnappan-n) {% endtocmaker %} From 0962a33e1489b4437f970987ae88042a5c1d6e8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotrek=20=C5=BBygie=C5=82o?= Date: Thu, 7 Jul 2022 13:03:15 +0200 Subject: [PATCH 036/108] Fix typo --- pmd-java/src/main/resources/category/java/design.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmd-java/src/main/resources/category/java/design.xml b/pmd-java/src/main/resources/category/java/design.xml index edeecae3fd..9cedd65fac 100644 --- a/pmd-java/src/main/resources/category/java/design.xml +++ b/pmd-java/src/main/resources/category/java/design.xml @@ -17,7 +17,7 @@ Rules that help you discover design issues. message="No abstract method which means that the keyword is most likely used to prevent instantiation. Use a private or protected constructor instead." externalInfoUrl="${pmd.website.baseurl}/pmd_rules_java_design.html#abstractclasswithoutanymethod"> -If an abstract class does not provides any methods, it may be acting as a simple data container +If an abstract class does not provide any methods, it may be acting as a simple data container that is not meant to be instantiated. In this case, it is probably better to use a private or protected constructor in order to prevent instantiation than make the class misleadingly abstract. From 57138dc1c7aa4a09ba55fcf4218afdc2cbab5d78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotrek=20=C5=BBygie=C5=82o?= Date: Thu, 7 Jul 2022 13:04:24 +0200 Subject: [PATCH 037/108] Fix punctuation/use full stop in sentence --- pmd-java/src/main/resources/category/java/design.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmd-java/src/main/resources/category/java/design.xml b/pmd-java/src/main/resources/category/java/design.xml index 9cedd65fac..5b472ad544 100644 --- a/pmd-java/src/main/resources/category/java/design.xml +++ b/pmd-java/src/main/resources/category/java/design.xml @@ -53,7 +53,7 @@ public abstract class Example { class="net.sourceforge.pmd.lang.rule.XPathRule" externalInfoUrl="${pmd.website.baseurl}/pmd_rules_java_design.html#avoidcatchinggenericexception"> -Avoid catching generic exceptions such as NullPointerException, RuntimeException, Exception in try-catch block +Avoid catching generic exceptions such as NullPointerException, RuntimeException, Exception in try-catch block. 3 From f4a0dff0c9b732b82530e59ce352364ca03f5c01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotrek=20=C5=BBygie=C5=82o?= Date: Tue, 21 Jul 2020 23:23:32 +0200 Subject: [PATCH 038/108] Add missing 'to' and agree verb with subject --- pmd-java/src/main/resources/category/java/bestpractices.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmd-java/src/main/resources/category/java/bestpractices.xml b/pmd-java/src/main/resources/category/java/bestpractices.xml index e865f684e4..122b0e4dc7 100644 --- a/pmd-java/src/main/resources/category/java/bestpractices.xml +++ b/pmd-java/src/main/resources/category/java/bestpractices.xml @@ -19,7 +19,7 @@ Rules which enforce generally accepted best practices. The abstract class does not contain any abstract methods. An abstract class suggests an incomplete implementation, which is to be completed by subclasses implementing the abstract methods. If the class is intended to be used as a base class only (not to be instantiated -directly) a protected constructor can be provided prevent direct instantiation. +directly) a protected constructor can be provided to prevent direct instantiation. 3 From a3ea6be9caa76fc75ec7cce383e4fd1d15c3eded Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotrek=20=C5=BBygie=C5=82o?= Date: Mon, 12 Sep 2022 20:29:00 +0200 Subject: [PATCH 039/108] Fix it's -> its --- pmd-java/src/main/resources/category/java/codestyle.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmd-java/src/main/resources/category/java/codestyle.xml b/pmd-java/src/main/resources/category/java/codestyle.xml index f9770a891b..f222b6cf88 100644 --- a/pmd-java/src/main/resources/category/java/codestyle.xml +++ b/pmd-java/src/main/resources/category/java/codestyle.xml @@ -436,7 +436,7 @@ public class Éléphant {} externalInfoUrl="${pmd.website.baseurl}/pmd_rules_java_codestyle.html#commentdefaultaccessmodifier"> To avoid mistakes if we want that an Annotation, Class, Enum, Method, Constructor or Field have a default access modifier -we must add a comment at the beginning of it's declaration. +we must add a comment at the beginning of its declaration. By default the comment must be `/* default */` or `/* package */`, if you want another, you have to provide a regular expression. This rule ignores by default all cases that have a @VisibleForTesting annotation. Use the property "ignoredAnnotations" to customize the recognized annotations. From 936cbafd36c4548f1517a457cfdb3f40ef9b4bad Mon Sep 17 00:00:00 2001 From: Matt Hargett Date: Tue, 13 Sep 2022 21:58:02 -0700 Subject: [PATCH 040/108] remove unused param --- .../src/main/java/net/sourceforge/pmd/cpd/LuaTokenizer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pmd-lua/src/main/java/net/sourceforge/pmd/cpd/LuaTokenizer.java b/pmd-lua/src/main/java/net/sourceforge/pmd/cpd/LuaTokenizer.java index 8e4f354b17..cd9a260b6d 100644 --- a/pmd-lua/src/main/java/net/sourceforge/pmd/cpd/LuaTokenizer.java +++ b/pmd-lua/src/main/java/net/sourceforge/pmd/cpd/LuaTokenizer.java @@ -75,11 +75,11 @@ public class LuaTokenizer extends AntlrTokenizer { @Override protected void analyzeTokens(final AntlrToken currentToken, final Iterable remainingTokens) { discardCurrent = false; - skipRequires(currentToken, remainingTokens); + skipRequires(currentToken); skipLiteralSequences(currentToken, remainingTokens); } - private void skipRequires(final AntlrToken currentToken, final Iterable remainingTokens) { + private void skipRequires(final AntlrToken currentToken) { final int type = currentToken.getKind(); if (type == LuaLexer.REQUIRE) { discardingRequires = true; From f7a5f9cad98babfc8cff8e0209ea110bb5948958 Mon Sep 17 00:00:00 2001 From: Matt Hargett Date: Tue, 13 Sep 2022 22:17:43 -0700 Subject: [PATCH 041/108] fix incorrect comments --- .../src/main/java/net/sourceforge/pmd/cpd/LuaTokenizer.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pmd-lua/src/main/java/net/sourceforge/pmd/cpd/LuaTokenizer.java b/pmd-lua/src/main/java/net/sourceforge/pmd/cpd/LuaTokenizer.java index cd9a260b6d..328c5e8ab0 100644 --- a/pmd-lua/src/main/java/net/sourceforge/pmd/cpd/LuaTokenizer.java +++ b/pmd-lua/src/main/java/net/sourceforge/pmd/cpd/LuaTokenizer.java @@ -21,7 +21,7 @@ public class LuaTokenizer extends AntlrTokenizer { private boolean ignoreLiteralSequences = false; /** - * Sets the possible options for the C# tokenizer. + * Sets the possible options for the Lua tokenizer. * * @param properties the properties * @see #OPTION_IGNORE_LITERAL_SEQUENCES @@ -49,8 +49,8 @@ public class LuaTokenizer extends AntlrTokenizer { * The {@link LuaTokenFilter} extends the {@link AntlrTokenFilter} to discard * Lua-specific tokens. *

- * By default, it enables annotation-based CPD suppression. - * If the --ignoreUsings flag is provided, require() directives are filtered out. + * By default, it discards semicolons, require statements, and + * enables annotation-based CPD suppression. *

*/ private static class LuaTokenFilter extends AntlrTokenFilter { From 05c30a1053628e90c5ec28374d2ef017a436182d Mon Sep 17 00:00:00 2001 From: Matt Hargett Date: Tue, 13 Sep 2022 22:52:14 -0700 Subject: [PATCH 042/108] Update documentation and changelog --- docs/pages/pmd/userdocs/cpd/cpd.md | 2 +- docs/pages/release_notes.md | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/docs/pages/pmd/userdocs/cpd/cpd.md b/docs/pages/pmd/userdocs/cpd/cpd.md index 67b81492be..22d594259b 100644 --- a/docs/pages/pmd/userdocs/cpd/cpd.md +++ b/docs/pages/pmd/userdocs/cpd/cpd.md @@ -122,7 +122,7 @@ Novice as much as advanced readers may want to [read on on Refactoring Guru](htt {% include custom/cli_option_row.html options="--ignore-literal-sequences" description="Ignore sequences of literals (common e.g. in list initializers)" default="false" - languages="C#, C++" + languages="C#, C++, Lua" %} {% include custom/cli_option_row.html options="--ignore-usings" description="Ignore `using` directives in C# when comparing text" diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md index 84d0bc0712..720dd44e3e 100644 --- a/docs/pages/release_notes.md +++ b/docs/pages/release_notes.md @@ -14,13 +14,22 @@ This is a {{ site.pmd.release_type }} release. ### New and noteworthy +#### Luau Support + +This release of PMD brings support for [Luau](https://github.com/Roblox/luau), a gradually typed language derived from Lua. + ### Fixed Issues * [#4116](https://github.com/pmd/pmd/pull/4116): \[core] Missing --file arg in TreeExport CLI example ### API Changes +#### CPD CLI + +* CPD now supports the `--ignore-literal-sequences` argument when analyzing Lua code. + ### External Contributions * [#4116](https://github.com/pmd/pmd/pull/4116): \[core] Fix missing --file arg in TreeExport CLI example - [@mohan-chinnappan-n](https://github.com/mohan-chinnappan-n) +* [#4066](https://github.com/pmd/pmd/pull/4066): \[lua] Add support for Luau syntax and skipping literal sequences in CPD - [@matthargett](https://github.com/matthargett) {% endtocmaker %} From 7f7f8f7b6a1f5f23ac7af94a5066f1e229e9ed19 Mon Sep 17 00:00:00 2001 From: Oleg Andreych Date: Fri, 26 Aug 2022 00:26:10 +0500 Subject: [PATCH 043/108] False-positive UnnecessaryFullyQualifiedName when nested and non-nested classes with the same name and in the same package are used together #4085 --- .../UnnecessaryFullyQualifiedNameRule.java | 31 ++++++++++++++++--- .../xml/UnnecessaryFullyQualifiedName.xml | 19 ++++++++++++ 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryFullyQualifiedNameRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryFullyQualifiedNameRule.java index 32bf8fa21c..36773e3a91 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryFullyQualifiedNameRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryFullyQualifiedNameRule.java @@ -17,7 +17,9 @@ import java.util.logging.Logger; import org.apache.commons.lang3.StringUtils; import net.sourceforge.pmd.RuleContext; +import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceDeclaration; import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceType; +import net.sourceforge.pmd.lang.java.ast.ASTCompilationUnit; import net.sourceforge.pmd.lang.java.ast.ASTImportDeclaration; import net.sourceforge.pmd.lang.java.ast.ASTName; import net.sourceforge.pmd.lang.java.ast.ASTNameList; @@ -186,9 +188,11 @@ public class UnnecessaryFullyQualifiedNameRule extends AbstractJavaRule { if (matches.isEmpty()) { if (isJavaLangImplicit(node)) { - addViolation(data, node, new Object[] { node.getImage(), "java.lang.*", "implicit "}); + addViolation(data, node, new Object[]{node.getImage(), "java.lang.*", "implicit "}); } else if (isSamePackage(node, name)) { - addViolation(data, node, new Object[] { node.getImage(), currentPackage + ".*", "same package "}); + if (!hasSameSimpleNameInScope(node)) { + addViolation(data, node, new Object[]{node.getImage(), currentPackage + ".*", "same package "}); + } } } else { ASTImportDeclaration firstMatch = findFirstMatch(matches); @@ -199,11 +203,30 @@ public class UnnecessaryFullyQualifiedNameRule extends AbstractJavaRule { String importStr = firstMatch.getImportedName() + (firstMatch.isImportOnDemand() ? ".*" : ""); String type = firstMatch.isStatic() ? "static " : ""; - addViolation(data, node, new Object[] { node.getImage(), importStr, type }); + addViolation(data, node, new Object[]{node.getImage(), importStr, type}); } } } + private boolean hasSameSimpleNameInScope(TypeNode node) { + final ASTCompilationUnit root = node.getRoot(); + final List declarationDescendants = root.findDescendantsOfType(ASTClassOrInterfaceDeclaration.class); + final Class nodeType = node.getType(); + + if (nodeType == null) { + return false; + } + + final String nodeSimpleName = nodeType.getSimpleName(); + + for (ASTClassOrInterfaceDeclaration declarationDescendant : declarationDescendants) { + if (nodeSimpleName.equals(declarationDescendant.getSimpleName())) { + return true; + } + } + return false; + } + private ASTImportDeclaration findFirstMatch(List imports) { // first search only static imports ASTImportDeclaration result = null; @@ -404,7 +427,7 @@ public class UnnecessaryFullyQualifiedNameRule extends AbstractJavaRule { // Is it a conflict with a class in the same file? final Set qualifiedTypes = node.getScope().getEnclosingScope(SourceFileScope.class) - .getQualifiedTypeNames().keySet(); + .getQualifiedTypeNames().keySet(); for (final String qualified : qualifiedTypes) { int fullLength = qualified.length(); if (qualified.endsWith(unqualifiedName) diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UnnecessaryFullyQualifiedName.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UnnecessaryFullyQualifiedName.xml index f95d7bc81e..865f62c789 100644 --- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UnnecessaryFullyQualifiedName.xml +++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UnnecessaryFullyQualifiedName.xml @@ -622,6 +622,25 @@ public class UnnecessaryFullyQualifiedName { ]]> + + False positive when same package inner class is referenced (not enum) + 0 + + + #2098 false positive with annotated package 0 From af30f4cef92d882d253ee2f0c9d5144737412635 Mon Sep 17 00:00:00 2001 From: Oleg Andreych Date: Sun, 18 Sep 2022 15:29:50 +0500 Subject: [PATCH 044/108] False-positive UnnecessaryFullyQualifiedName when nested and non-nested classes with the same name and in the same package are used together #4085 * Regression fix; --- .../UnnecessaryFullyQualifiedNameRule.java | 10 +++++----- .../xml/UnnecessaryFullyQualifiedName.xml | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryFullyQualifiedNameRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryFullyQualifiedNameRule.java index 36773e3a91..5348abca59 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryFullyQualifiedNameRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryFullyQualifiedNameRule.java @@ -188,10 +188,11 @@ public class UnnecessaryFullyQualifiedNameRule extends AbstractJavaRule { if (matches.isEmpty()) { if (isJavaLangImplicit(node)) { - addViolation(data, node, new Object[]{node.getImage(), "java.lang.*", "implicit "}); + asCtx(data).addViolation(node, + node.getImage(), "java.lang.*", "implicit "); } else if (isSamePackage(node, name)) { if (!hasSameSimpleNameInScope(node)) { - addViolation(data, node, new Object[]{node.getImage(), currentPackage + ".*", "same package "}); + asCtx(data).addViolation(node, node.getImage(), currentPackage + ".*", "same package "); } } } else { @@ -217,10 +218,9 @@ public class UnnecessaryFullyQualifiedNameRule extends AbstractJavaRule { return false; } - final String nodeSimpleName = nodeType.getSimpleName(); - for (ASTClassOrInterfaceDeclaration declarationDescendant : declarationDescendants) { - if (nodeSimpleName.equals(declarationDescendant.getSimpleName())) { + if (nodeType.getSimpleName().equals(declarationDescendant.getSimpleName()) + && !nodeType.getName().equals(declarationDescendant.getQualifiedName().toString())) { return true; } } diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UnnecessaryFullyQualifiedName.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UnnecessaryFullyQualifiedName.xml index 865f62c789..426bb9b4b6 100644 --- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UnnecessaryFullyQualifiedName.xml +++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UnnecessaryFullyQualifiedName.xml @@ -641,6 +641,21 @@ public class OuterTestClass { ]]> + + Should report fully-qualified name usage of a class in itself. + 1 + 4 + + + #2098 false positive with annotated package 0 From 600561e44cc4942ca888990f4ec6d8c7c86d147f Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 19 Sep 2022 21:02:02 +0200 Subject: [PATCH 045/108] build: harden build.yml permissions Signed-off-by: Alex --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f94319eb05..cb7a64a706 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,6 +14,9 @@ on: - cron: '0 4 1 * *' workflow_dispatch: +permissions: + contents: read # to fetch code (actions/checkout) + jobs: build: runs-on: ${{ matrix.os }} From 4966e99082560df6a5dc03cd21fd38a9eb62c2e7 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 19 Sep 2022 21:10:13 +0200 Subject: [PATCH 046/108] build: harden git-repo-sync.yml permissions Signed-off-by: Alex --- .github/workflows/git-repo-sync.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/git-repo-sync.yml b/.github/workflows/git-repo-sync.yml index 3cfb2e23e9..790922db40 100644 --- a/.github/workflows/git-repo-sync.yml +++ b/.github/workflows/git-repo-sync.yml @@ -9,6 +9,9 @@ on: - '**' workflow_dispatch: +permissions: + contents: read # to fetch code (actions/checkout) + jobs: build: runs-on: ubuntu-latest From 9d7c37cef73348a64b3886ea340a100d1e078bab Mon Sep 17 00:00:00 2001 From: Suvashri <112872981+Suvashri@users.noreply.github.com> Date: Wed, 21 Sep 2022 15:28:51 +0530 Subject: [PATCH 047/108] Update performance.xml --- pmd-java/src/main/resources/category/java/performance.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmd-java/src/main/resources/category/java/performance.xml b/pmd-java/src/main/resources/category/java/performance.xml index d211ac31b4..14a8958bcb 100644 --- a/pmd-java/src/main/resources/category/java/performance.xml +++ b/pmd-java/src/main/resources/category/java/performance.xml @@ -845,7 +845,7 @@ private String baz() { Switch statements are intended to be used to support complex branching behaviour. Using a switch for only a few cases is ill-advised, since switches are not as easy to understand as if-then statements. In these cases use the -if-then statement to increase code readability. +if-else statement to increase code readability. 3 From dcd8ff0ac082bc38760e7154ef73bc321bd48a81 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Sat, 24 Sep 2022 17:13:29 +0200 Subject: [PATCH 048/108] [lua] Fix parsing of short/long comments --- .../net/sourceforge/pmd/lang/lua/antlr4/Lua.g4 | 17 +++++++++++------ .../sourceforge/pmd/cpd/LuaTokenizerTest.java | 5 +++++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4 b/pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4 index 2c2603c0a2..fc94fa1b50 100644 --- a/pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4 +++ b/pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4 @@ -469,11 +469,11 @@ CLOSE_PARENS ; NL - : '\r\n' | '\r' | '\n' - | '\u0085' // ' - | '\u2028' //'' - | '\u2029' //'' - ; + : '\r\n' | '\r' | '\n' + | '\u0085' // ' + | '\u2028' //'' + | '\u2029' //'' + ; COMMA : ',' @@ -525,6 +525,11 @@ HexDigit : [0-9a-fA-F] ; +fragment +StartingSingleCommentLineInputCharacter + : ~[[\r\n\u0085\u2028\u2029] + ; + fragment SingleLineInputCharacter : ~[\r\n\u0085\u2028\u2029] @@ -535,7 +540,7 @@ COMMENT ; LINE_COMMENT - : '--' SingleLineInputCharacter* -> channel(HIDDEN) + : '--' (NL | StartingSingleCommentLineInputCharacter SingleLineInputCharacter*) -> channel(HIDDEN) ; WS diff --git a/pmd-lua/src/test/java/net/sourceforge/pmd/cpd/LuaTokenizerTest.java b/pmd-lua/src/test/java/net/sourceforge/pmd/cpd/LuaTokenizerTest.java index 83b39442a1..fb77931286 100644 --- a/pmd-lua/src/test/java/net/sourceforge/pmd/cpd/LuaTokenizerTest.java +++ b/pmd-lua/src/test/java/net/sourceforge/pmd/cpd/LuaTokenizerTest.java @@ -44,4 +44,9 @@ public class LuaTokenizerTest extends CpdTextComparisonTest { public void testRegression() { doTest("luauTypes"); } + + @Test + public void testComment() { + doTest("comment"); + } } From 746fcbf086c514895dd85e7b7a451b3035d8e102 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Sat, 24 Sep 2022 17:18:32 +0200 Subject: [PATCH 049/108] [lua] Fixups from #4066 --- docs/pages/release_notes.md | 5 +++-- .../main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4 | 1 + .../test/java/net/sourceforge/pmd/cpd/LuaTokenizerTest.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md index 720dd44e3e..1c624b8efb 100644 --- a/docs/pages/release_notes.md +++ b/docs/pages/release_notes.md @@ -14,9 +14,10 @@ This is a {{ site.pmd.release_type }} release. ### New and noteworthy -#### Luau Support +#### Lua now supports additionally Luau -This release of PMD brings support for [Luau](https://github.com/Roblox/luau), a gradually typed language derived from Lua. +This release of PMD adds support for [Luau](https://github.com/Roblox/luau), a gradually typed language derived +from Lua. This means, that the Lua language in PMD can now parse both Lua and Luau. ### Fixed Issues * [#4116](https://github.com/pmd/pmd/pull/4116): \[core] Missing --file arg in TreeExport CLI example diff --git a/pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4 b/pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4 index fc94fa1b50..fde74727ac 100644 --- a/pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4 +++ b/pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4 @@ -108,6 +108,7 @@ label ; laststat + // "continue" is a luau addition and actually not a reserved keyword : 'return' explist? | 'break' | 'continue' ; diff --git a/pmd-lua/src/test/java/net/sourceforge/pmd/cpd/LuaTokenizerTest.java b/pmd-lua/src/test/java/net/sourceforge/pmd/cpd/LuaTokenizerTest.java index fb77931286..9c8705d4b4 100644 --- a/pmd-lua/src/test/java/net/sourceforge/pmd/cpd/LuaTokenizerTest.java +++ b/pmd-lua/src/test/java/net/sourceforge/pmd/cpd/LuaTokenizerTest.java @@ -41,7 +41,7 @@ public class LuaTokenizerTest extends CpdTextComparisonTest { } @Test - public void testRegression() { + public void testLuauTypes() { doTest("luauTypes"); } From 4d630031c462acef63aa46665b179b6a7f06a623 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Sat, 24 Sep 2022 17:29:00 +0200 Subject: [PATCH 050/108] Add missing test files --- .../pmd/lang/lua/cpd/testdata/comment.lua | 13 +++++++++++ .../pmd/lang/lua/cpd/testdata/comment.txt | 23 +++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/comment.lua create mode 100644 pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/comment.txt diff --git a/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/comment.lua b/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/comment.lua new file mode 100644 index 0000000000..d79dc5db81 --- /dev/null +++ b/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/comment.lua @@ -0,0 +1,13 @@ + +-- inline comment ("long comment") +print(1 --[[, 2]]) + +-- line comment ("short comment") +print(1) -- comment + +-- inline comment with multiple lines ("long comment") +print(1 --[[comment line 1 +comment line 2]]) + +-- line comment without any content +print(1) -- diff --git a/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/comment.txt b/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/comment.txt new file mode 100644 index 0000000000..f6f1fd25fd --- /dev/null +++ b/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/comment.txt @@ -0,0 +1,23 @@ + [Image] or [Truncated image[ Bcol Ecol +L3 + [print] 1 5 + [(] 6 6 + [1] 7 7 + [)] 18 18 +L6 + [print] 1 5 + [(] 6 6 + [1] 7 7 + [)] 8 8 +L9 + [print] 1 5 + [(] 6 6 + [1] 7 7 +L10 + [)] 17 17 +L13 + [print] 1 5 + [(] 6 6 + [1] 7 7 + [)] 8 8 +EOF From 993c5f809a70606093b67d03d7bbd5bb864a89ba Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Sat, 24 Sep 2022 17:35:55 +0200 Subject: [PATCH 051/108] Update pmd-java/src/main/resources/category/java/performance.xml --- pmd-java/src/main/resources/category/java/performance.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmd-java/src/main/resources/category/java/performance.xml b/pmd-java/src/main/resources/category/java/performance.xml index 14a8958bcb..84a7da762d 100644 --- a/pmd-java/src/main/resources/category/java/performance.xml +++ b/pmd-java/src/main/resources/category/java/performance.xml @@ -844,7 +844,7 @@ private String baz() { externalInfoUrl="${pmd.website.baseurl}/pmd_rules_java_performance.html#toofewbranchesforaswitchstatement"> Switch statements are intended to be used to support complex branching behaviour. Using a switch for only a few -cases is ill-advised, since switches are not as easy to understand as if-then statements. In these cases use the +cases is ill-advised, since switches are not as easy to understand as if-else statements. In these cases use the if-else statement to increase code readability. 3 From f23f5c2f2bcf0b18a3960a1d1a67b67d912c7162 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Sat, 24 Sep 2022 17:45:48 +0200 Subject: [PATCH 052/108] [doc] Update release notes (#4131) --- docs/pages/release_notes.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md index 84d0bc0712..1336a55897 100644 --- a/docs/pages/release_notes.md +++ b/docs/pages/release_notes.md @@ -21,6 +21,7 @@ This is a {{ site.pmd.release_type }} release. ### External Contributions * [#4116](https://github.com/pmd/pmd/pull/4116): \[core] Fix missing --file arg in TreeExport CLI example - [@mohan-chinnappan-n](https://github.com/mohan-chinnappan-n) +* [#4131](https://github.com/pmd/pmd/pull/4131): \[doc] TooFewBranchesForASwitchStatement - Use "if-else" instead of "if-then" - [@Suvashri](https://github.com/Suvashri) {% endtocmaker %} From d6b5f1cf52705904ec595e8b219c98e681fa3398 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Sat, 24 Sep 2022 17:46:14 +0200 Subject: [PATCH 053/108] Add @Suvashri as a contributor --- .all-contributorsrc | 9 ++++ docs/pages/pmd/projectdocs/credits.md | 71 ++++++++++++++------------- 2 files changed, 45 insertions(+), 35 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 3120c1af00..e29348424c 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -6816,6 +6816,15 @@ "contributions": [ "code" ] + }, + { + "login": "Suvashri", + "name": "Suvashri", + "avatar_url": "https://avatars.githubusercontent.com/u/112872981?v=4", + "profile": "https://github.com/Suvashri", + "contributions": [ + "doc" + ] } ], "contributorsPerLine": 7, diff --git a/docs/pages/pmd/projectdocs/credits.md b/docs/pages/pmd/projectdocs/credits.md index 53a6336d25..9f1604b29a 100644 --- a/docs/pages/pmd/projectdocs/credits.md +++ b/docs/pages/pmd/projectdocs/credits.md @@ -659,315 +659,316 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
StuartClayton5
🐛
Supun Arunoda
🐛
Suren Abrahamyan
🐛 -
SwatiBGupta1110
🐛 +
Suvashri
📖 +
SwatiBGupta1110
🐛
SyedThoufich
🐛
Szymon Sasin
🐛
T-chuangxin
🐛
TERAI Atsuhiro
🐛
TIOBE Software
💻 🐛
Taylor Smock
🐛 -
Techeira Damián
💻 🐛 +
Techeira Damián
💻 🐛
Ted Husted
🐛
TehBakker
🐛
The Gitter Badger
🐛
Theodoor
🐛
Thiago Henrique Hüpner
🐛
Thibault Meyer
🐛 -
Thomas Güttler
🐛 +
Thomas Güttler
🐛
Thomas Jones-Low
🐛
Thomas Smith
💻 🐛
ThrawnCA
🐛
Thunderforge
💻 🐛
Tim van der Lippe
🐛
Tobias Weimer
💻 🐛 -
Tom Daly
🐛 +
Tom Daly
🐛
Tomer Figenblat
🐛
Tomi De Lucca
💻 🐛
Torsten Kleiber
🐛
TrackerSB
🐛
Ullrich Hafner
🐛
Utku Cuhadaroglu
💻 🐛 -
Valentin Brandl
🐛 +
Valentin Brandl
🐛
Valeria
🐛
Vasily Anisimov
🐛
Vibhor Goyal
🐛
Vickenty Fesunov
🐛
Victor Noël
🐛
Vincent Galloy
💻 -
Vincent HUYNH
🐛 +
Vincent HUYNH
🐛
Vincent Maurin
🐛
Vincent Privat
🐛
Vishhwas
🐛
Vitaly
🐛
Vitaly Polonetsky
🐛
Vojtech Polivka
🐛 -
Vsevolod Zholobov
🐛 +
Vsevolod Zholobov
🐛
Vyom Yadav
💻
Wang Shidong
🐛
Waqas Ahmed
🐛
Wayne J. Earl
🐛
Wchenghui
🐛
Will Winder
🐛 -
William Brockhus
💻 🐛 +
William Brockhus
💻 🐛
Wilson Kurniawan
🐛
Wim Deblauwe
🐛
Woongsik Choi
🐛
XenoAmess
💻 🐛
Yang
💻
YaroslavTER
🐛 -
Young Chan
💻 🐛 +
Young Chan
💻 🐛
YuJin Kim
🐛
Yuri Dolzhenko
🐛
Yurii Dubinka
🐛
Zoltan Farkas
🐛
Zustin
🐛
aaronhurst-google
🐛 💻 -
alexmodis
🐛 +
alexmodis
🐛
andreoss
🐛
andrey81inmd
💻 🐛
anicoara
🐛
arunprasathav
🐛
asiercamara
🐛
astillich-igniti
💻 -
avesolovksyy
🐛 +
avesolovksyy
🐛
avishvat
🐛
avivmu
🐛
axelbarfod1
🐛
b-3-n
🐛
balbhadra9
🐛
base23de
🐛 -
bergander
🐛 +
bergander
🐛
berkam
💻 🐛
breizh31
🐛
caesarkim
🐛
carolyujing
🐛
cesares-basilico
🐛
chrite
🐛 -
cobratbq
🐛 +
cobratbq
🐛
coladict
🐛
cosmoJFH
🐛
cristalp
🐛
crunsk
🐛
cwholmes
🐛
cyberjj999
🐛 -
cyw3
🐛 +
cyw3
🐛
d1ss0nanz
🐛
dalizi007
💻
danbrycefairsailcom
🐛
dariansanity
🐛
darrenmiliband
🐛
davidburstrom
🐛 -
dbirkman-paloalto
🐛 +
dbirkman-paloalto
🐛
deepak-patra
🐛
dependabot[bot]
💻 🐛
dinesh150
🐛
diziaq
🐛
dreaminpast123
🐛
duanyanan
🐛 -
dutt-sanjay
🐛 +
dutt-sanjay
🐛
dylanleung
🐛
dzeigler
🐛
ekkirala
🐛
emersonmoura
🐛
fairy
🐛
filiprafalowicz
💻 -
foxmason
🐛 +
foxmason
🐛
frankegabor
🐛
frankl
🐛
freafrea
🐛
fsapatin
🐛
gracia19
🐛
guo fei
🐛 -
gurmsc5
🐛 +
gurmsc5
🐛
gwilymatgearset
💻 🐛
haigsn
🐛
hemanshu070
🐛
henrik242
🐛
hongpuwu
🐛
hvbtup
💻 🐛 -
igniti GmbH
🐛 +
igniti GmbH
🐛
ilovezfs
🐛
itaigilo
🐛
jakivey32
🐛
jbennett2091
🐛
jcamerin
🐛
jkeener1
🐛 -
jmetertea
🐛 +
jmetertea
🐛
johnra2
💻
josemanuelrolon
💻 🐛
kabroxiko
💻 🐛
karwer
🐛
kaulonline
🐛
kdaemonv
🐛 -
kenji21
💻 🐛 +
kenji21
💻 🐛
kfranic
🐛
khalidkh
🐛
krzyk
🐛
lasselindqvist
🐛
lgemeinhardt
🐛
lihuaib
🐛 -
lonelyma1021
🐛 +
lonelyma1021
🐛
lpeddy
🐛
lujiefsi
💻
lukelukes
💻
lyriccoder
🐛
marcelmore
🐛
matchbox
🐛 -
matthiaskraaz
🐛 +
matthiaskraaz
🐛
meandonlyme
🐛
mikesive
🐛
milossesic
🐛
mohan-chinnappan-n
💻
mriddell95
🐛
mrlzh
🐛 -
msloan
🐛 +
msloan
🐛
mucharlaravalika
🐛
mvenneman
🐛
nareshl119
🐛
nicolas-harraudeau-sonarsource
🐛
noerremark
🐛
novsirion
🐛 -
oggboy
🐛 +
oggboy
🐛
oinume
🐛
orimarko
💻 🐛
pacvz
💻
pallavi agarwal
🐛
parksungrin
🐛
patpatpat123
🐛 -
patriksevallius
🐛 +
patriksevallius
🐛
pbrajesh1
🐛
phoenix384
🐛
piotrszymanski-sc
💻
plan3d
🐛
poojasix
🐛
prabhushrikant
🐛 -
pujitha8783
🐛 +
pujitha8783
🐛
r-r-a-j
🐛
raghujayjunk
🐛
rajeshveera
🐛
rajeswarreddy88
🐛
recdevs
🐛
reudismam
💻 🐛 -
rijkt
🐛 +
rijkt
🐛
rillig-tk
🐛
rmohan20
💻 🐛
rxmicro
🐛
ryan-gustafson
💻 🐛
sabi0
🐛
scais
🐛 -
sebbASF
🐛 +
sebbASF
🐛
sergeygorbaty
💻
shilko2013
🐛
shiomiyan
📖
simeonKondr
🐛
snajberk
🐛
sniperrifle2004
🐛 -
snuyanzin
🐛 💻 +
snuyanzin
🐛 💻
sratz
🐛
stonio
🐛
sturton
💻 🐛
sudharmohan
🐛
suruchidawar
🐛
svenfinitiv
🐛 -
tashiscool
🐛 +
tashiscool
🐛
test-git-hook
🐛
testation21
💻 🐛
thanosa
🐛
tiandiyixian
🐛
tobwoerk
🐛
tprouvot
🐛 💻 -
trentchilders
🐛 +
trentchilders
🐛
triandicAnt
🐛
trishul14
🐛
tsui
🐛
winhkey
🐛
witherspore
🐛
wjljack
🐛 -
wuchiuwong
🐛 +
wuchiuwong
🐛
xingsong
🐛
xioayuge
🐛
xnYi9wRezm
💻 🐛
xuanuy
🐛
xyf0921
🐛
yalechen-cyw3
🐛 -
yasuharu-sato
🐛 +
yasuharu-sato
🐛
zenglian
🐛
zgrzyt93
💻 🐛
zh3ng
🐛
zt_soft
🐛
ztt79
🐛
zzzzfeng
🐛 -
Árpád Magosányi
🐛 +
Árpád Magosányi
🐛
任贵杰
🐛
茅延安
💻 From b56e697b28a887947b783e47186e2e56dc7000b4 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Sat, 24 Sep 2022 17:50:55 +0200 Subject: [PATCH 054/108] Bump org.yaml:snakeyaml from 1.31 to 1.32 Fixes https://github.com/pmd/pmd/security/dependabot/25 Fixes https://github.com/advisories/GHSA-9w3m-gqgf-c4p9 Fixes CVE-2022-38752 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bece94f2d0..569c34bfd1 100644 --- a/pom.xml +++ b/pom.xml @@ -770,7 +770,7 @@ org.yaml snakeyaml - 1.31 + 1.32 From 0dcff7245549f6bcfe9f27c1fab6e5219ce5fd77 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Sat, 24 Sep 2022 17:52:56 +0200 Subject: [PATCH 055/108] Update gems Fixes https://github.com/pmd/pmd/security/dependabot/26 Fixes https://github.com/advisories/GHSA-4qw4-jpp4-8gvp --- Gemfile.lock | 29 +++++++++++++++-------------- docs/Gemfile.lock | 20 ++++++++++---------- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0a16d16858..f47c7c5067 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,8 +1,8 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) claide (1.1.0) claide-plugins (0.9.2) cork @@ -12,7 +12,7 @@ GEM concurrent-ruby (1.1.10) cork (0.3.0) colored2 (~> 3.1) - danger (8.6.1) + danger (9.0.0) claide (~> 1.0) claide-plugins (>= 0.9.2) colored2 (~> 3.1) @@ -23,12 +23,12 @@ GEM kramdown (~> 2.3) kramdown-parser-gfm (~> 1.0) no_proxy_fix - octokit (~> 4.7) + octokit (~> 5.0) terminal-table (>= 1, < 4) differ (0.1.2) et-orbi (1.2.7) tzinfo - faraday (1.10.0) + faraday (1.10.2) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -43,7 +43,7 @@ GEM faraday-em_http (1.0.0) faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) - faraday-http-cache (2.4.0) + faraday-http-cache (2.4.1) faraday (>= 0.8) faraday-httpclient (1.0.1) faraday-multipart (1.0.4) @@ -53,25 +53,26 @@ GEM faraday-patron (1.0.0) faraday-rack (1.0.0) faraday-retry (1.0.3) - fugit (1.5.3) + fugit (1.7.1) et-orbi (~> 1, >= 1.2.7) raabro (~> 1.4) - git (1.11.0) + git (1.12.0) + addressable (~> 2.8) rchardet (~> 1.8) kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - liquid (5.3.0) + liquid (5.4.0) logger-colors (1.0.0) mini_portile2 (2.8.0) multipart-post (2.2.3) nap (1.1.0) no_proxy_fix (0.1.2) - nokogiri (1.13.7) + nokogiri (1.13.8) mini_portile2 (~> 2.8.0) racc (~> 1.4) - octokit (4.25.1) + octokit (5.6.1) faraday (>= 1, < 3) sawyer (~> 0.9) open4 (1.3.4) @@ -82,12 +83,12 @@ GEM nokogiri (~> 1.13) rufus-scheduler (~> 3.8) slop (~> 4.6) - public_suffix (4.0.7) + public_suffix (5.0.0) raabro (1.4.0) racc (1.6.0) rchardet (1.8.0) rexml (3.2.5) - rouge (3.29.0) + rouge (4.0.0) ruby2_keywords (0.0.5) rufus-scheduler (3.8.2) fugit (~> 1.1, >= 1.1.6) @@ -100,7 +101,7 @@ GEM unicode-display_width (>= 1.1.1, < 3) tzinfo (2.0.5) concurrent-ruby (~> 1.0) - unicode-display_width (2.2.0) + unicode-display_width (2.3.0) PLATFORMS ruby diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock index f85828b039..37ab0dfb1e 100644 --- a/docs/Gemfile.lock +++ b/docs/Gemfile.lock @@ -1,20 +1,20 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.0.5.1) + activesupport (6.0.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) zeitwerk (~> 2.2, >= 2.2.2) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.11.1) colorator (1.1.0) - commonmarker (0.23.5) + commonmarker (0.23.6) concurrent-ruby (1.1.10) dnsruby (1.61.9) simpleidn (~> 0.1) @@ -25,10 +25,10 @@ GEM ffi (>= 1.15.0) eventmachine (1.2.7) execjs (2.8.1) - faraday (2.3.0) - faraday-net_http (~> 2.0) + faraday (2.5.2) + faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-net_http (2.0.3) + faraday-net_http (3.0.0) ffi (1.15.5) forwardable-extended (2.6.0) gemoji (3.0.1) @@ -211,8 +211,8 @@ GEM jekyll (>= 3.5, < 5.0) jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) - minitest (5.16.2) - nokogiri (1.13.7) + minitest (5.16.3) + nokogiri (1.13.8) mini_portile2 (~> 2.8.0) racc (~> 1.4) octokit (4.25.1) @@ -222,7 +222,7 @@ GEM forwardable-extended (~> 2.6) public_suffix (4.0.7) racc (1.6.0) - rb-fsevent (0.11.1) + rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) rexml (3.2.5) From a44c3287328a15f100cd6ccb992b286ea5cb2284 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Mon, 26 Sep 2022 18:39:49 +0200 Subject: [PATCH 056/108] [java] FinalFieldCouldBeStatic - ignore synchronized statements in non-static methods Fixes #4090 --- docs/pages/release_notes.md | 5 +++- .../main/resources/category/java/design.xml | 2 ++ .../design/xml/FinalFieldCouldBeStatic.xml | 30 +++++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md index 364ff7c856..a47b35abbe 100644 --- a/docs/pages/release_notes.md +++ b/docs/pages/release_notes.md @@ -20,7 +20,10 @@ This release of PMD adds support for [Luau](https://github.com/Roblox/luau), a g from Lua. This means, that the Lua language in PMD can now parse both Lua and Luau. ### Fixed Issues -* [#4116](https://github.com/pmd/pmd/pull/4116): \[core] Missing --file arg in TreeExport CLI example +* core + * [#4116](https://github.com/pmd/pmd/pull/4116): \[core] Missing --file arg in TreeExport CLI example +* java-design + * [#4090](https://github.com/pmd/pmd/issues/4090): \[java] FinalFieldCouldBeStatic false positive with non-static synchronized block (regression in 6.48, worked with 6.47) ### API Changes diff --git a/pmd-java/src/main/resources/category/java/design.xml b/pmd-java/src/main/resources/category/java/design.xml index edeecae3fd..39b45d1992 100644 --- a/pmd-java/src/main/resources/category/java/design.xml +++ b/pmd-java/src/main/resources/category/java/design.xml @@ -836,6 +836,8 @@ in each object at runtime. ] ] /VariableDeclaratorId + [not(@Image = //MethodDeclaration[@Static = false()]//SynchronizedStatement/Expression/PrimaryExpression/ + (PrimaryPrefix/Name|PrimarySuffix[preceding-sibling::PrimaryPrefix[@ThisModifier = true()]])/@Image)] ]]> diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/FinalFieldCouldBeStatic.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/FinalFieldCouldBeStatic.xml index e5f41598a0..4ed2aed5c1 100644 --- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/FinalFieldCouldBeStatic.xml +++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/FinalFieldCouldBeStatic.xml @@ -231,4 +231,34 @@ public class Foo { } ]]> + + + [java] FinalFieldCouldBeStatic false positive with non-static synchronized block (regression in 6.48, worked with 6.47) #4090 + 1 + 4 + + From dd82e5e19f3200f454ad82377d00941c199dad79 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Mon, 26 Sep 2022 19:45:11 +0200 Subject: [PATCH 057/108] Add java-regression-tests for regression testing Fixes #3431 --- .ci/files/project-list.xml | 8 ++++++++ docs/pages/release_notes.md | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.ci/files/project-list.xml b/.ci/files/project-list.xml index ce357698bc..0690ddb302 100644 --- a/.ci/files/project-list.xml +++ b/.ci/files/project-list.xml @@ -169,4 +169,12 @@ EOF v2.3.0 samples + + + java-regression-tests + git + https://github.com/pmd/java-regression-tests.git + main + realpath java-regression-tests-*.jar + diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md index 364ff7c856..5af1074fbb 100644 --- a/docs/pages/release_notes.md +++ b/docs/pages/release_notes.md @@ -20,7 +20,10 @@ This release of PMD adds support for [Luau](https://github.com/Roblox/luau), a g from Lua. This means, that the Lua language in PMD can now parse both Lua and Luau. ### Fixed Issues -* [#4116](https://github.com/pmd/pmd/pull/4116): \[core] Missing --file arg in TreeExport CLI example +* core + * [#4116](https://github.com/pmd/pmd/pull/4116): \[core] Missing --file arg in TreeExport CLI example +* java + * [#3431](https://github.com/pmd/pmd/issues/3431): \[java] Add sample java project to regression-tester which uses new language constructs ### API Changes From d30edd618eb98e3f8fdb7713264fd342fa9b39d0 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Mon, 26 Sep 2022 20:45:49 +0200 Subject: [PATCH 058/108] Change something in pmd-core to let the regression tester run --- pmd-core/src/main/java/net/sourceforge/pmd/PMD.java | 1 + 1 file changed, 1 insertion(+) diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/PMD.java b/pmd-core/src/main/java/net/sourceforge/pmd/PMD.java index 70dcecaacf..7c3ab37f96 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/PMD.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/PMD.java @@ -63,6 +63,7 @@ import net.sourceforge.pmd.util.log.internal.SimpleMessageReporter; */ public class PMD { + private static final Logger LOG = Logger.getLogger(PMD.class.getName()); /** From 1ea82f1ee63b18ff7c2e2c57d25db3499ede5fe4 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Tue, 27 Sep 2022 19:38:25 +0200 Subject: [PATCH 059/108] Fix git connection for java-regression-tests --- .ci/files/project-list.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/files/project-list.xml b/.ci/files/project-list.xml index 0690ddb302..dc8eb00bcb 100644 --- a/.ci/files/project-list.xml +++ b/.ci/files/project-list.xml @@ -173,7 +173,7 @@ EOF java-regression-tests git - https://github.com/pmd/java-regression-tests.git + https://github.com/pmd/java-regression-tests main realpath java-regression-tests-*.jar From b59ceb6c607659f9c43dd79a9695ff9ce633494f Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Tue, 27 Sep 2022 20:55:25 +0200 Subject: [PATCH 060/108] [java] ConstructorCallsOverridableMethod - fix false negatives - Use type of the method call result - Do not consider super method calls, but this references --- ...ConstructorCallsOverridableMethodRule.java | 22 +++++--- .../AbstractThing.java | 19 +++++++ .../Thing.java | 11 ++++ .../xml/ConstructorCallsOverridableMethod.xml | 50 +++++++++++++++++++ 4 files changed, 96 insertions(+), 6 deletions(-) create mode 100644 pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/constructorcallsoverridablemethod/AbstractThing.java create mode 100644 pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/constructorcallsoverridablemethod/Thing.java diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java index 3a642ed7ff..ff8244c270 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java @@ -37,6 +37,8 @@ import net.sourceforge.pmd.lang.java.ast.ASTRecordDeclaration; import net.sourceforge.pmd.lang.java.ast.ASTType; import net.sourceforge.pmd.lang.java.ast.ASTVariableDeclaratorId; import net.sourceforge.pmd.lang.java.ast.AccessNode; +import net.sourceforge.pmd.lang.java.ast.JavaNode; +import net.sourceforge.pmd.lang.java.ast.TypeNode; import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule; import net.sourceforge.pmd.lang.java.typeresolution.typedefinition.JavaTypeDefinition; @@ -322,7 +324,7 @@ public final class ConstructorCallsOverridableMethodRule extends AbstractJavaRul String name = child.getImage(); // special case if (i == 2) { // last named node = method name methodName = name; - } else { + } else if (name != null) { // not the last named node so its only // var name varNames.add(name); @@ -1057,12 +1059,20 @@ public final class ConstructorCallsOverridableMethodRule extends AbstractJavaRul ASTArgumentList argumentList = args.getFirstChildOfType(ASTArgumentList.class); if (argumentList != null) { for (int a = 0; a < argumentList.getNumChildren(); a++) { - Node expression = argumentList.getChild(a); - ASTPrimaryPrefix arg = expression.getFirstDescendantOfType(ASTPrimaryPrefix.class); + JavaNode expression = argumentList.getChild(a); + final TypeNode typeNode; + if (expression instanceof TypeNode) { + typeNode = (TypeNode) expression; + } else { + typeNode = expression.getFirstDescendantOfType(ASTPrimaryPrefix.class); + } + Class type = null; - JavaTypeDefinition typeDefinition = arg.getTypeDefinition(); - if (typeDefinition != null) { - type = typeDefinition.getType(); + if (typeNode != null) { + JavaTypeDefinition typeDefinition = typeNode.getTypeDefinition(); + if (typeDefinition != null) { + type = typeDefinition.getType(); + } } argumentTypes.add(type); } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/constructorcallsoverridablemethod/AbstractThing.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/constructorcallsoverridablemethod/AbstractThing.java new file mode 100644 index 0000000000..184216ed41 --- /dev/null +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/constructorcallsoverridablemethod/AbstractThing.java @@ -0,0 +1,19 @@ +/* + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ + +package net.sourceforge.pmd.lang.java.rule.errorprone.constructorcallsoverridablemethod; + +public abstract class AbstractThing implements Thing { + protected AbstractThing(Thing original) { + setName(original.getName()); + } + + @Override + public void setName(String name) { } + + @Override + public String getName() { + return ""; + } +} diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/constructorcallsoverridablemethod/Thing.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/constructorcallsoverridablemethod/Thing.java new file mode 100644 index 0000000000..70f21878ee --- /dev/null +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/constructorcallsoverridablemethod/Thing.java @@ -0,0 +1,11 @@ +/* + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ + +package net.sourceforge.pmd.lang.java.rule.errorprone.constructorcallsoverridablemethod; + +public interface Thing { + String getName(); + + void setName(String name); +} diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml index 4714a3f953..11dd0b0a2d 100644 --- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml +++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml @@ -430,6 +430,56 @@ class Foo { ((String) o).length(); } } +]]> + + + + False negative with method call as argument + 1 + 5 + + + + + Clone and finalize overridden + 3 + 3,4,5 + From 58c9f361d3447e10e0ebcfe3cd00c7709a361267 Mon Sep 17 00:00:00 2001 From: Luis Alcantar Date: Wed, 28 Sep 2022 12:01:32 -0700 Subject: [PATCH 061/108] [java] issue#3859: Exclude junit5 test methods from the commentDefaultAccessModifierRule There was a conflict between the CommentDefaultAccessModifier and the JUnit5TestShouldBePackagePrivate rule. while the JUnit5TestShouldBePackagePrivate rule passed, the CommentDefaultAccessModifier complained about the lack of a comment on the method encapsulation generating a false alert. example "@org.junit.jupiter.api.Test void MissingCommentMethod {}", missing " /* default */" but not required in junit5. The changes will exclude methods with junit5 @Test or @ParameterizedTest annotation for the commentDefaultAccessModifierRule. --- docs/pages/release_notes.md | 2 + .../CommentDefaultAccessModifierRule.java | 8 +++- .../MethodNamingConventionsRule.java | 7 +-- .../java/types/TestingFrameworkTypeUtil.java | 28 ++++++++++++ .../types/TestingFrameworkTypeUtilTest.java | 45 +++++++++++++++++++ .../xml/CommentDefaultAccessModifier.xml | 15 +++++++ 6 files changed, 99 insertions(+), 6 deletions(-) create mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/types/TestingFrameworkTypeUtil.java create mode 100644 pmd-java/src/test/java/net/sourceforge/pmd/lang/java/types/TestingFrameworkTypeUtilTest.java diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md index 364ff7c856..aab407056f 100644 --- a/docs/pages/release_notes.md +++ b/docs/pages/release_notes.md @@ -21,6 +21,7 @@ from Lua. This means, that the Lua language in PMD can now parse both Lua and Lu ### Fixed Issues * [#4116](https://github.com/pmd/pmd/pull/4116): \[core] Missing --file arg in TreeExport CLI example +* [#3859](https://github.com/pmd/pmd/pull/3859): \[java] CommentDefaultAccessModifier is triggered in JUnit5 test class ### API Changes @@ -32,6 +33,7 @@ from Lua. This means, that the Lua language in PMD can now parse both Lua and Lu * [#4066](https://github.com/pmd/pmd/pull/4066): \[lua] Add support for Luau syntax and skipping literal sequences in CPD - [@matthargett](https://github.com/matthargett) * [#4116](https://github.com/pmd/pmd/pull/4116): \[core] Fix missing --file arg in TreeExport CLI example - [@mohan-chinnappan-n](https://github.com/mohan-chinnappan-n) * [#4131](https://github.com/pmd/pmd/pull/4131): \[doc] TooFewBranchesForASwitchStatement - Use "if-else" instead of "if-then" - [@Suvashri](https://github.com/Suvashri) +* [#3859](https://github.com/pmd/pmd/pull/3859): \[java] CommentDefaultAccessModifier is triggered in JUnit5 test class [@lfalcantar](https://github.com/lfalcantar) {% endtocmaker %} diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/CommentDefaultAccessModifierRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/CommentDefaultAccessModifierRule.java index 2891b13843..ac2d287a74 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/CommentDefaultAccessModifierRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/CommentDefaultAccessModifierRule.java @@ -25,6 +25,7 @@ import net.sourceforge.pmd.lang.java.ast.AccessNode; import net.sourceforge.pmd.lang.java.ast.Annotatable; import net.sourceforge.pmd.lang.java.ast.Comment; import net.sourceforge.pmd.lang.java.rule.AbstractIgnoredAnnotationRule; +import net.sourceforge.pmd.lang.java.types.TestingFrameworkTypeUtil; import net.sourceforge.pmd.properties.PropertyDescriptor; import net.sourceforge.pmd.properties.PropertyFactory; @@ -72,9 +73,14 @@ public class CommentDefaultAccessModifierRule extends AbstractIgnoredAnnotationR return super.visit(node, data); } + /* + * The method determines is the method needs to be included in the violations report + * Also, the code needs to check that the method is not a Test from junit5 + * to avoid conflicts with JUnit5TestShouldBePackagePrivate + */ @Override public Object visit(final ASTMethodDeclaration decl, final Object data) { - if (shouldReport(decl)) { + if (!TestingFrameworkTypeUtil.isJunit5Test(decl) && shouldReport(decl)) { addViolationWithMessage(data, decl, String.format(MESSAGE, decl.getFirstChildOfType(ASTMethodDeclarator.class).getImage(), "method")); } diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/MethodNamingConventionsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/MethodNamingConventionsRule.java index 3d8b99554d..5b152f50c3 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/MethodNamingConventionsRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/MethodNamingConventionsRule.java @@ -14,6 +14,7 @@ import net.sourceforge.pmd.lang.java.ast.ASTAnyTypeDeclaration; import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceDeclaration; import net.sourceforge.pmd.lang.java.ast.ASTEnumConstant; import net.sourceforge.pmd.lang.java.ast.ASTMethodDeclaration; +import net.sourceforge.pmd.lang.java.types.TestingFrameworkTypeUtil; import net.sourceforge.pmd.lang.java.types.TypeTestUtil; import net.sourceforge.pmd.properties.BooleanProperty; import net.sourceforge.pmd.properties.PropertyBuilder.RegexPropertyBuilder; @@ -48,10 +49,6 @@ public class MethodNamingConventionsRule extends AbstractNamingConventionRule + + + + #3859 [java] CommentDefaultAccessModifier is triggered in JUnit5 method. + and it was conflicting with rule JUnit5TestShouldBePackagePrivate + 0 + From d94a9439117f11823a088d71601f16dfd02995f5 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 29 Sep 2022 11:15:02 +0200 Subject: [PATCH 062/108] [java] ConstructorCallsOverridableMethod - fix false negatives - Identify method calls of generic methods --- .../typeinference/TypeInferenceResolver.java | 4 ++- .../typeresolution/ClassTypeResolverTest.java | 15 ++++++++++- .../testdata/MethodCallExpressionTypes.java | 8 +++++- .../xml/ConstructorCallsOverridableMethod.xml | 26 +++++++++++++++++-- 4 files changed, 48 insertions(+), 5 deletions(-) diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/typeinference/TypeInferenceResolver.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/typeinference/TypeInferenceResolver.java index ed2fa306ae..17c8320689 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/typeinference/TypeInferenceResolver.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/typeinference/TypeInferenceResolver.java @@ -234,7 +234,9 @@ public final class TypeInferenceResolver { for (Variable var : variablesToResolve) { List lowerBounds = getLowerBoundsOf(var, bounds); // TODO: should call incorporation - instantiations.put(var, lub(lowerBounds)); + if (!lowerBounds.isEmpty()) { + instantiations.put(var, lub(lowerBounds)); + } } uninstantiatedVariables.removeAll(variablesToResolve); diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/ClassTypeResolverTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/ClassTypeResolverTest.java index cef6b52fa1..3b8680ccca 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/ClassTypeResolverTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/ClassTypeResolverTest.java @@ -19,6 +19,7 @@ import static org.junit.Assert.assertSame; import java.lang.reflect.Method; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Comparator; import java.util.HashSet; @@ -47,6 +48,7 @@ import net.sourceforge.pmd.lang.java.ast.ASTFormalParameter; import net.sourceforge.pmd.lang.java.ast.ASTImportDeclaration; import net.sourceforge.pmd.lang.java.ast.ASTLiteral; import net.sourceforge.pmd.lang.java.ast.ASTLocalVariableDeclaration; +import net.sourceforge.pmd.lang.java.ast.ASTMethodDeclaration; import net.sourceforge.pmd.lang.java.ast.ASTName; import net.sourceforge.pmd.lang.java.ast.ASTNullLiteral; import net.sourceforge.pmd.lang.java.ast.ASTPrimaryExpression; @@ -1873,9 +1875,20 @@ public class ClassTypeResolverTest { @Test public void testMethodCallExpressionTypes() throws Exception { ASTCompilationUnit cu = java11.parseClass(MethodCallExpressionTypes.class); - ASTPrimaryExpression expr = cu.getFirstDescendantOfType(ASTPrimaryExpression.class); + List methods = cu.findDescendantsOfType(ASTMethodDeclaration.class); + + // objectsToString + ASTPrimaryExpression expr = methods.get(0).getFirstDescendantOfType(ASTPrimaryExpression.class); assertEquals(forClass(String.class), expr.getTypeDefinition()); assertEquals(forClass(Objects.class), expr.getFirstChildOfType(ASTPrimaryPrefix.class).getTypeDefinition()); + + // arraysAsList + expr = methods.get(1).getFirstDescendantOfType(ASTPrimaryExpression.class); + // note: the type parameter is not correct - it should be bound to String and not object + // but that's close enough - import is, that we correctly identified the method call + // and the result of the method call is a List. + assertEquals(forClass(List.class, forClass(Object.class)), expr.getTypeDefinition()); + assertEquals(forClass(Arrays.class), expr.getFirstChildOfType(ASTPrimaryPrefix.class).getTypeDefinition()); } private JavaTypeDefinition getChildTypeDef(Node node, int childIndex) { diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/testdata/MethodCallExpressionTypes.java b/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/testdata/MethodCallExpressionTypes.java index a9fdc44da4..bfaf54bd30 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/testdata/MethodCallExpressionTypes.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/testdata/MethodCallExpressionTypes.java @@ -4,10 +4,16 @@ package net.sourceforge.pmd.typeresolution.testdata; +import java.util.Arrays; +import java.util.Collection; import java.util.Objects; public class MethodCallExpressionTypes { - public void bar() { + public void objectsToString() { Objects.toString(null); } + + public void arraysAsList() { + Collection l = Arrays.asList("a"); + } } diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml index 11dd0b0a2d..82d5452a57 100644 --- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml +++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml @@ -456,8 +456,8 @@ public abstract class AbstractThing implements Thing { Clone and finalize overridden - 3 - 3,4,5 + 6 + 3,4,5,7,8,9 + + + + False negative with var args and Arrays.asList + 1 + 6 + names) { } +} ]]> From 5840afe39a1bec770d09de97d9687fd011a25f52 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 29 Sep 2022 12:16:43 +0200 Subject: [PATCH 063/108] [java] ConstructorCallsOverridableMethod - improve message for call chains --- ...ConstructorCallsOverridableMethodRule.java | 33 ++++++++++++++----- .../resources/category/java/errorprone.xml | 2 +- .../xml/ConstructorCallsOverridableMethod.xml | 30 +++++++++++++++++ 3 files changed, 55 insertions(+), 10 deletions(-) diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java index ff8244c270..e4d2f8c573 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java @@ -7,7 +7,9 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; +import java.util.Deque; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; @@ -501,18 +503,24 @@ public final class ConstructorCallsOverridableMethodRule extends AbstractJavaRul private static final class MethodHolder { private ASTMethodDeclaration amd; private boolean dangerous; - private String called; + private Deque callStack = new LinkedList<>(); MethodHolder(ASTMethodDeclaration amd) { this.amd = amd; } - public void setCalledMethod(String name) { - this.called = name; + public void addToStack(String name) { + callStack.push(name); } - public String getCalled() { - return this.called; + public void addToStack(Deque otherStack) { + for (String name : otherStack) { + callStack.addLast(name); + } + } + + public Deque getCallStack() { + return callStack; } public ASTMethodDeclaration getASTMethodDeclaration() { @@ -694,7 +702,14 @@ public final class ConstructorCallsOverridableMethodRule extends AbstractJavaRul // check against each dangerous method in class for (MethodHolder h : getCurrentEvalPackage().allMethodsOfClass.keySet()) { if (h.isDangerous() && meth.matches(h.getASTMethodDeclaration())) { - addViolation(data, meth.getASTPrimaryExpression(), "method '" + h.getCalled() + "'"); + if (h.getCallStack().size() > 1) { + String overridableMethod = h.getCallStack().getLast(); + asCtx(data).addViolation(meth.getASTPrimaryExpression(), "method '" + overridableMethod + "'", + " (call stack: " + h.getCallStack() + ")"); + } else { + String overridableMethod = meth.getName(); + asCtx(data).addViolation(meth.getASTPrimaryExpression(), "method '" + overridableMethod + "'", ""); + } } } } @@ -712,7 +727,7 @@ public final class ConstructorCallsOverridableMethodRule extends AbstractJavaRul for (ConstructorInvocation ci : getCurrentEvalPackage().calledConstructors) { if (ci.getArgumentCount() == paramCount) { // match name super / this !? - addViolation(data, ci.getASTExplicitConstructorInvocation(), "constructor"); + asCtx(data).addViolation(ci.getASTExplicitConstructorInvocation(), "constructor", ""); } } } @@ -755,7 +770,8 @@ public final class ConstructorCallsOverridableMethodRule extends AbstractJavaRul // System.out.println("matching " + matchMethodName + " // to " + meth.getName()); h.setDangerous(); - h.setCalledMethod(meth.getName()); + h.addToStack(h3.getCallStack()); + h.addToStack(meth.getName()); found = true; break; } @@ -946,7 +962,6 @@ public final class ConstructorCallsOverridableMethodRule extends AbstractJavaRul if (!node.isAbstract() && !node.isPrivate() && !node.isStatic() && !node.isFinal()) { // Skip abstract methods, have a separate rule for that h.setDangerous(); // this method is overridable - h.setCalledMethod(node.getName()); } List l = new ArrayList<>(); addCalledMethodsOfNode(node, l, getCurrentEvalPackage().className); diff --git a/pmd-java/src/main/resources/category/java/errorprone.xml b/pmd-java/src/main/resources/category/java/errorprone.xml index 4472626154..77c809b50d 100644 --- a/pmd-java/src/main/resources/category/java/errorprone.xml +++ b/pmd-java/src/main/resources/category/java/errorprone.xml @@ -1170,7 +1170,7 @@ boolean x = (y == Double.NaN); diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml index 82d5452a57..03244da556 100644 --- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml +++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml @@ -502,6 +502,36 @@ class Foo { public void setNames(Collection names) { } } +]]> + + + + Misleading message for method call chain + 1 + 3 + + Overridable method 'overridableMethod' called during object construction (call stack: [otherMethod1, otherMethod2, overridableMethod]) + + From d21a562e900d661cea61e60d0c96c15bea8eff4f Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 29 Sep 2022 14:12:22 +0200 Subject: [PATCH 064/108] [java] ConstructorCallsOverridableMethod - fix message for call chains First method in the chain was missing --- ...ConstructorCallsOverridableMethodRule.java | 9 +++++---- .../xml/ConstructorCallsOverridableMethod.xml | 20 ++++++++++++++++--- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java index e4d2f8c573..531932a3a9 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java @@ -702,12 +702,13 @@ public final class ConstructorCallsOverridableMethodRule extends AbstractJavaRul // check against each dangerous method in class for (MethodHolder h : getCurrentEvalPackage().allMethodsOfClass.keySet()) { if (h.isDangerous() && meth.matches(h.getASTMethodDeclaration())) { - if (h.getCallStack().size() > 1) { - String overridableMethod = h.getCallStack().getLast(); + Deque completeCallStack = new LinkedList<>(h.getCallStack()); + completeCallStack.addFirst(meth.getName()); + String overridableMethod = completeCallStack.getLast(); + if (completeCallStack.size() > 1) { asCtx(data).addViolation(meth.getASTPrimaryExpression(), "method '" + overridableMethod + "'", - " (call stack: " + h.getCallStack() + ")"); + " (call stack: " + completeCallStack + ")"); } else { - String overridableMethod = meth.getName(); asCtx(data).addViolation(meth.getASTPrimaryExpression(), "method '" + overridableMethod + "'", ""); } } diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml index 03244da556..63885ec4f0 100644 --- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml +++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml @@ -507,15 +507,19 @@ class Foo { Misleading message for method call chain - 1 - 3 + 3 + 3,4,5 - Overridable method 'overridableMethod' called during object construction (call stack: [otherMethod1, otherMethod2, overridableMethod]) + Overridable method 'overridableMethod' called during object construction (call stack: [intermediatePrivateMethod, otherMethod1, otherMethod2, overridableMethod]) + Overridable method 'overridableMethod' called during object construction (call stack: [shorterChain, overridableMethod]) + Overridable method 'otherOverridableMethod' called during object construction (call stack: [differentChain, otherOverridableMethod]) From 3ba63285ac7d4a4a4a2ddd610df44551a798d1df Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 29 Sep 2022 15:04:35 +0200 Subject: [PATCH 065/108] [java] CommentDefaultAccessModifier - configure JUnit5 annotations to be ignored --- .../CommentDefaultAccessModifierRule.java | 12 ++++- .../MethodNamingConventionsRule.java | 7 ++- .../java/types/TestingFrameworkTypeUtil.java | 28 ------------ .../types/TestingFrameworkTypeUtilTest.java | 45 ------------------- .../xml/CommentDefaultAccessModifier.xml | 3 +- 5 files changed, 16 insertions(+), 79 deletions(-) delete mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/types/TestingFrameworkTypeUtil.java delete mode 100644 pmd-java/src/test/java/net/sourceforge/pmd/lang/java/types/TestingFrameworkTypeUtilTest.java diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/CommentDefaultAccessModifierRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/CommentDefaultAccessModifierRule.java index ac2d287a74..f859d2d6f5 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/CommentDefaultAccessModifierRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/CommentDefaultAccessModifierRule.java @@ -25,7 +25,6 @@ import net.sourceforge.pmd.lang.java.ast.AccessNode; import net.sourceforge.pmd.lang.java.ast.Annotatable; import net.sourceforge.pmd.lang.java.ast.Comment; import net.sourceforge.pmd.lang.java.rule.AbstractIgnoredAnnotationRule; -import net.sourceforge.pmd.lang.java.types.TestingFrameworkTypeUtil; import net.sourceforge.pmd.properties.PropertyDescriptor; import net.sourceforge.pmd.properties.PropertyFactory; @@ -58,6 +57,15 @@ public class CommentDefaultAccessModifierRule extends AbstractIgnoredAnnotationR Collection ignoredStrings = new ArrayList<>(); ignoredStrings.add("com.google.common.annotations.VisibleForTesting"); ignoredStrings.add("android.support.annotation.VisibleForTesting"); + ignoredStrings.add("org.junit.jupiter.api.Test"); + ignoredStrings.add("org.junit.jupiter.api.ParameterizedTest"); + ignoredStrings.add("org.junit.jupiter.api.RepeatedTest"); + ignoredStrings.add("org.junit.jupiter.api.TestFactory"); + ignoredStrings.add("org.junit.jupiter.api.TestTemplate"); + ignoredStrings.add("org.junit.jupiter.api.BeforeEach"); + ignoredStrings.add("org.junit.jupiter.api.BeforeAll"); + ignoredStrings.add("org.junit.jupiter.api.AfterEach"); + ignoredStrings.add("org.junit.jupiter.api.AfterAll"); return ignoredStrings; } @@ -80,7 +88,7 @@ public class CommentDefaultAccessModifierRule extends AbstractIgnoredAnnotationR */ @Override public Object visit(final ASTMethodDeclaration decl, final Object data) { - if (!TestingFrameworkTypeUtil.isJunit5Test(decl) && shouldReport(decl)) { + if (shouldReport(decl)) { addViolationWithMessage(data, decl, String.format(MESSAGE, decl.getFirstChildOfType(ASTMethodDeclarator.class).getImage(), "method")); } diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/MethodNamingConventionsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/MethodNamingConventionsRule.java index 5b152f50c3..3d8b99554d 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/MethodNamingConventionsRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/MethodNamingConventionsRule.java @@ -14,7 +14,6 @@ import net.sourceforge.pmd.lang.java.ast.ASTAnyTypeDeclaration; import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceDeclaration; import net.sourceforge.pmd.lang.java.ast.ASTEnumConstant; import net.sourceforge.pmd.lang.java.ast.ASTMethodDeclaration; -import net.sourceforge.pmd.lang.java.types.TestingFrameworkTypeUtil; import net.sourceforge.pmd.lang.java.types.TypeTestUtil; import net.sourceforge.pmd.properties.BooleanProperty; import net.sourceforge.pmd.properties.PropertyBuilder.RegexPropertyBuilder; @@ -49,6 +48,10 @@ public class MethodNamingConventionsRule extends AbstractNamingConventionRule - #3859 [java] CommentDefaultAccessModifier is triggered in JUnit5 method. - and it was conflicting with rule JUnit5TestShouldBePackagePrivate + #3859 [java] CommentDefaultAccessModifier is triggered in JUnit5 method and it was conflicting with rule JUnit5TestShouldBePackagePrivate 0 Date: Thu, 29 Sep 2022 15:06:20 +0200 Subject: [PATCH 066/108] [doc] Update release notes (#3859, #4137) --- docs/pages/release_notes.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md index aab407056f..a293f1b95a 100644 --- a/docs/pages/release_notes.md +++ b/docs/pages/release_notes.md @@ -21,7 +21,7 @@ from Lua. This means, that the Lua language in PMD can now parse both Lua and Lu ### Fixed Issues * [#4116](https://github.com/pmd/pmd/pull/4116): \[core] Missing --file arg in TreeExport CLI example -* [#3859](https://github.com/pmd/pmd/pull/3859): \[java] CommentDefaultAccessModifier is triggered in JUnit5 test class +* [#3859](https://github.com/pmd/pmd/issues/3859): \[java] CommentDefaultAccessModifier is triggered in JUnit5 test class ### API Changes @@ -33,7 +33,7 @@ from Lua. This means, that the Lua language in PMD can now parse both Lua and Lu * [#4066](https://github.com/pmd/pmd/pull/4066): \[lua] Add support for Luau syntax and skipping literal sequences in CPD - [@matthargett](https://github.com/matthargett) * [#4116](https://github.com/pmd/pmd/pull/4116): \[core] Fix missing --file arg in TreeExport CLI example - [@mohan-chinnappan-n](https://github.com/mohan-chinnappan-n) * [#4131](https://github.com/pmd/pmd/pull/4131): \[doc] TooFewBranchesForASwitchStatement - Use "if-else" instead of "if-then" - [@Suvashri](https://github.com/Suvashri) -* [#3859](https://github.com/pmd/pmd/pull/3859): \[java] CommentDefaultAccessModifier is triggered in JUnit5 test class [@lfalcantar](https://github.com/lfalcantar) +* [#4137](https://github.com/pmd/pmd/pull/4137): \[java] Fixes 3859: Exclude junit5 test methods from the commentDefaultAccessModifierRule - [@lfalcantar](https://github.com/lfalcantar) {% endtocmaker %} From dbe2881d6d6fbc9cdd232b3c45d750d9980b674a Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 29 Sep 2022 15:09:22 +0200 Subject: [PATCH 067/108] [doc] CommentDefaultAccessModifier - update rule description --- docs/pages/release_notes.md | 5 +++++ pmd-java/src/main/resources/category/java/codestyle.xml | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md index a293f1b95a..b85a996ace 100644 --- a/docs/pages/release_notes.md +++ b/docs/pages/release_notes.md @@ -19,6 +19,11 @@ This is a {{ site.pmd.release_type }} release. This release of PMD adds support for [Luau](https://github.com/Roblox/luau), a gradually typed language derived from Lua. This means, that the Lua language in PMD can now parse both Lua and Luau. +#### Modified rules + +* The Java rule {% rule java/codestyle/CommentDefaultAccessModifier %} now by default ignores JUnit5 annotated + methods. This behavior can be customized using the property `ignoredAnnotations`. + ### Fixed Issues * [#4116](https://github.com/pmd/pmd/pull/4116): \[core] Missing --file arg in TreeExport CLI example * [#3859](https://github.com/pmd/pmd/issues/3859): \[java] CommentDefaultAccessModifier is triggered in JUnit5 test class diff --git a/pmd-java/src/main/resources/category/java/codestyle.xml b/pmd-java/src/main/resources/category/java/codestyle.xml index f9770a891b..ec8f37cc46 100644 --- a/pmd-java/src/main/resources/category/java/codestyle.xml +++ b/pmd-java/src/main/resources/category/java/codestyle.xml @@ -436,9 +436,10 @@ public class Éléphant {} externalInfoUrl="${pmd.website.baseurl}/pmd_rules_java_codestyle.html#commentdefaultaccessmodifier"> To avoid mistakes if we want that an Annotation, Class, Enum, Method, Constructor or Field have a default access modifier -we must add a comment at the beginning of it's declaration. -By default the comment must be `/* default */` or `/* package */`, if you want another, you have to provide a regular expression. -This rule ignores by default all cases that have a @VisibleForTesting annotation. Use the +we must add a comment at the beginning of its declaration. +By default, the comment must be `/* default */` or `/* package */`, if you want another, you have to provide a regular expression. + +This rule ignores by default all cases that have a `@VisibleForTesting` annotation or any JUnit5 annotation. Use the property "ignoredAnnotations" to customize the recognized annotations. 3 From defb0cd47c18a4848a30bdc1270f6aa972541739 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 29 Sep 2022 15:42:05 +0200 Subject: [PATCH 068/108] [doc] Update release notes (#1718, #2348) --- docs/pages/release_notes.md | 2 + .../xml/ConstructorCallsOverridableMethod.xml | 45 ++++++++++++++++++- 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md index ab600104dc..8a8a544073 100644 --- a/docs/pages/release_notes.md +++ b/docs/pages/release_notes.md @@ -23,6 +23,8 @@ from Lua. This means, that the Lua language in PMD can now parse both Lua and Lu * [#4116](https://github.com/pmd/pmd/pull/4116): \[core] Missing --file arg in TreeExport CLI example * java-errorprone + * [#1718](https://github.com/pmd/pmd/issues/1718): \[java] ConstructorCallsOverridableMethod false positive when calling super method + * [#2348](https://github.com/pmd/pmd/issues/2348): \[java] ConstructorCallsOverridableMethod occurs when unused overloaded method is defined * [#4099](https://github.com/pmd/pmd/issues/4099): \[java] ConstructorCallsOverridableMethod should consider method calls with var access ### API Changes diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml index 63885ec4f0..34590797be 100644 --- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml +++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml @@ -455,7 +455,7 @@ public abstract class AbstractThing implements Thing { - Clone and finalize overridden + Clone and finalize overridden #1718 6 3,4,5,7,8,9 + + + + [java] ConstructorCallsOverridableMethod occurs when unused overloaded method is defined #2348 + 0 + + + + + [java] ConstructorCallsOverridableMethod occurs when unused overloaded method is defined #2348 - sample 2 + 0 + From 792fe44d0ba4211d88878183b78d82c57c238169 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 29 Sep 2022 15:54:50 +0200 Subject: [PATCH 069/108] Fixups from review (#4128) --- .../rule/codestyle/UnnecessaryFullyQualifiedNameRule.java | 2 +- .../java/rule/codestyle/xml/UnnecessaryFullyQualifiedName.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryFullyQualifiedNameRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryFullyQualifiedNameRule.java index 5348abca59..8091d944e3 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryFullyQualifiedNameRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryFullyQualifiedNameRule.java @@ -204,7 +204,7 @@ public class UnnecessaryFullyQualifiedNameRule extends AbstractJavaRule { String importStr = firstMatch.getImportedName() + (firstMatch.isImportOnDemand() ? ".*" : ""); String type = firstMatch.isStatic() ? "static " : ""; - addViolation(data, node, new Object[]{node.getImage(), importStr, type}); + asCtx(data).addViolation(node, node.getImage(), importStr, type); } } } diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UnnecessaryFullyQualifiedName.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UnnecessaryFullyQualifiedName.xml index 426bb9b4b6..097e096767 100644 --- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UnnecessaryFullyQualifiedName.xml +++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UnnecessaryFullyQualifiedName.xml @@ -623,7 +623,7 @@ public class UnnecessaryFullyQualifiedName { - False positive when same package inner class is referenced (not enum) + False positive when same package inner class is referenced (not enum) #4085 0 - Should report fully-qualified name usage of a class in itself. + Should report fully-qualified name usage of a class in itself #4085 1 4 Date: Thu, 29 Sep 2022 16:02:51 +0200 Subject: [PATCH 070/108] Add @osiegmar as a contributor --- .all-contributorsrc | 9 +++ docs/pages/pmd/projectdocs/credits.md | 99 ++++++++++++++------------- docs/pages/release_notes.md | 6 ++ 3 files changed, 65 insertions(+), 49 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index e29348424c..3a4f606e6c 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -6825,6 +6825,15 @@ "contributions": [ "doc" ] + }, + { + "login": "osiegmar", + "name": "Oliver Siegmar", + "avatar_url": "https://avatars.githubusercontent.com/u/1918869?v=4", + "profile": "https://github.com/osiegmar", + "contributions": [ + "financial" + ] } ], "contributorsPerLine": 7, diff --git a/docs/pages/pmd/projectdocs/credits.md b/docs/pages/pmd/projectdocs/credits.md index 9f1604b29a..940e872308 100644 --- a/docs/pages/pmd/projectdocs/credits.md +++ b/docs/pages/pmd/projectdocs/credits.md @@ -533,441 +533,442 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
Oleg Pavlenko
🐛
Oleksii Dykov
💻
Oliver Eikemeier
🐛 -
Olivier Parent
💻 🐛 +
Oliver Siegmar
💵 +
Olivier Parent
💻 🐛
Ollie Abbey
💻 🐛
OverDrone
🐛
Ozan Gulle
💻 🐛
PUNEET JAIN
🐛
Parbati Bose
🐛
Paul Berg
🐛 -
Pavel Bludov
🐛 +
Pavel Bludov
🐛
Pavel Mička
🐛
Pedro Nuno Santos
🐛
Pedro Rijo
🐛
Pelisse Romain
💻 📖 🐛
Per Abich
💻
Pete Davids
🐛 -
Peter Bruin
🐛 +
Peter Bruin
🐛
Peter Chittum
💻 🐛
Peter Cudmore
🐛
Peter Kasson
🐛
Peter Kofler
🐛
Peter Paul Bakker
💻
Pham Hai Trung
🐛 -
Philip Graf
💻 🐛 +
Philip Graf
💻 🐛
Philip Hachey
🐛
Philippe Ozil
🐛
Phinehas Artemix
🐛
Phokham Nonava
🐛
Piotr Szymański
🐛
Piotrek Żygieło
💻 🐛 -
Pranay Jaiswal
🐛 +
Pranay Jaiswal
🐛
Prasad Kamath
🐛
Prasanna
🐛
Presh-AR
🐛
Puneet1726
🐛
Rafael Cortês
🐛
RaheemShaik999
🐛 -
RajeshR
💻 🐛 +
RajeshR
💻 🐛
Ramachandra Mohan
🐛
Ramel0921
🐛
Raquel Pau
🐛
Ravikiran Janardhana
🐛
Reda Benhemmouche
🐛
Renato Oliveira
💻 🐛 -
Rich DiCroce
🐛 +
Rich DiCroce
🐛
Riot R1cket
🐛
Rishabh Jain
🐛
RishabhDeep Singh
🐛
Robbie Martinus
💻 🐛
Robert Henry
🐛
Robert Painsi
🐛 -
Robert Russell
🐛 +
Robert Russell
🐛
Robert Sösemann
💻 📖 📢 🐛
Robert Whitebit
🐛
Robin Richtsfeld
🐛
Robin Stocker
💻 🐛
Robin Wils
🐛
RochusOest
🐛 -
Rodolfo Noviski
🐛 +
Rodolfo Noviski
🐛
Rodrigo Casara
🐛
Rodrigo Fernandes
🐛
Roman Salvador
💻 🐛
Ronald Blaschke
🐛
Róbert Papp
🐛
Saikat Sengupta
🐛 -
Saksham Handu
🐛 +
Saksham Handu
🐛
Saladoc
🐛
Salesforce Bob Lightning
🐛
Sam Carlberg
🐛
Satoshi Kubo
🐛
Scott Kennedy
🐛
Scott Wells
🐛 💻 -
Scrsloota
💻 +
Scrsloota
💻
Sebastian Bögl
🐛
Sebastian Schuberth
🐛
Sebastian Schwarz
🐛
Sergey Gorbaty
🐛
Sergey Kozlov
🐛
Sergey Yanzin
💻 🐛 -
Seth Wilcox
💻 +
Seth Wilcox
💻
Shubham
💻 🐛
Simon Abykov
💻
Simon Xiao
🐛
Srinivasan Venkatachalam
🐛
Stanislav Gromov
🐛
Stanislav Myachenkov
💻 -
Stefan Birkner
🐛 +
Stefan Birkner
🐛
Stefan Bohn
🐛
Stefan Endrullis
🐛
Stefan Klöss-Schuster
🐛
Stefan Wolf
🐛
Stephan H. Wissel
🐛
Stephen
🐛 -
Stephen Friedrich
🐛 +
Stephen Friedrich
🐛
Steve Babula
💻
Stexxe
🐛
Stian Lågstad
🐛
StuartClayton5
🐛
Supun Arunoda
🐛
Suren Abrahamyan
🐛 -
Suvashri
📖 +
Suvashri
📖
SwatiBGupta1110
🐛
SyedThoufich
🐛
Szymon Sasin
🐛
T-chuangxin
🐛
TERAI Atsuhiro
🐛
TIOBE Software
💻 🐛 -
Taylor Smock
🐛 +
Taylor Smock
🐛
Techeira Damián
💻 🐛
Ted Husted
🐛
TehBakker
🐛
The Gitter Badger
🐛
Theodoor
🐛
Thiago Henrique Hüpner
🐛 -
Thibault Meyer
🐛 +
Thibault Meyer
🐛
Thomas Güttler
🐛
Thomas Jones-Low
🐛
Thomas Smith
💻 🐛
ThrawnCA
🐛
Thunderforge
💻 🐛
Tim van der Lippe
🐛 -
Tobias Weimer
💻 🐛 +
Tobias Weimer
💻 🐛
Tom Daly
🐛
Tomer Figenblat
🐛
Tomi De Lucca
💻 🐛
Torsten Kleiber
🐛
TrackerSB
🐛
Ullrich Hafner
🐛 -
Utku Cuhadaroglu
💻 🐛 +
Utku Cuhadaroglu
💻 🐛
Valentin Brandl
🐛
Valeria
🐛
Vasily Anisimov
🐛
Vibhor Goyal
🐛
Vickenty Fesunov
🐛
Victor Noël
🐛 -
Vincent Galloy
💻 +
Vincent Galloy
💻
Vincent HUYNH
🐛
Vincent Maurin
🐛
Vincent Privat
🐛
Vishhwas
🐛
Vitaly
🐛
Vitaly Polonetsky
🐛 -
Vojtech Polivka
🐛 +
Vojtech Polivka
🐛
Vsevolod Zholobov
🐛
Vyom Yadav
💻
Wang Shidong
🐛
Waqas Ahmed
🐛
Wayne J. Earl
🐛
Wchenghui
🐛 -
Will Winder
🐛 +
Will Winder
🐛
William Brockhus
💻 🐛
Wilson Kurniawan
🐛
Wim Deblauwe
🐛
Woongsik Choi
🐛
XenoAmess
💻 🐛
Yang
💻 -
YaroslavTER
🐛 +
YaroslavTER
🐛
Young Chan
💻 🐛
YuJin Kim
🐛
Yuri Dolzhenko
🐛
Yurii Dubinka
🐛
Zoltan Farkas
🐛
Zustin
🐛 -
aaronhurst-google
🐛 💻 +
aaronhurst-google
🐛 💻
alexmodis
🐛
andreoss
🐛
andrey81inmd
💻 🐛
anicoara
🐛
arunprasathav
🐛
asiercamara
🐛 -
astillich-igniti
💻 +
astillich-igniti
💻
avesolovksyy
🐛
avishvat
🐛
avivmu
🐛
axelbarfod1
🐛
b-3-n
🐛
balbhadra9
🐛 -
base23de
🐛 +
base23de
🐛
bergander
🐛
berkam
💻 🐛
breizh31
🐛
caesarkim
🐛
carolyujing
🐛
cesares-basilico
🐛 -
chrite
🐛 +
chrite
🐛
cobratbq
🐛
coladict
🐛
cosmoJFH
🐛
cristalp
🐛
crunsk
🐛
cwholmes
🐛 -
cyberjj999
🐛 +
cyberjj999
🐛
cyw3
🐛
d1ss0nanz
🐛
dalizi007
💻
danbrycefairsailcom
🐛
dariansanity
🐛
darrenmiliband
🐛 -
davidburstrom
🐛 +
davidburstrom
🐛
dbirkman-paloalto
🐛
deepak-patra
🐛
dependabot[bot]
💻 🐛
dinesh150
🐛
diziaq
🐛
dreaminpast123
🐛 -
duanyanan
🐛 +
duanyanan
🐛
dutt-sanjay
🐛
dylanleung
🐛
dzeigler
🐛
ekkirala
🐛
emersonmoura
🐛
fairy
🐛 -
filiprafalowicz
💻 +
filiprafalowicz
💻
foxmason
🐛
frankegabor
🐛
frankl
🐛
freafrea
🐛
fsapatin
🐛
gracia19
🐛 -
guo fei
🐛 +
guo fei
🐛
gurmsc5
🐛
gwilymatgearset
💻 🐛
haigsn
🐛
hemanshu070
🐛
henrik242
🐛
hongpuwu
🐛 -
hvbtup
💻 🐛 +
hvbtup
💻 🐛
igniti GmbH
🐛
ilovezfs
🐛
itaigilo
🐛
jakivey32
🐛
jbennett2091
🐛
jcamerin
🐛 -
jkeener1
🐛 +
jkeener1
🐛
jmetertea
🐛
johnra2
💻
josemanuelrolon
💻 🐛
kabroxiko
💻 🐛
karwer
🐛
kaulonline
🐛 -
kdaemonv
🐛 +
kdaemonv
🐛
kenji21
💻 🐛
kfranic
🐛
khalidkh
🐛
krzyk
🐛
lasselindqvist
🐛
lgemeinhardt
🐛 -
lihuaib
🐛 +
lihuaib
🐛
lonelyma1021
🐛
lpeddy
🐛
lujiefsi
💻
lukelukes
💻
lyriccoder
🐛
marcelmore
🐛 -
matchbox
🐛 +
matchbox
🐛
matthiaskraaz
🐛
meandonlyme
🐛
mikesive
🐛
milossesic
🐛
mohan-chinnappan-n
💻
mriddell95
🐛 -
mrlzh
🐛 +
mrlzh
🐛
msloan
🐛
mucharlaravalika
🐛
mvenneman
🐛
nareshl119
🐛
nicolas-harraudeau-sonarsource
🐛
noerremark
🐛 -
novsirion
🐛 +
novsirion
🐛
oggboy
🐛
oinume
🐛
orimarko
💻 🐛
pacvz
💻
pallavi agarwal
🐛
parksungrin
🐛 -
patpatpat123
🐛 +
patpatpat123
🐛
patriksevallius
🐛
pbrajesh1
🐛
phoenix384
🐛
piotrszymanski-sc
💻
plan3d
🐛
poojasix
🐛 -
prabhushrikant
🐛 +
prabhushrikant
🐛
pujitha8783
🐛
r-r-a-j
🐛
raghujayjunk
🐛
rajeshveera
🐛
rajeswarreddy88
🐛
recdevs
🐛 -
reudismam
💻 🐛 +
reudismam
💻 🐛
rijkt
🐛
rillig-tk
🐛
rmohan20
💻 🐛
rxmicro
🐛
ryan-gustafson
💻 🐛
sabi0
🐛 -
scais
🐛 +
scais
🐛
sebbASF
🐛
sergeygorbaty
💻
shilko2013
🐛
shiomiyan
📖
simeonKondr
🐛
snajberk
🐛 -
sniperrifle2004
🐛 +
sniperrifle2004
🐛
snuyanzin
🐛 💻
sratz
🐛
stonio
🐛
sturton
💻 🐛
sudharmohan
🐛
suruchidawar
🐛 -
svenfinitiv
🐛 +
svenfinitiv
🐛
tashiscool
🐛
test-git-hook
🐛
testation21
💻 🐛
thanosa
🐛
tiandiyixian
🐛
tobwoerk
🐛 -
tprouvot
🐛 💻 +
tprouvot
🐛 💻
trentchilders
🐛
triandicAnt
🐛
trishul14
🐛
tsui
🐛
winhkey
🐛
witherspore
🐛 -
wjljack
🐛 +
wjljack
🐛
wuchiuwong
🐛
xingsong
🐛
xioayuge
🐛
xnYi9wRezm
💻 🐛
xuanuy
🐛
xyf0921
🐛 -
yalechen-cyw3
🐛 +
yalechen-cyw3
🐛
yasuharu-sato
🐛
zenglian
🐛
zgrzyt93
💻 🐛
zh3ng
🐛
zt_soft
🐛
ztt79
🐛 -
zzzzfeng
🐛 +
zzzzfeng
🐛
Árpád Magosányi
🐛
任贵杰
🐛
茅延安
💻 diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md index 364ff7c856..69dc9614ba 100644 --- a/docs/pages/release_notes.md +++ b/docs/pages/release_notes.md @@ -28,6 +28,12 @@ from Lua. This means, that the Lua language in PMD can now parse both Lua and Lu * CPD now supports the `--ignore-literal-sequences` argument when analyzing Lua code. +### Financial Contributions + +Many thanks to our sponsors: + +* [Oliver Siegmar](https://github.com/osiegmar) (@osiegmar) + ### External Contributions * [#4066](https://github.com/pmd/pmd/pull/4066): \[lua] Add support for Luau syntax and skipping literal sequences in CPD - [@matthargett](https://github.com/matthargett) * [#4116](https://github.com/pmd/pmd/pull/4116): \[core] Fix missing --file arg in TreeExport CLI example - [@mohan-chinnappan-n](https://github.com/mohan-chinnappan-n) From 560a9a078184877536de04106385a32f92538542 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 29 Sep 2022 16:05:43 +0200 Subject: [PATCH 071/108] [doc] Update release notes --- docs/pages/release_notes.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md index 69dc9614ba..809984dc8f 100644 --- a/docs/pages/release_notes.md +++ b/docs/pages/release_notes.md @@ -20,7 +20,8 @@ This release of PMD adds support for [Luau](https://github.com/Roblox/luau), a g from Lua. This means, that the Lua language in PMD can now parse both Lua and Luau. ### Fixed Issues -* [#4116](https://github.com/pmd/pmd/pull/4116): \[core] Missing --file arg in TreeExport CLI example +* core + * [#4116](https://github.com/pmd/pmd/pull/4116): \[core] Missing --file arg in TreeExport CLI example ### API Changes @@ -35,9 +36,9 @@ Many thanks to our sponsors: * [Oliver Siegmar](https://github.com/osiegmar) (@osiegmar) ### External Contributions -* [#4066](https://github.com/pmd/pmd/pull/4066): \[lua] Add support for Luau syntax and skipping literal sequences in CPD - [@matthargett](https://github.com/matthargett) -* [#4116](https://github.com/pmd/pmd/pull/4116): \[core] Fix missing --file arg in TreeExport CLI example - [@mohan-chinnappan-n](https://github.com/mohan-chinnappan-n) -* [#4131](https://github.com/pmd/pmd/pull/4131): \[doc] TooFewBranchesForASwitchStatement - Use "if-else" instead of "if-then" - [@Suvashri](https://github.com/Suvashri) +* [#4066](https://github.com/pmd/pmd/pull/4066): \[lua] Add support for Luau syntax and skipping literal sequences in CPD - [Matt Hargett](https://github.com/matthargett) (@matthargett) +* [#4116](https://github.com/pmd/pmd/pull/4116): \[core] Fix missing --file arg in TreeExport CLI example - [mohan-chinnappan-n](https://github.com/mohan-chinnappan-n) (@mohan-chinnappan-n) +* [#4131](https://github.com/pmd/pmd/pull/4131): \[doc] TooFewBranchesForASwitchStatement - Use "if-else" instead of "if-then" - [Suvashri](https://github.com/Suvashri) (@Suvashri) {% endtocmaker %} From fe1222abfe5034d59b76429b80d410b2a1959fc0 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 29 Sep 2022 16:08:08 +0200 Subject: [PATCH 072/108] [doc] Update release notes (#4109) --- docs/pages/release_notes.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md index b8f8783555..cafacaa10e 100644 --- a/docs/pages/release_notes.md +++ b/docs/pages/release_notes.md @@ -15,6 +15,8 @@ This is a {{ site.pmd.release_type }} release. ### New and noteworthy ### Fixed Issues +* doc + * [#4109](https://github.com/pmd/pmd/pull/4109): \[doc] Add page for 3rd party rulesets ### API Changes From 00201ae9f7447e61b6c724f03455c8bb794ff09a Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 29 Sep 2022 16:13:07 +0200 Subject: [PATCH 073/108] Update @pzygielo as a contributor --- .all-contributorsrc | 3 ++- docs/pages/pmd/projectdocs/credits.md | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 3120c1af00..3fedd6a198 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -492,7 +492,8 @@ "profile": "https://github.com/pzygielo", "contributions": [ "code", - "bug" + "bug", + "doc" ] }, { diff --git a/docs/pages/pmd/projectdocs/credits.md b/docs/pages/pmd/projectdocs/credits.md index 53a6336d25..34ff789e94 100644 --- a/docs/pages/pmd/projectdocs/credits.md +++ b/docs/pages/pmd/projectdocs/credits.md @@ -568,7 +568,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
Phinehas Artemix
🐛
Phokham Nonava
🐛
Piotr Szymański
🐛 -
Piotrek Żygieło
💻 🐛 +
Piotrek Żygieło
💻 🐛 📖
Pranay Jaiswal
🐛 From cb85a01a88548f85bd29d24189eacc655b392a65 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 29 Sep 2022 16:13:41 +0200 Subject: [PATCH 074/108] [doc] Update release notes (#4124) --- docs/pages/release_notes.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md index 84d0bc0712..66a2088ece 100644 --- a/docs/pages/release_notes.md +++ b/docs/pages/release_notes.md @@ -16,11 +16,14 @@ This is a {{ site.pmd.release_type }} release. ### Fixed Issues * [#4116](https://github.com/pmd/pmd/pull/4116): \[core] Missing --file arg in TreeExport CLI example +* doc + * [#4124](https://github.com/pmd/pmd/pull/4124): \[doc] Fix typos in Java rule docs ### API Changes ### External Contributions * [#4116](https://github.com/pmd/pmd/pull/4116): \[core] Fix missing --file arg in TreeExport CLI example - [@mohan-chinnappan-n](https://github.com/mohan-chinnappan-n) +* [#4124](https://github.com/pmd/pmd/pull/4124) : \[doc] Fix typos in Java rule docs - [Piotrek Żygieło](https://github.com/pzygielo) (@pzygielo) {% endtocmaker %} From 491e8bec6ce72ecb91801d50e1537dd84b80ddff Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 29 Sep 2022 16:21:02 +0200 Subject: [PATCH 075/108] Add @OlegAndreych as a contributor --- .all-contributorsrc | 9 +++ docs/pages/pmd/projectdocs/credits.md | 99 ++++++++++++++------------- 2 files changed, 59 insertions(+), 49 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 3120c1af00..5d3b45de5c 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -6816,6 +6816,15 @@ "contributions": [ "code" ] + }, + { + "login": "OlegAndreych", + "name": "Oleg Andreych", + "avatar_url": "https://avatars.githubusercontent.com/u/2041351?v=4", + "profile": "https://github.com/OlegAndreych", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/docs/pages/pmd/projectdocs/credits.md b/docs/pages/pmd/projectdocs/credits.md index 53a6336d25..a5e8b64c45 100644 --- a/docs/pages/pmd/projectdocs/credits.md +++ b/docs/pages/pmd/projectdocs/credits.md @@ -530,444 +530,445 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
Noam Tamim
🐛
Noel Grandin
🐛
Olaf Haalstra
🐛 +
Oleg Andreych
💻
Oleg Pavlenko
🐛
Oleksii Dykov
💻
Oliver Eikemeier
🐛 -
Olivier Parent
💻 🐛 +
Olivier Parent
💻 🐛
Ollie Abbey
💻 🐛
OverDrone
🐛
Ozan Gulle
💻 🐛
PUNEET JAIN
🐛
Parbati Bose
🐛
Paul Berg
🐛 -
Pavel Bludov
🐛 +
Pavel Bludov
🐛
Pavel Mička
🐛
Pedro Nuno Santos
🐛
Pedro Rijo
🐛
Pelisse Romain
💻 📖 🐛
Per Abich
💻
Pete Davids
🐛 -
Peter Bruin
🐛 +
Peter Bruin
🐛
Peter Chittum
💻 🐛
Peter Cudmore
🐛
Peter Kasson
🐛
Peter Kofler
🐛
Peter Paul Bakker
💻
Pham Hai Trung
🐛 -
Philip Graf
💻 🐛 +
Philip Graf
💻 🐛
Philip Hachey
🐛
Philippe Ozil
🐛
Phinehas Artemix
🐛
Phokham Nonava
🐛
Piotr Szymański
🐛
Piotrek Żygieło
💻 🐛 -
Pranay Jaiswal
🐛 +
Pranay Jaiswal
🐛
Prasad Kamath
🐛
Prasanna
🐛
Presh-AR
🐛
Puneet1726
🐛
Rafael Cortês
🐛
RaheemShaik999
🐛 -
RajeshR
💻 🐛 +
RajeshR
💻 🐛
Ramachandra Mohan
🐛
Ramel0921
🐛
Raquel Pau
🐛
Ravikiran Janardhana
🐛
Reda Benhemmouche
🐛
Renato Oliveira
💻 🐛 -
Rich DiCroce
🐛 +
Rich DiCroce
🐛
Riot R1cket
🐛
Rishabh Jain
🐛
RishabhDeep Singh
🐛
Robbie Martinus
💻 🐛
Robert Henry
🐛
Robert Painsi
🐛 -
Robert Russell
🐛 +
Robert Russell
🐛
Robert Sösemann
💻 📖 📢 🐛
Robert Whitebit
🐛
Robin Richtsfeld
🐛
Robin Stocker
💻 🐛
Robin Wils
🐛
RochusOest
🐛 -
Rodolfo Noviski
🐛 +
Rodolfo Noviski
🐛
Rodrigo Casara
🐛
Rodrigo Fernandes
🐛
Roman Salvador
💻 🐛
Ronald Blaschke
🐛
Róbert Papp
🐛
Saikat Sengupta
🐛 -
Saksham Handu
🐛 +
Saksham Handu
🐛
Saladoc
🐛
Salesforce Bob Lightning
🐛
Sam Carlberg
🐛
Satoshi Kubo
🐛
Scott Kennedy
🐛
Scott Wells
🐛 💻 -
Scrsloota
💻 +
Scrsloota
💻
Sebastian Bögl
🐛
Sebastian Schuberth
🐛
Sebastian Schwarz
🐛
Sergey Gorbaty
🐛
Sergey Kozlov
🐛
Sergey Yanzin
💻 🐛 -
Seth Wilcox
💻 +
Seth Wilcox
💻
Shubham
💻 🐛
Simon Abykov
💻
Simon Xiao
🐛
Srinivasan Venkatachalam
🐛
Stanislav Gromov
🐛
Stanislav Myachenkov
💻 -
Stefan Birkner
🐛 +
Stefan Birkner
🐛
Stefan Bohn
🐛
Stefan Endrullis
🐛
Stefan Klöss-Schuster
🐛
Stefan Wolf
🐛
Stephan H. Wissel
🐛
Stephen
🐛 -
Stephen Friedrich
🐛 +
Stephen Friedrich
🐛
Steve Babula
💻
Stexxe
🐛
Stian Lågstad
🐛
StuartClayton5
🐛
Supun Arunoda
🐛
Suren Abrahamyan
🐛 -
SwatiBGupta1110
🐛 +
SwatiBGupta1110
🐛
SyedThoufich
🐛
Szymon Sasin
🐛
T-chuangxin
🐛
TERAI Atsuhiro
🐛
TIOBE Software
💻 🐛
Taylor Smock
🐛 -
Techeira Damián
💻 🐛 +
Techeira Damián
💻 🐛
Ted Husted
🐛
TehBakker
🐛
The Gitter Badger
🐛
Theodoor
🐛
Thiago Henrique Hüpner
🐛
Thibault Meyer
🐛 -
Thomas Güttler
🐛 +
Thomas Güttler
🐛
Thomas Jones-Low
🐛
Thomas Smith
💻 🐛
ThrawnCA
🐛
Thunderforge
💻 🐛
Tim van der Lippe
🐛
Tobias Weimer
💻 🐛 -
Tom Daly
🐛 +
Tom Daly
🐛
Tomer Figenblat
🐛
Tomi De Lucca
💻 🐛
Torsten Kleiber
🐛
TrackerSB
🐛
Ullrich Hafner
🐛
Utku Cuhadaroglu
💻 🐛 -
Valentin Brandl
🐛 +
Valentin Brandl
🐛
Valeria
🐛
Vasily Anisimov
🐛
Vibhor Goyal
🐛
Vickenty Fesunov
🐛
Victor Noël
🐛
Vincent Galloy
💻 -
Vincent HUYNH
🐛 +
Vincent HUYNH
🐛
Vincent Maurin
🐛
Vincent Privat
🐛
Vishhwas
🐛
Vitaly
🐛
Vitaly Polonetsky
🐛
Vojtech Polivka
🐛 -
Vsevolod Zholobov
🐛 +
Vsevolod Zholobov
🐛
Vyom Yadav
💻
Wang Shidong
🐛
Waqas Ahmed
🐛
Wayne J. Earl
🐛
Wchenghui
🐛
Will Winder
🐛 -
William Brockhus
💻 🐛 +
William Brockhus
💻 🐛
Wilson Kurniawan
🐛
Wim Deblauwe
🐛
Woongsik Choi
🐛
XenoAmess
💻 🐛
Yang
💻
YaroslavTER
🐛 -
Young Chan
💻 🐛 +
Young Chan
💻 🐛
YuJin Kim
🐛
Yuri Dolzhenko
🐛
Yurii Dubinka
🐛
Zoltan Farkas
🐛
Zustin
🐛
aaronhurst-google
🐛 💻 -
alexmodis
🐛 +
alexmodis
🐛
andreoss
🐛
andrey81inmd
💻 🐛
anicoara
🐛
arunprasathav
🐛
asiercamara
🐛
astillich-igniti
💻 -
avesolovksyy
🐛 +
avesolovksyy
🐛
avishvat
🐛
avivmu
🐛
axelbarfod1
🐛
b-3-n
🐛
balbhadra9
🐛
base23de
🐛 -
bergander
🐛 +
bergander
🐛
berkam
💻 🐛
breizh31
🐛
caesarkim
🐛
carolyujing
🐛
cesares-basilico
🐛
chrite
🐛 -
cobratbq
🐛 +
cobratbq
🐛
coladict
🐛
cosmoJFH
🐛
cristalp
🐛
crunsk
🐛
cwholmes
🐛
cyberjj999
🐛 -
cyw3
🐛 +
cyw3
🐛
d1ss0nanz
🐛
dalizi007
💻
danbrycefairsailcom
🐛
dariansanity
🐛
darrenmiliband
🐛
davidburstrom
🐛 -
dbirkman-paloalto
🐛 +
dbirkman-paloalto
🐛
deepak-patra
🐛
dependabot[bot]
💻 🐛
dinesh150
🐛
diziaq
🐛
dreaminpast123
🐛
duanyanan
🐛 -
dutt-sanjay
🐛 +
dutt-sanjay
🐛
dylanleung
🐛
dzeigler
🐛
ekkirala
🐛
emersonmoura
🐛
fairy
🐛
filiprafalowicz
💻 -
foxmason
🐛 +
foxmason
🐛
frankegabor
🐛
frankl
🐛
freafrea
🐛
fsapatin
🐛
gracia19
🐛
guo fei
🐛 -
gurmsc5
🐛 +
gurmsc5
🐛
gwilymatgearset
💻 🐛
haigsn
🐛
hemanshu070
🐛
henrik242
🐛
hongpuwu
🐛
hvbtup
💻 🐛 -
igniti GmbH
🐛 +
igniti GmbH
🐛
ilovezfs
🐛
itaigilo
🐛
jakivey32
🐛
jbennett2091
🐛
jcamerin
🐛
jkeener1
🐛 -
jmetertea
🐛 +
jmetertea
🐛
johnra2
💻
josemanuelrolon
💻 🐛
kabroxiko
💻 🐛
karwer
🐛
kaulonline
🐛
kdaemonv
🐛 -
kenji21
💻 🐛 +
kenji21
💻 🐛
kfranic
🐛
khalidkh
🐛
krzyk
🐛
lasselindqvist
🐛
lgemeinhardt
🐛
lihuaib
🐛 -
lonelyma1021
🐛 +
lonelyma1021
🐛
lpeddy
🐛
lujiefsi
💻
lukelukes
💻
lyriccoder
🐛
marcelmore
🐛
matchbox
🐛 -
matthiaskraaz
🐛 +
matthiaskraaz
🐛
meandonlyme
🐛
mikesive
🐛
milossesic
🐛
mohan-chinnappan-n
💻
mriddell95
🐛
mrlzh
🐛 -
msloan
🐛 +
msloan
🐛
mucharlaravalika
🐛
mvenneman
🐛
nareshl119
🐛
nicolas-harraudeau-sonarsource
🐛
noerremark
🐛
novsirion
🐛 -
oggboy
🐛 +
oggboy
🐛
oinume
🐛
orimarko
💻 🐛
pacvz
💻
pallavi agarwal
🐛
parksungrin
🐛
patpatpat123
🐛 -
patriksevallius
🐛 +
patriksevallius
🐛
pbrajesh1
🐛
phoenix384
🐛
piotrszymanski-sc
💻
plan3d
🐛
poojasix
🐛
prabhushrikant
🐛 -
pujitha8783
🐛 +
pujitha8783
🐛
r-r-a-j
🐛
raghujayjunk
🐛
rajeshveera
🐛
rajeswarreddy88
🐛
recdevs
🐛
reudismam
💻 🐛 -
rijkt
🐛 +
rijkt
🐛
rillig-tk
🐛
rmohan20
💻 🐛
rxmicro
🐛
ryan-gustafson
💻 🐛
sabi0
🐛
scais
🐛 -
sebbASF
🐛 +
sebbASF
🐛
sergeygorbaty
💻
shilko2013
🐛
shiomiyan
📖
simeonKondr
🐛
snajberk
🐛
sniperrifle2004
🐛 -
snuyanzin
🐛 💻 +
snuyanzin
🐛 💻
sratz
🐛
stonio
🐛
sturton
💻 🐛
sudharmohan
🐛
suruchidawar
🐛
svenfinitiv
🐛 -
tashiscool
🐛 +
tashiscool
🐛
test-git-hook
🐛
testation21
💻 🐛
thanosa
🐛
tiandiyixian
🐛
tobwoerk
🐛
tprouvot
🐛 💻 -
trentchilders
🐛 +
trentchilders
🐛
triandicAnt
🐛
trishul14
🐛
tsui
🐛
winhkey
🐛
witherspore
🐛
wjljack
🐛 -
wuchiuwong
🐛 +
wuchiuwong
🐛
xingsong
🐛
xioayuge
🐛
xnYi9wRezm
💻 🐛
xuanuy
🐛
xyf0921
🐛
yalechen-cyw3
🐛 -
yasuharu-sato
🐛 +
yasuharu-sato
🐛
zenglian
🐛
zgrzyt93
💻 🐛
zh3ng
🐛
zt_soft
🐛
ztt79
🐛
zzzzfeng
🐛 -
Árpád Magosányi
🐛 +
Árpád Magosányi
🐛
任贵杰
🐛
茅延安
💻 From 94d343e63bfd93f89a58c72f3f557014f68b9c3d Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 29 Sep 2022 16:21:32 +0200 Subject: [PATCH 076/108] [doc] Update release notes (#4085, #4128) --- docs/pages/release_notes.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md index 84d0bc0712..f966f06180 100644 --- a/docs/pages/release_notes.md +++ b/docs/pages/release_notes.md @@ -16,11 +16,14 @@ This is a {{ site.pmd.release_type }} release. ### Fixed Issues * [#4116](https://github.com/pmd/pmd/pull/4116): \[core] Missing --file arg in TreeExport CLI example +* java-codestyle + * [#4085](https://github.com/pmd/pmd/issues/4085): \[java] UnnecessaryFullyQualifiedName false positive when nested and non-nested classes with the same name and in the same package are used together ### API Changes ### External Contributions * [#4116](https://github.com/pmd/pmd/pull/4116): \[core] Fix missing --file arg in TreeExport CLI example - [@mohan-chinnappan-n](https://github.com/mohan-chinnappan-n) +* [#4128](https://github.com/pmd/pmd/pull/4128): \[java] Fix False-positive UnnecessaryFullyQualifiedName when nested and non-nest… #4103 - [Oleg Andreych](https://github.com/OlegAndreych) (@OlegAndreych) {% endtocmaker %} From ec97933e9954ddedb5fad99f3a74846c209b51cc Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 29 Sep 2022 16:28:09 +0200 Subject: [PATCH 077/108] Remove old comment --- .../rule/codestyle/CommentDefaultAccessModifierRule.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/CommentDefaultAccessModifierRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/CommentDefaultAccessModifierRule.java index f859d2d6f5..f6f9fb0fbc 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/CommentDefaultAccessModifierRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/CommentDefaultAccessModifierRule.java @@ -81,11 +81,6 @@ public class CommentDefaultAccessModifierRule extends AbstractIgnoredAnnotationR return super.visit(node, data); } - /* - * The method determines is the method needs to be included in the violations report - * Also, the code needs to check that the method is not a Test from junit5 - * to avoid conflicts with JUnit5TestShouldBePackagePrivate - */ @Override public Object visit(final ASTMethodDeclaration decl, final Object data) { if (shouldReport(decl)) { From 38955b5c8d5967ef1e5e483bc5c0188641c3c338 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 29 Sep 2022 16:28:43 +0200 Subject: [PATCH 078/108] Add @lfalcantar as a contributor --- .all-contributorsrc | 9 ++ docs/pages/pmd/projectdocs/credits.md | 123 +++++++++++++------------- 2 files changed, 71 insertions(+), 61 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index e29348424c..13290459cc 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -6825,6 +6825,15 @@ "contributions": [ "doc" ] + }, + { + "login": "lfalcantar", + "name": "Luis Alcantar", + "avatar_url": "https://avatars.githubusercontent.com/u/13026131?v=4", + "profile": "https://github.com/lfalcantar", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/docs/pages/pmd/projectdocs/credits.md b/docs/pages/pmd/projectdocs/credits.md index 9f1604b29a..5a5d76c42a 100644 --- a/docs/pages/pmd/projectdocs/credits.md +++ b/docs/pages/pmd/projectdocs/credits.md @@ -419,555 +419,556 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
Lucas Soncini
💻 🐛 +
Luis Alcantar
💻
Lukasz Slonina
🐛
Lukebray
🐛
Lyor Goldstein
🐛
MCMicS
🐛
Macarse
🐛
Machine account for PMD
💻 -
Maciek Siemczyk
🐛 +
Maciek Siemczyk
🐛
Maikel Steneker
💻 🐛
Maksim Moiseikin
🐛
Manfred Koch
🐛
Manuel Moya Ferrer
💻 🐛
Manuel Ryan
🐛
Marat Vyshegorodtsev
🐛 -
Marcel Härle
🐛 +
Marcel Härle
🐛
Marcello Fialho
🐛
Marcin Rataj
🐛
Mark Adamcin
🐛
Mark Hall
💻 🐛
Mark Kolich
🐛
Mark Pritchard
🐛 -
Markus Rathgeb
🐛 +
Markus Rathgeb
🐛
Marquis Wang
🐛
Martin Feldsztejn
🐛
Martin Lehmann
🐛
Martin Spamer
🐛
Martin Tarjányi
🐛
MatFl
🐛 -
Mateusz Stefanski
🐛 +
Mateusz Stefanski
🐛
Mathieu Gouin
🐛
MatiasComercio
💻 🐛
Matt Benson
🐛
Matt De Poorter
🐛
Matt Hargett
💻 💵
Matt Harrah
🐛 -
Matt Nelson
🐛 +
Matt Nelson
🐛
Matthew Amos
🐛
Matthew Duggan
🐛
Matthew Hall
🐛
Matías Fraga
💻 🐛
Maxime Robert
💻 🐛
MetaBF
🐛 -
Michael
🐛 +
Michael
🐛
Michael Bell
🐛
Michael Bernstein
🐛
Michael Clay
🐛
Michael Dombrowski
🐛
Michael Hausegger
🐛
Michael Hoefer
🐛 -
Michael Möbius
🐛 +
Michael Möbius
🐛
Michael N. Lipp
🐛
Michael Pellegrini
🐛
Michal Kordas
🐛
Michał Borek
🐛
Michał Kuliński
🐛
Miguel Núñez Díaz-Montes
🐛 -
Mihai Ionut
🐛 +
Mihai Ionut
🐛
Mirek Hankus
🐛
Mladjan Gadzic
🐛
MrAngry52
🐛
Muminur Choudhury
🐛
Mykhailo Palahuta
💻 🐛
Nagendra Kumar Singh
🐛 -
Nahuel Barrios
🐛 +
Nahuel Barrios
🐛
Nathan Braun
🐛
Nathan Reynolds
🐛
Nathan Reynolds
🐛
Nathanaël
🐛
Naveen
💻
Nazdravi
🐛 -
Neha-Dhonde
🐛 +
Neha-Dhonde
🐛
Nicholas Doyle
🐛
Nick Butcher
🐛
Nico Gallinal
🐛
Nicola Dal Maso
🐛
Nicolas Filotto
💻
Nicolas Vuillamy
📖 -
Nikita Chursin
🐛 +
Nikita Chursin
🐛
Niklas Baudy
🐛
Nikolas Havrikov
🐛
Nilesh Virkar
🐛
Nimit Patel
🐛
Niranjan Harpale
🐛
Noah Sussman
🐛 -
Noah0120
🐛 +
Noah0120
🐛
Noam Tamim
🐛
Noel Grandin
🐛
Olaf Haalstra
🐛
Oleg Pavlenko
🐛
Oleksii Dykov
💻
Oliver Eikemeier
🐛 -
Olivier Parent
💻 🐛 +
Olivier Parent
💻 🐛
Ollie Abbey
💻 🐛
OverDrone
🐛
Ozan Gulle
💻 🐛
PUNEET JAIN
🐛
Parbati Bose
🐛
Paul Berg
🐛 -
Pavel Bludov
🐛 +
Pavel Bludov
🐛
Pavel Mička
🐛
Pedro Nuno Santos
🐛
Pedro Rijo
🐛
Pelisse Romain
💻 📖 🐛
Per Abich
💻
Pete Davids
🐛 -
Peter Bruin
🐛 +
Peter Bruin
🐛
Peter Chittum
💻 🐛
Peter Cudmore
🐛
Peter Kasson
🐛
Peter Kofler
🐛
Peter Paul Bakker
💻
Pham Hai Trung
🐛 -
Philip Graf
💻 🐛 +
Philip Graf
💻 🐛
Philip Hachey
🐛
Philippe Ozil
🐛
Phinehas Artemix
🐛
Phokham Nonava
🐛
Piotr Szymański
🐛
Piotrek Żygieło
💻 🐛 -
Pranay Jaiswal
🐛 +
Pranay Jaiswal
🐛
Prasad Kamath
🐛
Prasanna
🐛
Presh-AR
🐛
Puneet1726
🐛
Rafael Cortês
🐛
RaheemShaik999
🐛 -
RajeshR
💻 🐛 +
RajeshR
💻 🐛
Ramachandra Mohan
🐛
Ramel0921
🐛
Raquel Pau
🐛
Ravikiran Janardhana
🐛
Reda Benhemmouche
🐛
Renato Oliveira
💻 🐛 -
Rich DiCroce
🐛 +
Rich DiCroce
🐛
Riot R1cket
🐛
Rishabh Jain
🐛
RishabhDeep Singh
🐛
Robbie Martinus
💻 🐛
Robert Henry
🐛
Robert Painsi
🐛 -
Robert Russell
🐛 +
Robert Russell
🐛
Robert Sösemann
💻 📖 📢 🐛
Robert Whitebit
🐛
Robin Richtsfeld
🐛
Robin Stocker
💻 🐛
Robin Wils
🐛
RochusOest
🐛 -
Rodolfo Noviski
🐛 +
Rodolfo Noviski
🐛
Rodrigo Casara
🐛
Rodrigo Fernandes
🐛
Roman Salvador
💻 🐛
Ronald Blaschke
🐛
Róbert Papp
🐛
Saikat Sengupta
🐛 -
Saksham Handu
🐛 +
Saksham Handu
🐛
Saladoc
🐛
Salesforce Bob Lightning
🐛
Sam Carlberg
🐛
Satoshi Kubo
🐛
Scott Kennedy
🐛
Scott Wells
🐛 💻 -
Scrsloota
💻 +
Scrsloota
💻
Sebastian Bögl
🐛
Sebastian Schuberth
🐛
Sebastian Schwarz
🐛
Sergey Gorbaty
🐛
Sergey Kozlov
🐛
Sergey Yanzin
💻 🐛 -
Seth Wilcox
💻 +
Seth Wilcox
💻
Shubham
💻 🐛
Simon Abykov
💻
Simon Xiao
🐛
Srinivasan Venkatachalam
🐛
Stanislav Gromov
🐛
Stanislav Myachenkov
💻 -
Stefan Birkner
🐛 +
Stefan Birkner
🐛
Stefan Bohn
🐛
Stefan Endrullis
🐛
Stefan Klöss-Schuster
🐛
Stefan Wolf
🐛
Stephan H. Wissel
🐛
Stephen
🐛 -
Stephen Friedrich
🐛 +
Stephen Friedrich
🐛
Steve Babula
💻
Stexxe
🐛
Stian Lågstad
🐛
StuartClayton5
🐛
Supun Arunoda
🐛
Suren Abrahamyan
🐛 -
Suvashri
📖 +
Suvashri
📖
SwatiBGupta1110
🐛
SyedThoufich
🐛
Szymon Sasin
🐛
T-chuangxin
🐛
TERAI Atsuhiro
🐛
TIOBE Software
💻 🐛 -
Taylor Smock
🐛 +
Taylor Smock
🐛
Techeira Damián
💻 🐛
Ted Husted
🐛
TehBakker
🐛
The Gitter Badger
🐛
Theodoor
🐛
Thiago Henrique Hüpner
🐛 -
Thibault Meyer
🐛 +
Thibault Meyer
🐛
Thomas Güttler
🐛
Thomas Jones-Low
🐛
Thomas Smith
💻 🐛
ThrawnCA
🐛
Thunderforge
💻 🐛
Tim van der Lippe
🐛 -
Tobias Weimer
💻 🐛 +
Tobias Weimer
💻 🐛
Tom Daly
🐛
Tomer Figenblat
🐛
Tomi De Lucca
💻 🐛
Torsten Kleiber
🐛
TrackerSB
🐛
Ullrich Hafner
🐛 -
Utku Cuhadaroglu
💻 🐛 +
Utku Cuhadaroglu
💻 🐛
Valentin Brandl
🐛
Valeria
🐛
Vasily Anisimov
🐛
Vibhor Goyal
🐛
Vickenty Fesunov
🐛
Victor Noël
🐛 -
Vincent Galloy
💻 +
Vincent Galloy
💻
Vincent HUYNH
🐛
Vincent Maurin
🐛
Vincent Privat
🐛
Vishhwas
🐛
Vitaly
🐛
Vitaly Polonetsky
🐛 -
Vojtech Polivka
🐛 +
Vojtech Polivka
🐛
Vsevolod Zholobov
🐛
Vyom Yadav
💻
Wang Shidong
🐛
Waqas Ahmed
🐛
Wayne J. Earl
🐛
Wchenghui
🐛 -
Will Winder
🐛 +
Will Winder
🐛
William Brockhus
💻 🐛
Wilson Kurniawan
🐛
Wim Deblauwe
🐛
Woongsik Choi
🐛
XenoAmess
💻 🐛
Yang
💻 -
YaroslavTER
🐛 +
YaroslavTER
🐛
Young Chan
💻 🐛
YuJin Kim
🐛
Yuri Dolzhenko
🐛
Yurii Dubinka
🐛
Zoltan Farkas
🐛
Zustin
🐛 -
aaronhurst-google
🐛 💻 +
aaronhurst-google
🐛 💻
alexmodis
🐛
andreoss
🐛
andrey81inmd
💻 🐛
anicoara
🐛
arunprasathav
🐛
asiercamara
🐛 -
astillich-igniti
💻 +
astillich-igniti
💻
avesolovksyy
🐛
avishvat
🐛
avivmu
🐛
axelbarfod1
🐛
b-3-n
🐛
balbhadra9
🐛 -
base23de
🐛 +
base23de
🐛
bergander
🐛
berkam
💻 🐛
breizh31
🐛
caesarkim
🐛
carolyujing
🐛
cesares-basilico
🐛 -
chrite
🐛 +
chrite
🐛
cobratbq
🐛
coladict
🐛
cosmoJFH
🐛
cristalp
🐛
crunsk
🐛
cwholmes
🐛 -
cyberjj999
🐛 +
cyberjj999
🐛
cyw3
🐛
d1ss0nanz
🐛
dalizi007
💻
danbrycefairsailcom
🐛
dariansanity
🐛
darrenmiliband
🐛 -
davidburstrom
🐛 +
davidburstrom
🐛
dbirkman-paloalto
🐛
deepak-patra
🐛
dependabot[bot]
💻 🐛
dinesh150
🐛
diziaq
🐛
dreaminpast123
🐛 -
duanyanan
🐛 +
duanyanan
🐛
dutt-sanjay
🐛
dylanleung
🐛
dzeigler
🐛
ekkirala
🐛
emersonmoura
🐛
fairy
🐛 -
filiprafalowicz
💻 +
filiprafalowicz
💻
foxmason
🐛
frankegabor
🐛
frankl
🐛
freafrea
🐛
fsapatin
🐛
gracia19
🐛 -
guo fei
🐛 +
guo fei
🐛
gurmsc5
🐛
gwilymatgearset
💻 🐛
haigsn
🐛
hemanshu070
🐛
henrik242
🐛
hongpuwu
🐛 -
hvbtup
💻 🐛 +
hvbtup
💻 🐛
igniti GmbH
🐛
ilovezfs
🐛
itaigilo
🐛
jakivey32
🐛
jbennett2091
🐛
jcamerin
🐛 -
jkeener1
🐛 +
jkeener1
🐛
jmetertea
🐛
johnra2
💻
josemanuelrolon
💻 🐛
kabroxiko
💻 🐛
karwer
🐛
kaulonline
🐛 -
kdaemonv
🐛 +
kdaemonv
🐛
kenji21
💻 🐛
kfranic
🐛
khalidkh
🐛
krzyk
🐛
lasselindqvist
🐛
lgemeinhardt
🐛 -
lihuaib
🐛 +
lihuaib
🐛
lonelyma1021
🐛
lpeddy
🐛
lujiefsi
💻
lukelukes
💻
lyriccoder
🐛
marcelmore
🐛 -
matchbox
🐛 +
matchbox
🐛
matthiaskraaz
🐛
meandonlyme
🐛
mikesive
🐛
milossesic
🐛
mohan-chinnappan-n
💻
mriddell95
🐛 -
mrlzh
🐛 +
mrlzh
🐛
msloan
🐛
mucharlaravalika
🐛
mvenneman
🐛
nareshl119
🐛
nicolas-harraudeau-sonarsource
🐛
noerremark
🐛 -
novsirion
🐛 +
novsirion
🐛
oggboy
🐛
oinume
🐛
orimarko
💻 🐛
pacvz
💻
pallavi agarwal
🐛
parksungrin
🐛 -
patpatpat123
🐛 +
patpatpat123
🐛
patriksevallius
🐛
pbrajesh1
🐛
phoenix384
🐛
piotrszymanski-sc
💻
plan3d
🐛
poojasix
🐛 -
prabhushrikant
🐛 +
prabhushrikant
🐛
pujitha8783
🐛
r-r-a-j
🐛
raghujayjunk
🐛
rajeshveera
🐛
rajeswarreddy88
🐛
recdevs
🐛 -
reudismam
💻 🐛 +
reudismam
💻 🐛
rijkt
🐛
rillig-tk
🐛
rmohan20
💻 🐛
rxmicro
🐛
ryan-gustafson
💻 🐛
sabi0
🐛 -
scais
🐛 +
scais
🐛
sebbASF
🐛
sergeygorbaty
💻
shilko2013
🐛
shiomiyan
📖
simeonKondr
🐛
snajberk
🐛 -
sniperrifle2004
🐛 +
sniperrifle2004
🐛
snuyanzin
🐛 💻
sratz
🐛
stonio
🐛
sturton
💻 🐛
sudharmohan
🐛
suruchidawar
🐛 -
svenfinitiv
🐛 +
svenfinitiv
🐛
tashiscool
🐛
test-git-hook
🐛
testation21
💻 🐛
thanosa
🐛
tiandiyixian
🐛
tobwoerk
🐛 -
tprouvot
🐛 💻 +
tprouvot
🐛 💻
trentchilders
🐛
triandicAnt
🐛
trishul14
🐛
tsui
🐛
winhkey
🐛
witherspore
🐛 -
wjljack
🐛 +
wjljack
🐛
wuchiuwong
🐛
xingsong
🐛
xioayuge
🐛
xnYi9wRezm
💻 🐛
xuanuy
🐛
xyf0921
🐛 -
yalechen-cyw3
🐛 +
yalechen-cyw3
🐛
yasuharu-sato
🐛
zenglian
🐛
zgrzyt93
💻 🐛
zh3ng
🐛
zt_soft
🐛
ztt79
🐛 -
zzzzfeng
🐛 +
zzzzfeng
🐛
Árpád Magosányi
🐛
任贵杰
🐛
茅延安
💻 From 9c215e97222d5a42bb5407fbc99f66640f7097b5 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 29 Sep 2022 16:41:59 +0200 Subject: [PATCH 079/108] [doc] Update release notes --- docs/pages/release_notes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md index bf54e794de..2da44b2235 100644 --- a/docs/pages/release_notes.md +++ b/docs/pages/release_notes.md @@ -53,7 +53,7 @@ Many thanks to our sponsors: ### External Contributions * [#4066](https://github.com/pmd/pmd/pull/4066): \[lua] Add support for Luau syntax and skipping literal sequences in CPD - [Matt Hargett](https://github.com/matthargett) (@matthargett) * [#4116](https://github.com/pmd/pmd/pull/4116): \[core] Fix missing --file arg in TreeExport CLI example - [mohan-chinnappan-n](https://github.com/mohan-chinnappan-n) (@mohan-chinnappan-n) -* [#4124](https://github.com/pmd/pmd/pull/4124) : \[doc] Fix typos in Java rule docs - [Piotrek Żygieło](https://github.com/pzygielo) (@pzygielo) +* [#4124](https://github.com/pmd/pmd/pull/4124): \[doc] Fix typos in Java rule docs - [Piotrek Żygieło](https://github.com/pzygielo) (@pzygielo) * [#4128](https://github.com/pmd/pmd/pull/4128): \[java] Fix False-positive UnnecessaryFullyQualifiedName when nested and non-nest… #4103 - [Oleg Andreych](https://github.com/OlegAndreych) (@OlegAndreych) * [#4131](https://github.com/pmd/pmd/pull/4131): \[doc] TooFewBranchesForASwitchStatement - Use "if-else" instead of "if-then" - [Suvashri](https://github.com/Suvashri) (@Suvashri) * [#4137](https://github.com/pmd/pmd/pull/4137): \[java] Fixes 3859: Exclude junit5 test methods from the commentDefaultAccessModifierRule - [Luis Alcantar](https://github.com/lfalcantar) (@lfalcantar) From 306db99400a5c5211e5e21b4fd1b11bf9b40add9 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 29 Sep 2022 19:12:04 +0200 Subject: [PATCH 080/108] [java] UnusedPrivateField - ignore any annotations Deprecate "ignoreAnnotations" property --- .../bestpractices/UnusedPrivateFieldRule.java | 53 +++++++++++-------- .../resources/category/java/bestpractices.xml | 4 ++ .../bestpractices/xml/UnusedPrivateField.xml | 21 ++++++-- 3 files changed, 52 insertions(+), 26 deletions(-) diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedPrivateFieldRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedPrivateFieldRule.java index 7d89eb19c5..171ad810b8 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedPrivateFieldRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedPrivateFieldRule.java @@ -4,11 +4,14 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; +import static net.sourceforge.pmd.properties.PropertyFactory.stringListProperty; + import java.util.ArrayList; -import java.util.Collection; import java.util.List; import java.util.Map; +import java.util.logging.Logger; +import net.sourceforge.pmd.RuleContext; import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceBody; import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceBodyDeclaration; import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceDeclaration; @@ -22,7 +25,7 @@ import net.sourceforge.pmd.lang.java.ast.AbstractJavaNode; import net.sourceforge.pmd.lang.java.ast.AccessNode; import net.sourceforge.pmd.lang.java.ast.Annotatable; import net.sourceforge.pmd.lang.java.ast.JavaNode; -import net.sourceforge.pmd.lang.java.rule.AbstractLombokAwareRule; +import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule; import net.sourceforge.pmd.lang.java.symboltable.JavaNameOccurrence; import net.sourceforge.pmd.lang.java.symboltable.VariableNameDeclaration; import net.sourceforge.pmd.lang.symboltable.NameDeclaration; @@ -30,8 +33,17 @@ import net.sourceforge.pmd.lang.symboltable.NameOccurrence; import net.sourceforge.pmd.properties.PropertyDescriptor; import net.sourceforge.pmd.properties.PropertyFactory; -public class UnusedPrivateFieldRule extends AbstractLombokAwareRule { +public class UnusedPrivateFieldRule extends AbstractJavaRule { + private static final Logger LOG = Logger.getLogger(UnusedPrivateFieldRule.class.getName()); + + private static final PropertyDescriptor> IGNORED_ANNOTATIONS_DESCRIPTOR + = stringListProperty("ignoredAnnotations") + .desc("deprecated! Fully qualified names of the annotation types that should be ignored by this rule. " + + "This property has been deprecated since PMD 6.50.0 and will be completely ignored.") + .defaultValue(new ArrayList()) + .build(); + private static boolean warnedAboutDeprecatedIgnoredAnnotationsProperty = false; private static final PropertyDescriptor> IGNORED_FIELD_NAMES = PropertyFactory.stringListProperty("ignoredFieldNames") .defaultValues("serialVersionUID", "serialPersistentFields") @@ -39,32 +51,25 @@ public class UnusedPrivateFieldRule extends AbstractLombokAwareRule { .build(); public UnusedPrivateFieldRule() { + definePropertyDescriptor(IGNORED_ANNOTATIONS_DESCRIPTOR); definePropertyDescriptor(IGNORED_FIELD_NAMES); } @Override - protected Collection defaultSuppressionAnnotations() { - Collection defaultValues = new ArrayList<>(super.defaultSuppressionAnnotations()); - defaultValues.add("java.lang.Deprecated"); - defaultValues.add("javafx.fxml.FXML"); - defaultValues.add("lombok.experimental.Delegate"); - defaultValues.add("lombok.EqualsAndHashCode"); - defaultValues.add("javax.persistence.Id"); - defaultValues.add("javax.persistence.EmbeddedId"); - defaultValues.add("javax.persistence.Version"); - defaultValues.add("jakarta.persistence.Id"); - defaultValues.add("jakarta.persistence.EmbeddedId"); - defaultValues.add("jakarta.persistence.Version"); - defaultValues.add("org.mockito.Mock"); - defaultValues.add("org.mockito.Spy"); - defaultValues.add("org.springframework.boot.test.mock.mockito.MockBean"); - defaultValues.add("org.springframework.boot.test.mock.mockito.SpyBean"); - return defaultValues; + public void start(RuleContext ctx) { + super.start(ctx); + List property = getProperty(IGNORED_ANNOTATIONS_DESCRIPTOR); + if (!warnedAboutDeprecatedIgnoredAnnotationsProperty && !property.equals(IGNORED_ANNOTATIONS_DESCRIPTOR.defaultValue())) { + LOG.warning("The property '" + IGNORED_ANNOTATIONS_DESCRIPTOR.name() + "' for rule '" + + this.getName() + "' is deprecated. The value is being ignored and the property will " + + "be removed with a future PMD version."); + warnedAboutDeprecatedIgnoredAnnotationsProperty = true; + } } @Override public Object visit(ASTClassOrInterfaceDeclaration node, Object data) { - if (hasIgnoredAnnotation(node)) { + if (hasAnyAnnotation(node)) { return super.visit(node, data); } @@ -75,7 +80,7 @@ public class UnusedPrivateFieldRule extends AbstractLombokAwareRule { AccessNode accessNodeParent = decl.getAccessNodeParent(); if (!accessNodeParent.isPrivate() || isOK(decl.getImage()) - || hasIgnoredAnnotation((Annotatable) accessNodeParent)) { + || hasAnyAnnotation((Annotatable) accessNodeParent)) { continue; } if (!actuallyUsed(entry.getValue())) { @@ -87,6 +92,10 @@ public class UnusedPrivateFieldRule extends AbstractLombokAwareRule { return super.visit(node, data); } + private boolean hasAnyAnnotation(Annotatable node) { + return !node.getDeclaredAnnotations().isEmpty(); + } + private boolean usedInOuterEnum(ASTClassOrInterfaceDeclaration node, NameDeclaration decl) { List outerEnums = node.getParentsOfType(ASTEnumDeclaration.class); for (ASTEnumDeclaration outerEnum : outerEnums) { diff --git a/pmd-java/src/main/resources/category/java/bestpractices.xml b/pmd-java/src/main/resources/category/java/bestpractices.xml index 122b0e4dc7..939d4ac72a 100644 --- a/pmd-java/src/main/resources/category/java/bestpractices.xml +++ b/pmd-java/src/main/resources/category/java/bestpractices.xml @@ -1722,6 +1722,10 @@ public class Foo { externalInfoUrl="${pmd.website.baseurl}/pmd_rules_java_bestpractices.html#unusedprivatefield"> Detects when a private field is declared and/or assigned a value, but not used. + +Since PMD 6.50.0 private fields are ignored, if the fields are annotated with any annotation or the +enclosing class has any annotation. Annotations often enable a framework (such as mocking or Lombok) +which use the fields by reflection, which can't be detected by static code analysis. 3 diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/UnusedPrivateField.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/UnusedPrivateField.xml index 3b6c0af121..b4f1be83f3 100644 --- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/UnusedPrivateField.xml +++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/UnusedPrivateField.xml @@ -546,7 +546,7 @@ public class Foo { #907 UnusedPrivateField false-positive with @FXML - 3 javafx.fxml.FXML - 1 + 0 #1952 [java] UnusedPrivateField not triggering if @Value annotation present - 1 - 6 + 0 #2673 UnusedPrivateField false positive with lombok annotation EqualsAndHashCode lombok.Getter|lombok.Data - 1 + 0 + + + [java] UnusedPrivateField - false positive with Lombok @ToString.Include #4033 + 0 + + From 2f2b6a2476978bf989e2e9026628a9082793489f Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 30 Sep 2022 09:23:24 +0200 Subject: [PATCH 081/108] [scala] Bump scala-library from 2.13.3 to 2.13.9 Fixes https://github.com/pmd/pmd/security/dependabot/28 Fixes https://github.com/advisories/GHSA-8qv5-68g4-248j Fixes CVE-2022-36944 --- pmd-scala-modules/pmd-scala_2.13/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmd-scala-modules/pmd-scala_2.13/pom.xml b/pmd-scala-modules/pmd-scala_2.13/pom.xml index ae57caed29..41597fc0d3 100644 --- a/pmd-scala-modules/pmd-scala_2.13/pom.xml +++ b/pmd-scala-modules/pmd-scala_2.13/pom.xml @@ -28,7 +28,7 @@ org.scala-lang scala-library - ${scalaVersion}.3 + ${scalaVersion}.9 org.scalameta From 167dd635ede42f19917ded56f2ce960954c77eb9 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 30 Sep 2022 09:23:54 +0200 Subject: [PATCH 082/108] [scala] Bump scala-library from 2.12.10 to 2.12.17 --- pmd-scala-modules/pmd-scala_2.12/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmd-scala-modules/pmd-scala_2.12/pom.xml b/pmd-scala-modules/pmd-scala_2.12/pom.xml index 9d8b80cbbd..427a4fd367 100644 --- a/pmd-scala-modules/pmd-scala_2.12/pom.xml +++ b/pmd-scala-modules/pmd-scala_2.12/pom.xml @@ -28,7 +28,7 @@ org.scala-lang scala-library - ${scalaVersion}.10 + ${scalaVersion}.17 org.scalameta From 45f3f6e5bbb4f94fd0b9b59be145319144918f4f Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 30 Sep 2022 09:24:22 +0200 Subject: [PATCH 083/108] [scala] Bump scalameta from 4.2.0 to 4.6.0 --- pmd-scala-modules/pmd-scala-common/pom.xml | 2 +- .../pmd/lang/scala/ast/testdata/package.txt | 42 ++++++++++--------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/pmd-scala-modules/pmd-scala-common/pom.xml b/pmd-scala-modules/pmd-scala-common/pom.xml index 0997d90d5d..ec947f79b0 100644 --- a/pmd-scala-modules/pmd-scala-common/pom.xml +++ b/pmd-scala-modules/pmd-scala-common/pom.xml @@ -13,7 +13,7 @@ - 4.2.0 + 4.6.0 diff --git a/pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/package.txt b/pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/package.txt index 0a5eedd4b5..fc088d5b3e 100644 --- a/pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/package.txt +++ b/pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/package.txt @@ -11,10 +11,11 @@ +- DefnType | +- TypeName | +- TypeSelect - | +- TermSelect - | | +- TermName - | | +- TermName - | +- TypeName + | | +- TermSelect + | | | +- TermName + | | | +- TermName + | | +- TypeName + | +- TypeBounds +- DefnVal | +- PatVar | | +- TermName @@ -26,10 +27,11 @@ +- DefnType | +- TypeName | +- TypeSelect - | +- TermSelect - | | +- TermName - | | +- TermName - | +- TypeName + | | +- TermSelect + | | | +- TermName + | | | +- TermName + | | +- TypeName + | +- TypeBounds +- DefnVal | +- PatVar | | +- TermName @@ -51,8 +53,9 @@ | | +- TypeName | | +- TypeBounds | +- TypeApply - | +- TypeName - | +- TypeName + | | +- TypeName + | | +- TypeName + | +- TypeBounds +- DefnVal | +- ModAnnot | | +- Init @@ -79,12 +82,13 @@ | +- TypeName | +- TypeBounds +- TypeApply - +- TypeSelect - | +- TermSelect - | | +- TermSelect - | | | +- TermName - | | | +- TermName - | | +- TermName - | +- TypeName - +- TypeName - +- TypeName + | +- TypeSelect + | | +- TermSelect + | | | +- TermSelect + | | | | +- TermName + | | | | +- TermName + | | | +- TermName + | | +- TypeName + | +- TypeName + | +- TypeName + +- TypeBounds From e712b89fa0f3f7ba32a6a18d208346570cd6282b Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 30 Sep 2022 10:00:23 +0200 Subject: [PATCH 084/108] [java] UnusedPrivateFieldRule - improve rule doc --- docs/pages/release_notes.md | 11 +++++++++-- .../rule/bestpractices/UnusedPrivateFieldRule.java | 12 ++++++------ .../main/resources/category/java/bestpractices.xml | 6 ++++-- .../net/sourceforge/pmd/testframework/RuleTst.java | 6 ++++++ 4 files changed, 25 insertions(+), 10 deletions(-) diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md index 2da44b2235..2354ce5f4b 100644 --- a/docs/pages/release_notes.md +++ b/docs/pages/release_notes.md @@ -21,8 +21,15 @@ from Lua. This means, that the Lua language in PMD can now parse both Lua and Lu #### Modified rules -* The Java rule {% rule java/codestyle/CommentDefaultAccessModifier %} now by default ignores JUnit5 annotated - methods. This behavior can be customized using the property `ignoredAnnotations`. +* The Java rule {% rule java/bestpractives/UnusedPrivateField %} now ignores private fields, if the fields are + annotated with any annotation or the enclosing class has any annotation. Annotations often enable a + framework (such as dependency injection, mocking or e.g. Lombok) which use the fields by reflection or other + means. This usage can't be detected by static code analysis. Previously these frameworks where explicitly allowed + by listing their annotations in the property "ignoredAnnotations", but that turned out to be prone of false + positive for any not explicitly considered framework. That's why the property "ignoredAnnotations" has been + deprecated for this rule. +* The Java rule {% rule java/codestyle/CommentDefaultAccessModifier %} now by default ignores JUnit5 annotated + methods. This behavior can be customized using the property `ignoredAnnotations`. ### Fixed Issues * cli diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedPrivateFieldRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedPrivateFieldRule.java index 171ad810b8..009bc3f486 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedPrivateFieldRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedPrivateFieldRule.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.Map; import java.util.logging.Logger; -import net.sourceforge.pmd.RuleContext; +import net.sourceforge.pmd.PMDVersion; import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceBody; import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceBodyDeclaration; import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceDeclaration; @@ -56,15 +56,15 @@ public class UnusedPrivateFieldRule extends AbstractJavaRule { } @Override - public void start(RuleContext ctx) { - super.start(ctx); - List property = getProperty(IGNORED_ANNOTATIONS_DESCRIPTOR); - if (!warnedAboutDeprecatedIgnoredAnnotationsProperty && !property.equals(IGNORED_ANNOTATIONS_DESCRIPTOR.defaultValue())) { + public String dysfunctionReason() { + List> overriddenPropertyDescriptors = getOverriddenPropertyDescriptors(); + if (!warnedAboutDeprecatedIgnoredAnnotationsProperty && overriddenPropertyDescriptors.contains(IGNORED_ANNOTATIONS_DESCRIPTOR)) { LOG.warning("The property '" + IGNORED_ANNOTATIONS_DESCRIPTOR.name() + "' for rule '" + this.getName() + "' is deprecated. The value is being ignored and the property will " - + "be removed with a future PMD version."); + + "be removed in PMD " + PMDVersion.getNextMajorRelease()); warnedAboutDeprecatedIgnoredAnnotationsProperty = true; } + return super.dysfunctionReason(); } @Override diff --git a/pmd-java/src/main/resources/category/java/bestpractices.xml b/pmd-java/src/main/resources/category/java/bestpractices.xml index 939d4ac72a..9eec8d4fd8 100644 --- a/pmd-java/src/main/resources/category/java/bestpractices.xml +++ b/pmd-java/src/main/resources/category/java/bestpractices.xml @@ -1724,8 +1724,10 @@ public class Foo { Detects when a private field is declared and/or assigned a value, but not used. Since PMD 6.50.0 private fields are ignored, if the fields are annotated with any annotation or the -enclosing class has any annotation. Annotations often enable a framework (such as mocking or Lombok) -which use the fields by reflection, which can't be detected by static code analysis. +enclosing class has any annotation. Annotations often enable a framework (such as dependency injection, mocking +or e.g. Lombok) which use the fields by reflection or other means. This usage can't be detected by static code analysis. +Previously these frameworks where explicitly allowed by listing their annotations in the property +"ignoredAnnotations", but that turned out to be prone of false positive for any not explicitly considered framework. 3 diff --git a/pmd-test/src/main/java/net/sourceforge/pmd/testframework/RuleTst.java b/pmd-test/src/main/java/net/sourceforge/pmd/testframework/RuleTst.java index 7768660bd7..9bd6b0a541 100644 --- a/pmd-test/src/main/java/net/sourceforge/pmd/testframework/RuleTst.java +++ b/pmd-test/src/main/java/net/sourceforge/pmd/testframework/RuleTst.java @@ -17,6 +17,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import org.apache.commons.lang3.StringUtils; import org.xml.sax.InputSource; import net.sourceforge.pmd.PMDConfiguration; @@ -104,6 +105,11 @@ public abstract class RuleTst { } } + String dysfunctionReason = rule.dysfunctionReason(); + if (StringUtils.isNotBlank(dysfunctionReason)) { + throw new RuntimeException("Rule is not configured correctly: " + dysfunctionReason); + } + report = processUsingStringReader(test, rule); res = report.size(); } catch (Exception e) { From 1cc0fbb04778f3029efa2ee9dc2767b3f0f58836 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 30 Sep 2022 10:03:11 +0200 Subject: [PATCH 085/108] [java] UnusedPrivateFieldRule - remove ignoredAnnotations from rule tests --- .../pmd/lang/java/rule/bestpractices/xml/UnusedPrivateField.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/UnusedPrivateField.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/UnusedPrivateField.xml index b4f1be83f3..b773a97ba6 100644 --- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/UnusedPrivateField.xml +++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/UnusedPrivateField.xml @@ -545,7 +545,6 @@ public class Foo { #907 UnusedPrivateField false-positive with @FXML - 3 - javafx.fxml.FXML 0 #2673 UnusedPrivateField false positive with lombok annotation EqualsAndHashCode - lombok.Getter|lombok.Data 0 Date: Fri, 30 Sep 2022 10:21:25 +0200 Subject: [PATCH 086/108] [java] Fix rule tests with dysfunctional rule configurations --- .../bestpractices/xml/AvoidUsingHardCodedIP.xml | 7 ------- .../java/rule/design/xml/LoosePackageCoupling.xml | 13 +------------ .../lang/java/rule/design/xml/NPathComplexity.xml | 4 ++-- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/AvoidUsingHardCodedIP.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/AvoidUsingHardCodedIP.xml index 39afc069c1..66ad2f040c 100644 --- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/AvoidUsingHardCodedIP.xml +++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/AvoidUsingHardCodedIP.xml @@ -120,13 +120,6 @@ public class Foo { - - Comprehensive, check for nothing - - 0 - - - Comprehensive, check for IPv4 IPv4 diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/LoosePackageCoupling.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/LoosePackageCoupling.xml index 871ad0543e..7a6a9dba22 100644 --- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/LoosePackageCoupling.xml +++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/LoosePackageCoupling.xml @@ -25,12 +25,6 @@ public class Foo { } ]]> - - default package: nothing configured, ok - 0 - - - default package: unused package, ok nothing.used @@ -69,12 +63,6 @@ public class Foo { - - some package: nothing configured, ok - 0 - - - some package: unused package, ok nothing.used @@ -115,6 +103,7 @@ public class Foo { bug fix: annotation before package + javax.xml.ws.wsaddressing 0 Test default report level - report 200 - 0 + 1 1 - The method 'bar()' has an NPath complexity of 200, current threshold is 0 + The method 'bar()' has an NPath complexity of 200, current threshold is 1 Date: Fri, 30 Sep 2022 10:32:22 +0200 Subject: [PATCH 087/108] Fix release notes --- docs/pages/release_notes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md index 2354ce5f4b..2abc79f726 100644 --- a/docs/pages/release_notes.md +++ b/docs/pages/release_notes.md @@ -21,7 +21,7 @@ from Lua. This means, that the Lua language in PMD can now parse both Lua and Lu #### Modified rules -* The Java rule {% rule java/bestpractives/UnusedPrivateField %} now ignores private fields, if the fields are +* The Java rule {% rule java/bestpractices/UnusedPrivateField %} now ignores private fields, if the fields are annotated with any annotation or the enclosing class has any annotation. Annotations often enable a framework (such as dependency injection, mocking or e.g. Lombok) which use the fields by reflection or other means. This usage can't be detected by static code analysis. Previously these frameworks where explicitly allowed From 81a8ba0c87f24add7609f1549cbfc065e6d62835 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 30 Sep 2022 10:48:42 +0200 Subject: [PATCH 088/108] [ci] Add permission contents:write for build job --- .github/workflows/build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cb7a64a706..a2e4d53c90 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,6 +20,11 @@ permissions: jobs: build: runs-on: ${{ matrix.os }} + permissions: + # read to fetch code (actions/checkout) + # write to push code to gh-pages, create releases + # note: forked repositories will have maximum read access + contents: write continue-on-error: false strategy: matrix: From d7de6f59d2d1d4a06c5c50ae18b09a57b983f556 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 30 Sep 2022 11:00:06 +0200 Subject: [PATCH 089/108] [doc] Accept ADR-1 and ADR-2 --- docs/pages/pmd/projectdocs/decisions/adr-1.md | 4 +++- docs/pages/pmd/projectdocs/decisions/adr-2.md | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/pages/pmd/projectdocs/decisions/adr-1.md b/docs/pages/pmd/projectdocs/decisions/adr-1.md index 07bf1f84fa..85d750b473 100644 --- a/docs/pages/pmd/projectdocs/decisions/adr-1.md +++ b/docs/pages/pmd/projectdocs/decisions/adr-1.md @@ -5,7 +5,7 @@ permalink: pmd_projectdocs_decisions_adr_1.html sidebaractiveurl: /pmd_projectdocs_decisions.html adr: true # Proposed / Accepted / Deprecated / Superseded -adr_status: "Proposed" +adr_status: "Accepted" last_updated: September 2022 --- @@ -63,6 +63,8 @@ However, this also adds additional tasks, and it takes time to write down and do # Change History +2022-09-30: Status changed to "Accepted". + 2022-09-06: Added section "Change History" to the template. Added "Last updated" to "Status" section. 2022-07-28: Proposed initial version. diff --git a/docs/pages/pmd/projectdocs/decisions/adr-2.md b/docs/pages/pmd/projectdocs/decisions/adr-2.md index 1e77d6af2c..b3f57efd4f 100644 --- a/docs/pages/pmd/projectdocs/decisions/adr-2.md +++ b/docs/pages/pmd/projectdocs/decisions/adr-2.md @@ -5,7 +5,7 @@ permalink: pmd_projectdocs_decisions_adr_2.html sidebaractiveurl: /pmd_projectdocs_decisions.html adr: true # Proposed / Accepted / Deprecated / Superseded -adr_status: "Proposed" +adr_status: "Accepted" last_updated: September 2022 --- @@ -66,4 +66,6 @@ Maintaining a polyglot code base with multiple languages is likely to be more ch # Change History +2022-09-30: Changed status to "Accepted". + 2022-07-28: Proposed initial version. From 9056204317ee2412a443917c0c3a90e103cdc919 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 30 Sep 2022 11:15:26 +0200 Subject: [PATCH 090/108] [ci] Execute danger and dogfood only for pull requests in our own repository --- .ci/build.sh | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/.ci/build.sh b/.ci/build.sh index 6c6b657654..499cafa39e 100755 --- a/.ci/build.sh +++ b/.ci/build.sh @@ -41,17 +41,20 @@ function build() { ./mvnw clean install --show-version --errors --batch-mode --no-transfer-progress "${PMD_MAVEN_EXTRA_OPTS[@]}" pmd_ci_log_group_end - # Danger is executed only on the linux runner - if [ "$(pmd_ci_utils_get_os)" = "linux" ]; then - pmd_ci_log_group_start "Executing danger" - regression_tester_setup_ci - regression_tester_executeDanger - pmd_ci_log_group_end + # Execute danger and dogfood only for pull requests in our own repository + if [[ "${PMD_CI_IS_FORK}" = "false" && -n "${PMD_CI_PULL_REQUEST_NUMBER}" ]]; then + # Danger is executed only on the linux runner + if [ "$(pmd_ci_utils_get_os)" = "linux" ]; then + pmd_ci_log_group_start "Executing danger" + regression_tester_setup_ci + regression_tester_executeDanger + pmd_ci_log_group_end - # also run dogfood for PRs (only on linux) - pmd_ci_log_group_start "Executing PMD dogfood test with ${PMD_CI_MAVEN_PROJECT_VERSION}" - pmd_ci_dogfood - pmd_ci_log_group_end + # also run dogfood for PRs (only on linux) + pmd_ci_log_group_start "Executing PMD dogfood test with ${PMD_CI_MAVEN_PROJECT_VERSION}" + pmd_ci_dogfood + pmd_ci_log_group_end + fi fi exit 0 From 1d6aeb0a951d0abffee750622fc8e4e58082d851 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 30 Sep 2022 11:20:23 +0200 Subject: [PATCH 091/108] Add @LynnBroe as a contributor --- .all-contributorsrc | 9 ++ docs/pages/pmd/projectdocs/credits.md | 123 +++++++++++++------------- 2 files changed, 71 insertions(+), 61 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 93ab44ab69..654d061385 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -6853,6 +6853,15 @@ "contributions": [ "code" ] + }, + { + "login": "LynnBroe", + "name": "Lynn", + "avatar_url": "https://avatars.githubusercontent.com/u/109954313?v=4", + "profile": "https://github.com/LynnBroe", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/docs/pages/pmd/projectdocs/credits.md b/docs/pages/pmd/projectdocs/credits.md index 3f57f4b9f6..8ee820d405 100644 --- a/docs/pages/pmd/projectdocs/credits.md +++ b/docs/pages/pmd/projectdocs/credits.md @@ -422,552 +422,553 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
Luis Alcantar
💻
Lukasz Slonina
🐛
Lukebray
🐛 +
Lynn
💻
Lyor Goldstein
🐛
MCMicS
🐛
Macarse
🐛 -
Machine account for PMD
💻 +
Machine account for PMD
💻
Maciek Siemczyk
🐛
Maikel Steneker
💻 🐛
Maksim Moiseikin
🐛
Manfred Koch
🐛
Manuel Moya Ferrer
💻 🐛
Manuel Ryan
🐛 -
Marat Vyshegorodtsev
🐛 +
Marat Vyshegorodtsev
🐛
Marcel Härle
🐛
Marcello Fialho
🐛
Marcin Rataj
🐛
Mark Adamcin
🐛
Mark Hall
💻 🐛
Mark Kolich
🐛 -
Mark Pritchard
🐛 +
Mark Pritchard
🐛
Markus Rathgeb
🐛
Marquis Wang
🐛
Martin Feldsztejn
🐛
Martin Lehmann
🐛
Martin Spamer
🐛
Martin Tarjányi
🐛 -
MatFl
🐛 +
MatFl
🐛
Mateusz Stefanski
🐛
Mathieu Gouin
🐛
MatiasComercio
💻 🐛
Matt Benson
🐛
Matt De Poorter
🐛
Matt Hargett
💻 💵 -
Matt Harrah
🐛 +
Matt Harrah
🐛
Matt Nelson
🐛
Matthew Amos
🐛
Matthew Duggan
🐛
Matthew Hall
🐛
Matías Fraga
💻 🐛
Maxime Robert
💻 🐛 -
MetaBF
🐛 +
MetaBF
🐛
Michael
🐛
Michael Bell
🐛
Michael Bernstein
🐛
Michael Clay
🐛
Michael Dombrowski
🐛
Michael Hausegger
🐛 -
Michael Hoefer
🐛 +
Michael Hoefer
🐛
Michael Möbius
🐛
Michael N. Lipp
🐛
Michael Pellegrini
🐛
Michal Kordas
🐛
Michał Borek
🐛
Michał Kuliński
🐛 -
Miguel Núñez Díaz-Montes
🐛 +
Miguel Núñez Díaz-Montes
🐛
Mihai Ionut
🐛
Mirek Hankus
🐛
Mladjan Gadzic
🐛
MrAngry52
🐛
Muminur Choudhury
🐛
Mykhailo Palahuta
💻 🐛 -
Nagendra Kumar Singh
🐛 +
Nagendra Kumar Singh
🐛
Nahuel Barrios
🐛
Nathan Braun
🐛
Nathan Reynolds
🐛
Nathan Reynolds
🐛
Nathanaël
🐛
Naveen
💻 -
Nazdravi
🐛 +
Nazdravi
🐛
Neha-Dhonde
🐛
Nicholas Doyle
🐛
Nick Butcher
🐛
Nico Gallinal
🐛
Nicola Dal Maso
🐛
Nicolas Filotto
💻 -
Nicolas Vuillamy
📖 +
Nicolas Vuillamy
📖
Nikita Chursin
🐛
Niklas Baudy
🐛
Nikolas Havrikov
🐛
Nilesh Virkar
🐛
Nimit Patel
🐛
Niranjan Harpale
🐛 -
Noah Sussman
🐛 +
Noah Sussman
🐛
Noah0120
🐛
Noam Tamim
🐛
Noel Grandin
🐛
Olaf Haalstra
🐛
Oleg Andreych
💻
Oleg Pavlenko
🐛 -
Oleksii Dykov
💻 +
Oleksii Dykov
💻
Oliver Eikemeier
🐛
Oliver Siegmar
💵
Olivier Parent
💻 🐛
Ollie Abbey
💻 🐛
OverDrone
🐛
Ozan Gulle
💻 🐛 -
PUNEET JAIN
🐛 +
PUNEET JAIN
🐛
Parbati Bose
🐛
Paul Berg
🐛
Pavel Bludov
🐛
Pavel Mička
🐛
Pedro Nuno Santos
🐛
Pedro Rijo
🐛 -
Pelisse Romain
💻 📖 🐛 +
Pelisse Romain
💻 📖 🐛
Per Abich
💻
Pete Davids
🐛
Peter Bruin
🐛
Peter Chittum
💻 🐛
Peter Cudmore
🐛
Peter Kasson
🐛 -
Peter Kofler
🐛 +
Peter Kofler
🐛
Peter Paul Bakker
💻
Pham Hai Trung
🐛
Philip Graf
💻 🐛
Philip Hachey
🐛
Philippe Ozil
🐛
Phinehas Artemix
🐛 -
Phokham Nonava
🐛 +
Phokham Nonava
🐛
Piotr Szymański
🐛
Piotrek Żygieło
💻 🐛 📖
Pranay Jaiswal
🐛
Prasad Kamath
🐛
Prasanna
🐛
Presh-AR
🐛 -
Puneet1726
🐛 +
Puneet1726
🐛
Rafael Cortês
🐛
RaheemShaik999
🐛
RajeshR
💻 🐛
Ramachandra Mohan
🐛
Ramel0921
🐛
Raquel Pau
🐛 -
Ravikiran Janardhana
🐛 +
Ravikiran Janardhana
🐛
Reda Benhemmouche
🐛
Renato Oliveira
💻 🐛
Rich DiCroce
🐛
Riot R1cket
🐛
Rishabh Jain
🐛
RishabhDeep Singh
🐛 -
Robbie Martinus
💻 🐛 +
Robbie Martinus
💻 🐛
Robert Henry
🐛
Robert Painsi
🐛
Robert Russell
🐛
Robert Sösemann
💻 📖 📢 🐛
Robert Whitebit
🐛
Robin Richtsfeld
🐛 -
Robin Stocker
💻 🐛 +
Robin Stocker
💻 🐛
Robin Wils
🐛
RochusOest
🐛
Rodolfo Noviski
🐛
Rodrigo Casara
🐛
Rodrigo Fernandes
🐛
Roman Salvador
💻 🐛 -
Ronald Blaschke
🐛 +
Ronald Blaschke
🐛
Róbert Papp
🐛
Saikat Sengupta
🐛
Saksham Handu
🐛
Saladoc
🐛
Salesforce Bob Lightning
🐛
Sam Carlberg
🐛 -
Satoshi Kubo
🐛 +
Satoshi Kubo
🐛
Scott Kennedy
🐛
Scott Wells
🐛 💻
Scrsloota
💻
Sebastian Bögl
🐛
Sebastian Schuberth
🐛
Sebastian Schwarz
🐛 -
Sergey Gorbaty
🐛 +
Sergey Gorbaty
🐛
Sergey Kozlov
🐛
Sergey Yanzin
💻 🐛
Seth Wilcox
💻
Shubham
💻 🐛
Simon Abykov
💻
Simon Xiao
🐛 -
Srinivasan Venkatachalam
🐛 +
Srinivasan Venkatachalam
🐛
Stanislav Gromov
🐛
Stanislav Myachenkov
💻
Stefan Birkner
🐛
Stefan Bohn
🐛
Stefan Endrullis
🐛
Stefan Klöss-Schuster
🐛 -
Stefan Wolf
🐛 +
Stefan Wolf
🐛
Stephan H. Wissel
🐛
Stephen
🐛
Stephen Friedrich
🐛
Steve Babula
💻
Stexxe
🐛
Stian Lågstad
🐛 -
StuartClayton5
🐛 +
StuartClayton5
🐛
Supun Arunoda
🐛
Suren Abrahamyan
🐛
Suvashri
📖
SwatiBGupta1110
🐛
SyedThoufich
🐛
Szymon Sasin
🐛 -
T-chuangxin
🐛 +
T-chuangxin
🐛
TERAI Atsuhiro
🐛
TIOBE Software
💻 🐛
Taylor Smock
🐛
Techeira Damián
💻 🐛
Ted Husted
🐛
TehBakker
🐛 -
The Gitter Badger
🐛 +
The Gitter Badger
🐛
Theodoor
🐛
Thiago Henrique Hüpner
🐛
Thibault Meyer
🐛
Thomas Güttler
🐛
Thomas Jones-Low
🐛
Thomas Smith
💻 🐛 -
ThrawnCA
🐛 +
ThrawnCA
🐛
Thunderforge
💻 🐛
Tim van der Lippe
🐛
Tobias Weimer
💻 🐛
Tom Daly
🐛
Tomer Figenblat
🐛
Tomi De Lucca
💻 🐛 -
Torsten Kleiber
🐛 +
Torsten Kleiber
🐛
TrackerSB
🐛
Ullrich Hafner
🐛
Utku Cuhadaroglu
💻 🐛
Valentin Brandl
🐛
Valeria
🐛
Vasily Anisimov
🐛 -
Vibhor Goyal
🐛 +
Vibhor Goyal
🐛
Vickenty Fesunov
🐛
Victor Noël
🐛
Vincent Galloy
💻
Vincent HUYNH
🐛
Vincent Maurin
🐛
Vincent Privat
🐛 -
Vishhwas
🐛 +
Vishhwas
🐛
Vitaly
🐛
Vitaly Polonetsky
🐛
Vojtech Polivka
🐛
Vsevolod Zholobov
🐛
Vyom Yadav
💻
Wang Shidong
🐛 -
Waqas Ahmed
🐛 +
Waqas Ahmed
🐛
Wayne J. Earl
🐛
Wchenghui
🐛
Will Winder
🐛
William Brockhus
💻 🐛
Wilson Kurniawan
🐛
Wim Deblauwe
🐛 -
Woongsik Choi
🐛 +
Woongsik Choi
🐛
XenoAmess
💻 🐛
Yang
💻
YaroslavTER
🐛
Young Chan
💻 🐛
YuJin Kim
🐛
Yuri Dolzhenko
🐛 -
Yurii Dubinka
🐛 +
Yurii Dubinka
🐛
Zoltan Farkas
🐛
Zustin
🐛
aaronhurst-google
🐛 💻
alexmodis
🐛
andreoss
🐛
andrey81inmd
💻 🐛 -
anicoara
🐛 +
anicoara
🐛
arunprasathav
🐛
asiercamara
🐛
astillich-igniti
💻
avesolovksyy
🐛
avishvat
🐛
avivmu
🐛 -
axelbarfod1
🐛 +
axelbarfod1
🐛
b-3-n
🐛
balbhadra9
🐛
base23de
🐛
bergander
🐛
berkam
💻 🐛
breizh31
🐛 -
caesarkim
🐛 +
caesarkim
🐛
carolyujing
🐛
cesares-basilico
🐛
chrite
🐛
cobratbq
🐛
coladict
🐛
cosmoJFH
🐛 -
cristalp
🐛 +
cristalp
🐛
crunsk
🐛
cwholmes
🐛
cyberjj999
🐛
cyw3
🐛
d1ss0nanz
🐛
dalizi007
💻 -
danbrycefairsailcom
🐛 +
danbrycefairsailcom
🐛
dariansanity
🐛
darrenmiliband
🐛
davidburstrom
🐛
dbirkman-paloalto
🐛
deepak-patra
🐛
dependabot[bot]
💻 🐛 -
dinesh150
🐛 +
dinesh150
🐛
diziaq
🐛
dreaminpast123
🐛
duanyanan
🐛
dutt-sanjay
🐛
dylanleung
🐛
dzeigler
🐛 -
ekkirala
🐛 +
ekkirala
🐛
emersonmoura
🐛
fairy
🐛
filiprafalowicz
💻
foxmason
🐛
frankegabor
🐛
frankl
🐛 -
freafrea
🐛 +
freafrea
🐛
fsapatin
🐛
gracia19
🐛
guo fei
🐛
gurmsc5
🐛
gwilymatgearset
💻 🐛
haigsn
🐛 -
hemanshu070
🐛 +
hemanshu070
🐛
henrik242
🐛
hongpuwu
🐛
hvbtup
💻 🐛
igniti GmbH
🐛
ilovezfs
🐛
itaigilo
🐛 -
jakivey32
🐛 +
jakivey32
🐛
jbennett2091
🐛
jcamerin
🐛
jkeener1
🐛
jmetertea
🐛
johnra2
💻
josemanuelrolon
💻 🐛 -
kabroxiko
💻 🐛 +
kabroxiko
💻 🐛
karwer
🐛
kaulonline
🐛
kdaemonv
🐛
kenji21
💻 🐛
kfranic
🐛
khalidkh
🐛 -
krzyk
🐛 +
krzyk
🐛
lasselindqvist
🐛
lgemeinhardt
🐛
lihuaib
🐛
lonelyma1021
🐛
lpeddy
🐛
lujiefsi
💻 -
lukelukes
💻 +
lukelukes
💻
lyriccoder
🐛
marcelmore
🐛
matchbox
🐛
matthiaskraaz
🐛
meandonlyme
🐛
mikesive
🐛 -
milossesic
🐛 +
milossesic
🐛
mohan-chinnappan-n
💻
mriddell95
🐛
mrlzh
🐛
msloan
🐛
mucharlaravalika
🐛
mvenneman
🐛 -
nareshl119
🐛 +
nareshl119
🐛
nicolas-harraudeau-sonarsource
🐛
noerremark
🐛
novsirion
🐛
oggboy
🐛
oinume
🐛
orimarko
💻 🐛 -
pacvz
💻 +
pacvz
💻
pallavi agarwal
🐛
parksungrin
🐛
patpatpat123
🐛
patriksevallius
🐛
pbrajesh1
🐛
phoenix384
🐛 -
piotrszymanski-sc
💻 +
piotrszymanski-sc
💻
plan3d
🐛
poojasix
🐛
prabhushrikant
🐛
pujitha8783
🐛
r-r-a-j
🐛
raghujayjunk
🐛 -
rajeshveera
🐛 +
rajeshveera
🐛
rajeswarreddy88
🐛
recdevs
🐛
reudismam
💻 🐛
rijkt
🐛
rillig-tk
🐛
rmohan20
💻 🐛 -
rxmicro
🐛 +
rxmicro
🐛
ryan-gustafson
💻 🐛
sabi0
🐛
scais
🐛
sebbASF
🐛
sergeygorbaty
💻
shilko2013
🐛 -
shiomiyan
📖 +
shiomiyan
📖
simeonKondr
🐛
snajberk
🐛
sniperrifle2004
🐛
snuyanzin
🐛 💻
sratz
🐛
stonio
🐛 -
sturton
💻 🐛 +
sturton
💻 🐛
sudharmohan
🐛
suruchidawar
🐛
svenfinitiv
🐛
tashiscool
🐛
test-git-hook
🐛
testation21
💻 🐛 -
thanosa
🐛 +
thanosa
🐛
tiandiyixian
🐛
tobwoerk
🐛
tprouvot
🐛 💻
trentchilders
🐛
triandicAnt
🐛
trishul14
🐛 -
tsui
🐛 +
tsui
🐛
winhkey
🐛
witherspore
🐛
wjljack
🐛
wuchiuwong
🐛
xingsong
🐛
xioayuge
🐛 -
xnYi9wRezm
💻 🐛 +
xnYi9wRezm
💻 🐛
xuanuy
🐛
xyf0921
🐛
yalechen-cyw3
🐛
yasuharu-sato
🐛
zenglian
🐛
zgrzyt93
💻 🐛 -
zh3ng
🐛 +
zh3ng
🐛
zt_soft
🐛
ztt79
🐛
zzzzfeng
🐛 From 2105bde614e67698a58d2fbcc13015f1c385d60e Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 30 Sep 2022 11:20:51 +0200 Subject: [PATCH 092/108] [doc] Update release notes (#4100, #4033, #4037) --- docs/pages/release_notes.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md index 2abc79f726..76b5e75abc 100644 --- a/docs/pages/release_notes.md +++ b/docs/pages/release_notes.md @@ -39,6 +39,9 @@ from Lua. This means, that the Lua language in PMD can now parse both Lua and Lu * doc * [#4109](https://github.com/pmd/pmd/pull/4109): \[doc] Add page for 3rd party rulesets * [#4124](https://github.com/pmd/pmd/pull/4124): \[doc] Fix typos in Java rule docs +* java-bestpractices + * [#4033](https://github.com/pmd/pmd/issues/4033): \[java] UnusedPrivateField - false positive with Lombok @ToString.Include + * [#4037](https://github.com/pmd/pmd/issues/4037): \[java] UnusedPrivateField - false positive with Spring @SpyBean * java-codestyle * [#3859](https://github.com/pmd/pmd/issues/3859): \[java] CommentDefaultAccessModifier is triggered in JUnit5 test class * [#4085](https://github.com/pmd/pmd/issues/4085): \[java] UnnecessaryFullyQualifiedName false positive when nested and non-nested classes with the same name and in the same package are used together @@ -59,6 +62,7 @@ Many thanks to our sponsors: ### External Contributions * [#4066](https://github.com/pmd/pmd/pull/4066): \[lua] Add support for Luau syntax and skipping literal sequences in CPD - [Matt Hargett](https://github.com/matthargett) (@matthargett) +* [#4100](https://github.com/pmd/pmd/pull/4100): \[java] Update UnusedPrivateFieldRule - ignore any annotations - [Lynn](https://github.com/LynnBroe) (@LynnBroe) * [#4116](https://github.com/pmd/pmd/pull/4116): \[core] Fix missing --file arg in TreeExport CLI example - [mohan-chinnappan-n](https://github.com/mohan-chinnappan-n) (@mohan-chinnappan-n) * [#4124](https://github.com/pmd/pmd/pull/4124): \[doc] Fix typos in Java rule docs - [Piotrek Żygieło](https://github.com/pzygielo) (@pzygielo) * [#4128](https://github.com/pmd/pmd/pull/4128): \[java] Fix False-positive UnnecessaryFullyQualifiedName when nested and non-nest… #4103 - [Oleg Andreych](https://github.com/OlegAndreych) (@OlegAndreych) From c75a4795d33dfb811bde1e8ba333eaf1f9de6c9a Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 30 Sep 2022 11:25:01 +0200 Subject: [PATCH 093/108] Add @sashashura as a contributor --- .all-contributorsrc | 9 ++ docs/pages/pmd/projectdocs/credits.md | 209 +++++++++++++------------- 2 files changed, 114 insertions(+), 104 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 3120c1af00..2d0f3c7153 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -6816,6 +6816,15 @@ "contributions": [ "code" ] + }, + { + "login": "sashashura", + "name": "Alex", + "avatar_url": "https://avatars.githubusercontent.com/u/93376818?v=4", + "profile": "https://github.com/sashashura", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/docs/pages/pmd/projectdocs/credits.md b/docs/pages/pmd/projectdocs/credits.md index 53a6336d25..d816964636 100644 --- a/docs/pages/pmd/projectdocs/credits.md +++ b/docs/pages/pmd/projectdocs/credits.md @@ -35,939 +35,940 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
Alan Buttars
🐛
Alan Hohn
🐛
Alberto Fernández
💻 🐛 +
Alex
💻
Alex Rentz
🐛
Alex Saveau
🐛
Alex Shesterov
💻 🐛 -
Alexey Markevich
🐛 +
Alexey Markevich
🐛
Alexey Naumov
🐛
Alexey Yudichev
🐛
Alix
🐛
Alix
🐛
Amish Shah
🐛
Amit Prasad
🐛 -
Amitosh Swain Mahapatra
🐛 +
Amitosh Swain Mahapatra
🐛
Anand Subramanian
💻 🐛
Anatoly Trosinenko
💻 🐛
Andi Pabst
💻 🐛
Andrea
🐛
Andrea Aime
🐛
Andreas Dangel
💻 📖 🐛 🚧 -
Andreas Markussen
🐛 +
Andreas Markussen
🐛
Andreas Schmid
🐛
Andreas Turban
🐛
Andrei Paikin
🐛
Andrew
🐛
Andrew Green
🐛
Andrey Fomin
🐛 -
Andrey Hitrin
🐛 +
Andrey Hitrin
🐛
Andrey Mochalov
💻 🐛
Andro72
🐛
Andrwyw
🐛
Andrés Catalán
🐛
Andy Pattenden
🐛
Andy Ray
🐛 -
Andy Robinson
🐛 +
Andy Robinson
🐛
Andy-2639
🐛
Ankush Somani
🐛
Anmol Kumar
🐛
Anthony Whitford
🐛
AnthonyKot
🐛
Aravind Hegde
🐛 -
Arda Aslan
🐛 +
Arda Aslan
🐛
Ari Fogel
🐛
Arnaud Jeansen
💻 🐛
Arpit Koolwal
🐛
Artem
💻 🐛
Artem
🐛
Artem Sheremet
🐛 -
Artur
🐛 +
Artur
🐛
Artur Bosch
🐛
Artur Dryomov
🐛
Artur Ossowski
🐛
AshTheMash
🐛
Ashish Rana
🐛
Atul Kaushal
🐛 -
August Boland
🐛 +
August Boland
🐛
Aurel Hudec
🐛
Austin Shalit
🐛
Austin Tice
🐛
Ayoub Kaanich
🐛
BBG
💻 📖 🐛
Bailey Tjiong
💻 -
Barthélemy L.
🐛 +
Barthélemy L.
🐛
Basavaraj K N
🐛
Basil Peace
🐛
Belle
🐛
Ben Lerner
🐛
Ben Manes
🐛
Ben McCann
🐛 -
Bendegúz Nagy
🐛 +
Bendegúz Nagy
🐛
Bennet S Yee
🐛
Benoit Lacelle
🐛
Bernardo Macêdo
🐛
Bernd Farka
🐛
Betina Cynthia Mamani
🐛
Bhanu Prakash Pamidi
💻 🐛 -
Bhargav Thanki
🐛 +
Bhargav Thanki
🐛
Binu R J
🐛
Björn Kautler
💻 🐛
Blightbuster
🐛
Bo Zhang
🐛
Bob "Wombat" Hogg
🐛
Bobby Wertman
🐛 -
Bolarinwa Saheed Olayemi
💻 🐛 +
Bolarinwa Saheed Olayemi
💻 🐛
Boris Petrov
🐛
Brad Kent
🐛
Brandon Mikeska
🐛
Brian Batronis
🐛
Brian Johnson
🐛
Brice Dutheil
💻 🐛 -
Bruno Ferreira
🐛 +
Bruno Ferreira
🐛
Bruno Ritz
🐛
Cameron Donaldson
🐛
Carlos Macasaet
🐛
Carsten Otto
🐛
Charlie Housh
🐛
Charlie Jonas
🐛 -
Chas Honton
🐛 +
Chas Honton
🐛
Chen Yang
🐛
Chotu
🐛
Chris Smith
🐛
Christian Hujer
🐛
Christian Pontesegger
🐛
ChristianWulf
🐛 -
Christofer Dutz
💻 +
Christofer Dutz
💻
Christoffer Anselm
🐛
Christophe Vidal
🐛
Christopher Dancy
🐛
Clemens Prill
🐛
Clint Chester
💻 🐛
Clément Fournier
💻 📖 🐛 🚧 -
Codacy Badger
🐛 +
Codacy Badger
🐛
Code-Nil
🐛
ColColonCleaner
🐛
Colin Ingarfield
🐛
Craig Andrews
🐛
Craig Muchinsky
🐛
Cyril
💻 🐛 -
Dale
💻 +
Dale
💻
Damien Jiang
🐛
Dan Berindei
🐛
Dan Rollo
🐛
Dan Ziemba
🐛
Daniel Gredler
💻
Daniel Jipa
🐛 -
Daniel Paul Searles
💻 +
Daniel Paul Searles
💻
Daniel Reigada
🐛
Danilo Pianini
🐛
Darko
🐛
David
🐛
David Atkinson
🐛
David Burström
💻 🐛 -
David Goaté
🐛 +
David Goaté
🐛
David Golpira
🐛
David Kovařík
🐛
David M. Karr (fullname at gmail.com)
🐛
David Renz
💻 🐛
David Renz
🐛
Deleted user
🐛 -
Dell Green
🐛 +
Dell Green
🐛
Dem Pilafian
🐛
Den
🐛
Denis Borovikov
💻 🐛
Dennie Reniers
💻 🐛
Dennis Kieselhorst
🐛
Derek P. Moore
🐛 -
Dichotomia
🐛 +
Dichotomia
🐛
Dionisio Cortés Fernández
💻 🐛
Dmitri Bourlatchkov
🐛
Dmitriy Kuzmin
🐛
Dmytro Dashenkov
🐛
Drew Hall
🐛
Dumitru Postoronca
🐛 -
Dylan Adams
🐛 +
Dylan Adams
🐛
Eden Hao
🐛
Edward Klimoshenko
🐛 💻
Egor Bredikhin
🐛
Elan P. Kugelmass
🐛
Elder S.
🐛
Emile
🐛 -
Eric
🐛 +
Eric
🐛
Eric Kintzer
🐛
Eric Perret
🐛
Eric Squires
🐛
Erich L Foster
🐛
Erik Bleske
🐛
Ernst Reissner
🐛 -
F.W. Dekker
🐛 +
F.W. Dekker
🐛
FSchliephacke
🐛
Facundo
🐛
Federico Giust
🐛
Fedor Sherstobitov
🐛
Felix Lampe
🐛
Filip Golonka
🐛 -
Filipe Esperandio
💻 🐛 +
Filipe Esperandio
💻 🐛
Filippo Nova
🐛
Francesco la Torre
🐛
Francisco Duarte
🐛
Frieder Bluemle
🐛
Frits Jalvingh
💻 🐛
G. Bazior
🐛 -
Gabe Henkes
🐛 +
Gabe Henkes
🐛
Genoud Magloire
🐛
Geoffrey555
🐛
Georg Romstorfer
🐛
Gio
🐛
Gol
🐛
Gonzalo Exequiel Ibars Ingman
💻 🐛 -
GooDer
🐛 +
GooDer
🐛
Gregor Riegler
🐛
Grzegorz Olszewski
🐛
Gunther Schrijvers
💻 🐛
Gustavo Krieger
🐛
Guy Elsmore-Paddock
🐛
Görkem Mülayim
🐛 -
Hanzel Godinez
🐛 +
Hanzel Godinez
🐛
Haoliang Chen
🐛
Harsh Kukreja
🐛
Heber
🐛
Henning Schmiedehausen
💻 🐛
Henning von Bargen
💻
Hervé Boutemy
🐛 -
Himanshu Pandey
🐛 +
Himanshu Pandey
🐛
Hokwang Lee
🐛
Hooperbloob
💻
Hung PHAN
🐛
IDoCodingStuffs
💻 🐛
Iccen Gan
🐛
Ignacio Mariano Tirabasso
🐛 -
Igor Melnichenko
🐛 +
Igor Melnichenko
🐛
Igor Moreno
🐛
Intelesis-MS
🐛
Iroha_
🐛
Ishan Srivastava
🐛
Ivano Guerini
🐛
Ivar Andreas Bonsaksen
🐛 -
Ivo Šmíd
🐛 +
Ivo Šmíd
🐛
JJengility
🐛
Jake Hemmerle
🐛
James Harrison
🐛 💻
Jan
🐛
Jan Aertgeerts
💻 🐛
Jan Brümmer
🐛 -
Jan Tříska
🐛 +
Jan Tříska
🐛
Jan-Lukas Else
🐛
Jason Qiu
💻 📖
Jason Williams
🐛
Jean-Paul Mayer
🐛
Jean-Simon Larochelle
🐛
Jeff Bartolotta
💻 🐛 -
Jeff Hube
💻 🐛 +
Jeff Hube
💻 🐛
Jeff Jensen
🐛
Jeff May
🐛
Jens Gerdes
🐛
Jeroen Borgers
🐛 💻
Jerome Russ
🐛
JerritEic
💻 📖 -
Jiri Pejchal
🐛 +
Jiri Pejchal
🐛
Jithin Sunny
🐛
Jiří Škorpil
🐛
Joao Machado
🐛
Jochen Krauss
🐛
Johan Hammar
🐛
John Karp
🐛 -
John Zhang
🐛 +
John Zhang
🐛
John-Teng
💻 🐛
Jon Moroney
💻 🐛
Jonas Geiregat
🐛
Jonathan Wiesel
💻 🐛
Jordan
🐛
Jordi Llach
🐛 -
Jorge Solórzano
🐛 +
Jorge Solórzano
🐛
JorneVL
🐛
Jose Palafox
🐛
Jose Stovall
🐛
Joseph
💻
Joseph Heenan
🐛
Josh Feingold
💻 🐛 -
Josh Holthaus
🐛 +
Josh Holthaus
🐛
Joshua S Arquilevich
🐛
João Ferreira
💻 🐛
João Pedro Schmitt
🐛
Juan Martín Sotuyo Dodero
💻 📖 🐛 🚧
Juan Pablo Civile
🐛
Julian Voronetsky
🐛 -
Julien
🐛 +
Julien
🐛
Julius
🐛
JustPRV
🐛
Jörn Huxhorn
🐛
KThompso
🐛
Kai Amundsen
🐛
Karel Vervaeke
🐛 -
Karl-Andero Mere
🐛 +
Karl-Andero Mere
🐛
Karl-Philipp Richter
🐛
Karsten Silz
🐛
Kazuma Watanabe
🐛
Kev
🐛
Keve Müller
🐛
Kevin Guerra
💻 -
Kevin Jones
🐛 +
Kevin Jones
🐛
Kevin Wayne
🐛
Kieran Black
🐛
Kirill Zubov
🐛
Kirk Clemens
💻 🐛
Klaus Hartl
🐛
Koen Van Looveren
🐛 -
Kris Scheibe
💻 🐛 +
Kris Scheibe
💻 🐛
Kunal Thanki
🐛
LaLucid
💻
Larry Diamond
💻 🐛
Lars Knickrehm
🐛
Leo Gutierrez
🐛
LiGaOg
💻 -
Lintsi
🐛 +
Lintsi
🐛
Linus Fernandes
🐛
Lixon Lookose
🐛
Logesh
🐛
Lorenzo Gabriele
🐛
Loïc Ledoyen
🐛
Lucas Silva
🐛 -
Lucas Soncini
💻 🐛 +
Lucas Soncini
💻 🐛
Lukasz Slonina
🐛
Lukebray
🐛
Lyor Goldstein
🐛
MCMicS
🐛
Macarse
🐛
Machine account for PMD
💻 -
Maciek Siemczyk
🐛 +
Maciek Siemczyk
🐛
Maikel Steneker
💻 🐛
Maksim Moiseikin
🐛
Manfred Koch
🐛
Manuel Moya Ferrer
💻 🐛
Manuel Ryan
🐛
Marat Vyshegorodtsev
🐛 -
Marcel Härle
🐛 +
Marcel Härle
🐛
Marcello Fialho
🐛
Marcin Rataj
🐛
Mark Adamcin
🐛
Mark Hall
💻 🐛
Mark Kolich
🐛
Mark Pritchard
🐛 -
Markus Rathgeb
🐛 +
Markus Rathgeb
🐛
Marquis Wang
🐛
Martin Feldsztejn
🐛
Martin Lehmann
🐛
Martin Spamer
🐛
Martin Tarjányi
🐛
MatFl
🐛 -
Mateusz Stefanski
🐛 +
Mateusz Stefanski
🐛
Mathieu Gouin
🐛
MatiasComercio
💻 🐛
Matt Benson
🐛
Matt De Poorter
🐛
Matt Hargett
💻 💵
Matt Harrah
🐛 -
Matt Nelson
🐛 +
Matt Nelson
🐛
Matthew Amos
🐛
Matthew Duggan
🐛
Matthew Hall
🐛
Matías Fraga
💻 🐛
Maxime Robert
💻 🐛
MetaBF
🐛 -
Michael
🐛 +
Michael
🐛
Michael Bell
🐛
Michael Bernstein
🐛
Michael Clay
🐛
Michael Dombrowski
🐛
Michael Hausegger
🐛
Michael Hoefer
🐛 -
Michael Möbius
🐛 +
Michael Möbius
🐛
Michael N. Lipp
🐛
Michael Pellegrini
🐛
Michal Kordas
🐛
Michał Borek
🐛
Michał Kuliński
🐛
Miguel Núñez Díaz-Montes
🐛 -
Mihai Ionut
🐛 +
Mihai Ionut
🐛
Mirek Hankus
🐛
Mladjan Gadzic
🐛
MrAngry52
🐛
Muminur Choudhury
🐛
Mykhailo Palahuta
💻 🐛
Nagendra Kumar Singh
🐛 -
Nahuel Barrios
🐛 +
Nahuel Barrios
🐛
Nathan Braun
🐛
Nathan Reynolds
🐛
Nathan Reynolds
🐛
Nathanaël
🐛
Naveen
💻
Nazdravi
🐛 -
Neha-Dhonde
🐛 +
Neha-Dhonde
🐛
Nicholas Doyle
🐛
Nick Butcher
🐛
Nico Gallinal
🐛
Nicola Dal Maso
🐛
Nicolas Filotto
💻
Nicolas Vuillamy
📖 -
Nikita Chursin
🐛 +
Nikita Chursin
🐛
Niklas Baudy
🐛
Nikolas Havrikov
🐛
Nilesh Virkar
🐛
Nimit Patel
🐛
Niranjan Harpale
🐛
Noah Sussman
🐛 -
Noah0120
🐛 +
Noah0120
🐛
Noam Tamim
🐛
Noel Grandin
🐛
Olaf Haalstra
🐛
Oleg Pavlenko
🐛
Oleksii Dykov
💻
Oliver Eikemeier
🐛 -
Olivier Parent
💻 🐛 +
Olivier Parent
💻 🐛
Ollie Abbey
💻 🐛
OverDrone
🐛
Ozan Gulle
💻 🐛
PUNEET JAIN
🐛
Parbati Bose
🐛
Paul Berg
🐛 -
Pavel Bludov
🐛 +
Pavel Bludov
🐛
Pavel Mička
🐛
Pedro Nuno Santos
🐛
Pedro Rijo
🐛
Pelisse Romain
💻 📖 🐛
Per Abich
💻
Pete Davids
🐛 -
Peter Bruin
🐛 +
Peter Bruin
🐛
Peter Chittum
💻 🐛
Peter Cudmore
🐛
Peter Kasson
🐛
Peter Kofler
🐛
Peter Paul Bakker
💻
Pham Hai Trung
🐛 -
Philip Graf
💻 🐛 +
Philip Graf
💻 🐛
Philip Hachey
🐛
Philippe Ozil
🐛
Phinehas Artemix
🐛
Phokham Nonava
🐛
Piotr Szymański
🐛
Piotrek Żygieło
💻 🐛 -
Pranay Jaiswal
🐛 +
Pranay Jaiswal
🐛
Prasad Kamath
🐛
Prasanna
🐛
Presh-AR
🐛
Puneet1726
🐛
Rafael Cortês
🐛
RaheemShaik999
🐛 -
RajeshR
💻 🐛 +
RajeshR
💻 🐛
Ramachandra Mohan
🐛
Ramel0921
🐛
Raquel Pau
🐛
Ravikiran Janardhana
🐛
Reda Benhemmouche
🐛
Renato Oliveira
💻 🐛 -
Rich DiCroce
🐛 +
Rich DiCroce
🐛
Riot R1cket
🐛
Rishabh Jain
🐛
RishabhDeep Singh
🐛
Robbie Martinus
💻 🐛
Robert Henry
🐛
Robert Painsi
🐛 -
Robert Russell
🐛 +
Robert Russell
🐛
Robert Sösemann
💻 📖 📢 🐛
Robert Whitebit
🐛
Robin Richtsfeld
🐛
Robin Stocker
💻 🐛
Robin Wils
🐛
RochusOest
🐛 -
Rodolfo Noviski
🐛 +
Rodolfo Noviski
🐛
Rodrigo Casara
🐛
Rodrigo Fernandes
🐛
Roman Salvador
💻 🐛
Ronald Blaschke
🐛
Róbert Papp
🐛
Saikat Sengupta
🐛 -
Saksham Handu
🐛 +
Saksham Handu
🐛
Saladoc
🐛
Salesforce Bob Lightning
🐛
Sam Carlberg
🐛
Satoshi Kubo
🐛
Scott Kennedy
🐛
Scott Wells
🐛 💻 -
Scrsloota
💻 +
Scrsloota
💻
Sebastian Bögl
🐛
Sebastian Schuberth
🐛
Sebastian Schwarz
🐛
Sergey Gorbaty
🐛
Sergey Kozlov
🐛
Sergey Yanzin
💻 🐛 -
Seth Wilcox
💻 +
Seth Wilcox
💻
Shubham
💻 🐛
Simon Abykov
💻
Simon Xiao
🐛
Srinivasan Venkatachalam
🐛
Stanislav Gromov
🐛
Stanislav Myachenkov
💻 -
Stefan Birkner
🐛 +
Stefan Birkner
🐛
Stefan Bohn
🐛
Stefan Endrullis
🐛
Stefan Klöss-Schuster
🐛
Stefan Wolf
🐛
Stephan H. Wissel
🐛
Stephen
🐛 -
Stephen Friedrich
🐛 +
Stephen Friedrich
🐛
Steve Babula
💻
Stexxe
🐛
Stian Lågstad
🐛
StuartClayton5
🐛
Supun Arunoda
🐛
Suren Abrahamyan
🐛 -
SwatiBGupta1110
🐛 +
SwatiBGupta1110
🐛
SyedThoufich
🐛
Szymon Sasin
🐛
T-chuangxin
🐛
TERAI Atsuhiro
🐛
TIOBE Software
💻 🐛
Taylor Smock
🐛 -
Techeira Damián
💻 🐛 +
Techeira Damián
💻 🐛
Ted Husted
🐛
TehBakker
🐛
The Gitter Badger
🐛
Theodoor
🐛
Thiago Henrique Hüpner
🐛
Thibault Meyer
🐛 -
Thomas Güttler
🐛 +
Thomas Güttler
🐛
Thomas Jones-Low
🐛
Thomas Smith
💻 🐛
ThrawnCA
🐛
Thunderforge
💻 🐛
Tim van der Lippe
🐛
Tobias Weimer
💻 🐛 -
Tom Daly
🐛 +
Tom Daly
🐛
Tomer Figenblat
🐛
Tomi De Lucca
💻 🐛
Torsten Kleiber
🐛
TrackerSB
🐛
Ullrich Hafner
🐛
Utku Cuhadaroglu
💻 🐛 -
Valentin Brandl
🐛 +
Valentin Brandl
🐛
Valeria
🐛
Vasily Anisimov
🐛
Vibhor Goyal
🐛
Vickenty Fesunov
🐛
Victor Noël
🐛
Vincent Galloy
💻 -
Vincent HUYNH
🐛 +
Vincent HUYNH
🐛
Vincent Maurin
🐛
Vincent Privat
🐛
Vishhwas
🐛
Vitaly
🐛
Vitaly Polonetsky
🐛
Vojtech Polivka
🐛 -
Vsevolod Zholobov
🐛 +
Vsevolod Zholobov
🐛
Vyom Yadav
💻
Wang Shidong
🐛
Waqas Ahmed
🐛
Wayne J. Earl
🐛
Wchenghui
🐛
Will Winder
🐛 -
William Brockhus
💻 🐛 +
William Brockhus
💻 🐛
Wilson Kurniawan
🐛
Wim Deblauwe
🐛
Woongsik Choi
🐛
XenoAmess
💻 🐛
Yang
💻
YaroslavTER
🐛 -
Young Chan
💻 🐛 +
Young Chan
💻 🐛
YuJin Kim
🐛
Yuri Dolzhenko
🐛
Yurii Dubinka
🐛
Zoltan Farkas
🐛
Zustin
🐛
aaronhurst-google
🐛 💻 -
alexmodis
🐛 +
alexmodis
🐛
andreoss
🐛
andrey81inmd
💻 🐛
anicoara
🐛
arunprasathav
🐛
asiercamara
🐛
astillich-igniti
💻 -
avesolovksyy
🐛 +
avesolovksyy
🐛
avishvat
🐛
avivmu
🐛
axelbarfod1
🐛
b-3-n
🐛
balbhadra9
🐛
base23de
🐛 -
bergander
🐛 +
bergander
🐛
berkam
💻 🐛
breizh31
🐛
caesarkim
🐛
carolyujing
🐛
cesares-basilico
🐛
chrite
🐛 -
cobratbq
🐛 +
cobratbq
🐛
coladict
🐛
cosmoJFH
🐛
cristalp
🐛
crunsk
🐛
cwholmes
🐛
cyberjj999
🐛 -
cyw3
🐛 +
cyw3
🐛
d1ss0nanz
🐛
dalizi007
💻
danbrycefairsailcom
🐛
dariansanity
🐛
darrenmiliband
🐛
davidburstrom
🐛 -
dbirkman-paloalto
🐛 +
dbirkman-paloalto
🐛
deepak-patra
🐛
dependabot[bot]
💻 🐛
dinesh150
🐛
diziaq
🐛
dreaminpast123
🐛
duanyanan
🐛 -
dutt-sanjay
🐛 +
dutt-sanjay
🐛
dylanleung
🐛
dzeigler
🐛
ekkirala
🐛
emersonmoura
🐛
fairy
🐛
filiprafalowicz
💻 -
foxmason
🐛 +
foxmason
🐛
frankegabor
🐛
frankl
🐛
freafrea
🐛
fsapatin
🐛
gracia19
🐛
guo fei
🐛 -
gurmsc5
🐛 +
gurmsc5
🐛
gwilymatgearset
💻 🐛
haigsn
🐛
hemanshu070
🐛
henrik242
🐛
hongpuwu
🐛
hvbtup
💻 🐛 -
igniti GmbH
🐛 +
igniti GmbH
🐛
ilovezfs
🐛
itaigilo
🐛
jakivey32
🐛
jbennett2091
🐛
jcamerin
🐛
jkeener1
🐛 -
jmetertea
🐛 +
jmetertea
🐛
johnra2
💻
josemanuelrolon
💻 🐛
kabroxiko
💻 🐛
karwer
🐛
kaulonline
🐛
kdaemonv
🐛 -
kenji21
💻 🐛 +
kenji21
💻 🐛
kfranic
🐛
khalidkh
🐛
krzyk
🐛
lasselindqvist
🐛
lgemeinhardt
🐛
lihuaib
🐛 -
lonelyma1021
🐛 +
lonelyma1021
🐛
lpeddy
🐛
lujiefsi
💻
lukelukes
💻
lyriccoder
🐛
marcelmore
🐛
matchbox
🐛 -
matthiaskraaz
🐛 +
matthiaskraaz
🐛
meandonlyme
🐛
mikesive
🐛
milossesic
🐛
mohan-chinnappan-n
💻
mriddell95
🐛
mrlzh
🐛 -
msloan
🐛 +
msloan
🐛
mucharlaravalika
🐛
mvenneman
🐛
nareshl119
🐛
nicolas-harraudeau-sonarsource
🐛
noerremark
🐛
novsirion
🐛 -
oggboy
🐛 +
oggboy
🐛
oinume
🐛
orimarko
💻 🐛
pacvz
💻
pallavi agarwal
🐛
parksungrin
🐛
patpatpat123
🐛 -
patriksevallius
🐛 +
patriksevallius
🐛
pbrajesh1
🐛
phoenix384
🐛
piotrszymanski-sc
💻
plan3d
🐛
poojasix
🐛
prabhushrikant
🐛 -
pujitha8783
🐛 +
pujitha8783
🐛
r-r-a-j
🐛
raghujayjunk
🐛
rajeshveera
🐛
rajeswarreddy88
🐛
recdevs
🐛
reudismam
💻 🐛 -
rijkt
🐛 +
rijkt
🐛
rillig-tk
🐛
rmohan20
💻 🐛
rxmicro
🐛
ryan-gustafson
💻 🐛
sabi0
🐛
scais
🐛 -
sebbASF
🐛 +
sebbASF
🐛
sergeygorbaty
💻
shilko2013
🐛
shiomiyan
📖
simeonKondr
🐛
snajberk
🐛
sniperrifle2004
🐛 -
snuyanzin
🐛 💻 +
snuyanzin
🐛 💻
sratz
🐛
stonio
🐛
sturton
💻 🐛
sudharmohan
🐛
suruchidawar
🐛
svenfinitiv
🐛 -
tashiscool
🐛 +
tashiscool
🐛
test-git-hook
🐛
testation21
💻 🐛
thanosa
🐛
tiandiyixian
🐛
tobwoerk
🐛
tprouvot
🐛 💻 -
trentchilders
🐛 +
trentchilders
🐛
triandicAnt
🐛
trishul14
🐛
tsui
🐛
winhkey
🐛
witherspore
🐛
wjljack
🐛 -
wuchiuwong
🐛 +
wuchiuwong
🐛
xingsong
🐛
xioayuge
🐛
xnYi9wRezm
💻 🐛
xuanuy
🐛
xyf0921
🐛
yalechen-cyw3
🐛 -
yasuharu-sato
🐛 +
yasuharu-sato
🐛
zenglian
🐛
zgrzyt93
💻 🐛
zh3ng
🐛
zt_soft
🐛
ztt79
🐛
zzzzfeng
🐛 -
Árpád Magosányi
🐛 +
Árpád Magosányi
🐛
任贵杰
🐛
茅延安
💻 From 8fa94cf2f59a83e2e585b8da350f826ad5f076df Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 30 Sep 2022 11:25:21 +0200 Subject: [PATCH 094/108] [doc] Update release notes (#4130) --- docs/pages/release_notes.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md index 84d0bc0712..6d58e865da 100644 --- a/docs/pages/release_notes.md +++ b/docs/pages/release_notes.md @@ -21,6 +21,7 @@ This is a {{ site.pmd.release_type }} release. ### External Contributions * [#4116](https://github.com/pmd/pmd/pull/4116): \[core] Fix missing --file arg in TreeExport CLI example - [@mohan-chinnappan-n](https://github.com/mohan-chinnappan-n) +* [#4130](https://github.com/pmd/pmd/pull/4130): \[ci] GitHub Workflows security hardening - [Alex](https://github.com/sashashura) (@sashashura) {% endtocmaker %} From 9e5efcb09d6433a8b3f4d9b80dc84f7c4f8f5d7d Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 30 Sep 2022 11:30:40 +0200 Subject: [PATCH 095/108] [doc] Update release notes (#4138) --- docs/pages/release_notes.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md index 2da44b2235..d5b7945569 100644 --- a/docs/pages/release_notes.md +++ b/docs/pages/release_notes.md @@ -37,6 +37,8 @@ from Lua. This means, that the Lua language in PMD can now parse both Lua and Lu * [#4085](https://github.com/pmd/pmd/issues/4085): \[java] UnnecessaryFullyQualifiedName false positive when nested and non-nested classes with the same name and in the same package are used together * java-design * [#4090](https://github.com/pmd/pmd/issues/4090): \[java] FinalFieldCouldBeStatic false positive with non-static synchronized block (regression in 6.48, worked with 6.47) +* scala + * [#4138](https://github.com/pmd/pmd/pull/4138): \[scala] Upgrade scala-library to 2.12.7 / 2.13.9 and scalameta to 4.6.0 ### API Changes From 398d05c3d3c4a4e51960116bb733792686bf512a Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 30 Sep 2022 11:33:09 +0200 Subject: [PATCH 096/108] [doc] Update release notes (#4072) --- docs/pages/release_notes.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md index b45e8879f0..cc648801a9 100644 --- a/docs/pages/release_notes.md +++ b/docs/pages/release_notes.md @@ -48,6 +48,8 @@ Being based on a proper Antlr grammar, CPD can: * [#4031](https://github.com/pmd/pmd/issues/4031): \[core] If report is written to stdout, stdout should not be closed * [#4051](https://github.com/pmd/pmd/issues/4051): \[doc] Additional rulesets are not listed in documentation * [#4053](https://github.com/pmd/pmd/pull/4053): \[core] Allow building PMD under Java 18+ +* doc + * [#4072](https://github.com/pmd/pmd/pull/4072): \[doc] Add architecture decision records * java * [#4015](https://github.com/pmd/pmd/issues/4015): \[java] Support JDK 19 * java-bestpractices From ad7ac9be5fb76c45e838b7f83cb838585b7ebb7f Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 30 Sep 2022 12:40:24 +0200 Subject: [PATCH 097/108] [lua] Fix compile errors --- .../net/sourceforge/pmd/cpd/LuaTokenizer.java | 5 +- .../pmd/lang/lua/cpd/testdata/comment.txt | 32 +- .../pmd/lang/lua/cpd/testdata/luauTypes.txt | 540 +++++++++--------- 3 files changed, 290 insertions(+), 287 deletions(-) diff --git a/pmd-lua/src/main/java/net/sourceforge/pmd/cpd/LuaTokenizer.java b/pmd-lua/src/main/java/net/sourceforge/pmd/cpd/LuaTokenizer.java index 5523dddf77..509a7803c6 100644 --- a/pmd-lua/src/main/java/net/sourceforge/pmd/cpd/LuaTokenizer.java +++ b/pmd-lua/src/main/java/net/sourceforge/pmd/cpd/LuaTokenizer.java @@ -10,8 +10,10 @@ import org.antlr.v4.runtime.CharStream; import org.antlr.v4.runtime.Lexer; import net.sourceforge.pmd.cpd.internal.AntlrTokenizer; -import net.sourceforge.pmd.lang.lua.ast.LuaLexer; import net.sourceforge.pmd.cpd.token.AntlrTokenFilter; +import net.sourceforge.pmd.lang.ast.impl.antlr4.AntlrToken; +import net.sourceforge.pmd.lang.ast.impl.antlr4.AntlrTokenManager; +import net.sourceforge.pmd.lang.lua.ast.LuaLexer; /** * The Lua Tokenizer @@ -37,6 +39,7 @@ public class LuaTokenizer extends AntlrTokenizer { @Override protected Lexer getLexerForSource(CharStream charStream) { return new LuaLexer(charStream); + } @Override protected AntlrTokenFilter getTokenFilter(final AntlrTokenManager tokenManager) { diff --git a/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/comment.txt b/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/comment.txt index f6f1fd25fd..d2bb8e818c 100644 --- a/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/comment.txt +++ b/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/comment.txt @@ -1,23 +1,23 @@ [Image] or [Truncated image[ Bcol Ecol L3 - [print] 1 5 - [(] 6 6 - [1] 7 7 - [)] 18 18 + [print] 1 6 + [(] 6 7 + [1] 7 8 + [)] 18 19 L6 - [print] 1 5 - [(] 6 6 - [1] 7 7 - [)] 8 8 + [print] 1 6 + [(] 6 7 + [1] 7 8 + [)] 8 9 L9 - [print] 1 5 - [(] 6 6 - [1] 7 7 + [print] 1 6 + [(] 6 7 + [1] 7 8 L10 - [)] 17 17 + [)] 17 18 L13 - [print] 1 5 - [(] 6 6 - [1] 7 7 - [)] 8 8 + [print] 1 6 + [(] 6 7 + [1] 7 8 + [)] 8 9 EOF diff --git a/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.txt b/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.txt index f1a3934c53..464fb611d5 100644 --- a/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.txt +++ b/pmd-lua/src/test/resources/net/sourceforge/pmd/lang/lua/cpd/testdata/luauTypes.txt @@ -1,302 +1,302 @@ [Image] or [Truncated image[ Bcol Ecol L2 - [type] 1 4 - [Array] 6 10 - [<] 11 11 - [T] 12 12 - [=] 14 14 - [any] 16 18 - [>] 19 19 - [=] 21 21 - [{] 23 23 - [T] 25 25 - [}] 27 27 + [type] 1 5 + [Array] 6 11 + [<] 11 12 + [T] 12 13 + [=] 14 15 + [any] 16 19 + [>] 19 20 + [=] 21 22 + [{] 23 24 + [T] 25 26 + [}] 27 28 L3 - [local] 1 5 - [x] 7 7 - [=] 9 9 - [31337] 11 15 + [local] 1 6 + [x] 7 8 + [=] 9 10 + [31337] 11 16 L4 - [local] 1 5 - [_negativeLiteral] 7 22 - [=] 24 24 - [-] 26 26 - [3] 27 27 + [local] 1 6 + [_negativeLiteral] 7 23 + [=] 24 25 + [-] 26 27 + [3] 27 28 L5 - [local] 1 5 - [_negativeVariable] 7 23 - [=] 25 25 - [-] 27 27 - [x] 28 28 + [local] 1 6 + [_negativeVariable] 7 24 + [=] 25 26 + [-] 27 28 + [x] 28 29 L6 - [local] 1 5 - [_notLiteral] 7 17 - [=] 19 19 - [not] 21 23 - [true] 25 28 + [local] 1 6 + [_notLiteral] 7 18 + [=] 19 20 + [not] 21 24 + [true] 25 29 L7 - [local] 1 5 - [_notVariable] 7 18 - [=] 20 20 - [not] 22 24 - [x] 26 26 + [local] 1 6 + [_notVariable] 7 19 + [=] 20 21 + [not] 22 25 + [x] 26 27 L8 - [local] 1 5 - [_length] 7 13 - [=] 15 15 - [#] 17 17 - [{] 18 18 - [x] 19 19 - [}] 20 20 + [local] 1 6 + [_length] 7 14 + [=] 15 16 + [#] 17 18 + [{] 18 19 + [x] 19 20 + [}] 20 21 L9 - [export] 1 6 - [type] 8 11 - [Function] 13 20 - [<] 21 21 - [T] 22 22 - [...] 23 25 - [=] 27 27 - [...] 29 31 - [any] 32 34 - [>] 35 35 - [=] 37 37 - [(] 39 39 - [...] 40 42 - [any] 43 45 - [)] 46 46 - [->] 48 49 - [T] 51 51 - [...] 52 54 + [export] 1 7 + [type] 8 12 + [Function] 13 21 + [<] 21 22 + [T] 22 23 + [...] 23 26 + [=] 27 28 + [...] 29 32 + [any] 32 35 + [>] 35 36 + [=] 37 38 + [(] 39 40 + [...] 40 43 + [any] 43 46 + [)] 46 47 + [->] 48 50 + [T] 51 52 + [...] 52 55 L10 - [local] 1 5 - [_PlatformService] 7 22 - [=] 24 24 - [nil] 26 28 + [local] 1 6 + [_PlatformService] 7 23 + [=] 24 25 + [nil] 26 29 L11 - [local] 1 5 - [game] 7 10 - [=] 12 12 - [.] 41 41 - [default] 42 48 - [::] 50 51 - [any] 53 55 + [local] 1 6 + [game] 7 11 + [=] 12 13 + [.] 41 42 + [default] 42 49 + [::] 50 52 + [any] 53 56 L12 - [pcall] 1 5 - [(] 6 6 - [function] 7 14 - [(] 15 15 - [)] 16 16 - [_PlatformService] 18 33 - [=] 35 35 - [game] 37 40 - [:] 41 41 - [GetService] 42 51 - [(] 52 52 - ['PlatformService'] 53 69 - [)] 70 70 - [end] 72 74 - [)] 75 75 + [pcall] 1 6 + [(] 6 7 + [function] 7 15 + [(] 15 16 + [)] 16 17 + [_PlatformService] 18 34 + [=] 35 36 + [game] 37 41 + [:] 41 42 + [GetService] 42 52 + [(] 52 53 + ['PlatformService'] 53 70 + [)] 70 71 + [end] 72 75 + [)] 75 76 L14 - [return] 1 6 - [function] 8 15 - [<] 17 17 - [T] 18 18 - [>] 19 19 - [(] 20 20 - [req] 21 23 - [,] 24 24 - [...] 26 28 - [:] 29 29 - [boolean] 31 37 - [)] 38 38 - [:] 39 39 - [(] 41 41 - [{] 42 42 - [\[] 43 43 - [string] 44 49 - [|] 50 50 - [number] 51 56 - [\]] 57 57 - [:] 58 58 - [T] 60 60 - [}] 61 61 - [,] 62 62 - [string] 64 69 - [,] 70 70 - [Function] 72 79 - [<] 80 80 - [...] 81 83 - [any] 84 86 - [>] 87 87 - [)] 88 88 + [return] 1 7 + [function] 8 16 + [<] 17 18 + [T] 18 19 + [>] 19 20 + [(] 20 21 + [req] 21 24 + [,] 24 25 + [...] 26 29 + [:] 29 30 + [boolean] 31 38 + [)] 38 39 + [:] 39 40 + [(] 41 42 + [{] 42 43 + [\[] 43 44 + [string] 44 50 + [|] 50 51 + [number] 51 57 + [\]] 57 58 + [:] 58 59 + [T] 60 61 + [}] 61 62 + [,] 62 63 + [string] 64 70 + [,] 70 71 + [Function] 72 80 + [<] 80 81 + [...] 81 84 + [any] 84 87 + [>] 87 88 + [)] 88 89 L15 - [local] 3 7 - [body] 9 12 - [=] 14 14 - [string] 16 21 - [.] 22 22 - [format] 23 28 - [(] 29 29 - ["%s %s\\n"] 30 38 - [,] 39 39 - [req] 41 43 - [.] 44 44 - [method] 45 50 - [,] 51 51 - [req] 53 55 - [.] 56 56 - [path] 57 60 - [)] 61 61 + [local] 3 8 + [body] 9 13 + [=] 14 15 + [string] 16 22 + [.] 22 23 + [format] 23 29 + [(] 29 30 + ["%s %s\\n"] 30 39 + [,] 39 40 + [req] 41 44 + [.] 44 45 + [method] 45 51 + [,] 51 52 + [req] 53 56 + [.] 56 57 + [path] 57 61 + [)] 61 62 L16 - [local] 3 7 - [res] 9 11 - [=] 13 13 - [{] 15 15 + [local] 3 8 + [res] 9 12 + [=] 13 14 + [{] 15 16 L17 - [code] 5 8 - [=] 10 10 - [200] 12 14 - [,] 15 15 + [code] 5 9 + [=] 10 11 + [200] 12 15 + [,] 15 16 L18 - [{] 5 5 - ["Content-Type"] 7 20 - [,] 21 21 - ["text/plain"] 23 34 - [}] 36 36 - [,] 37 37 + [{] 5 6 + ["Content-Type"] 7 21 + [,] 21 22 + ["text/plain"] 23 35 + [}] 36 37 + [,] 37 38 L19 - [{] 5 5 + [{] 5 6 L20 - ["Content-Length"] 7 22 - [,] 23 23 + ["Content-Length"] 7 23 + [,] 23 24 L21 - [#] 7 7 - [body] 8 11 - [,] 12 12 + [#] 7 8 + [body] 8 12 + [,] 12 13 L22 - [\[] 7 7 - ["Auth.Confirm"] 8 21 - [\]] 22 22 - [=] 24 24 - [\[\[至：%s。\]\]] 26 34 - [,] 35 35 + [\[] 7 8 + ["Auth.Confirm"] 8 22 + [\]] 22 23 + [=] 24 25 + [\[\[至：%s。\]\]] 26 35 + [,] 35 36 L24 - [}] 5 5 - [::] 7 8 - [Array] 10 14 - [<] 15 15 - [any] 16 18 - [>] 19 19 - [,] 20 20 + [}] 5 6 + [::] 7 9 + [Array] 10 15 + [<] 15 16 + [any] 16 19 + [>] 19 20 + [,] 20 21 L25 - [}] 3 3 - [::] 5 6 - [{] 8 8 - [\[] 10 10 - [any] 11 13 - [\]] 14 14 - [:] 15 15 - [number] 17 22 - [|] 24 24 - [Array] 26 30 - [<] 31 31 - [string] 32 37 - [|] 39 39 - [boolean] 41 47 - [>] 48 48 - [}] 50 50 + [}] 3 4 + [::] 5 7 + [{] 8 9 + [\[] 10 11 + [any] 11 14 + [\]] 14 15 + [:] 15 16 + [number] 17 23 + [|] 24 25 + [Array] 26 31 + [<] 31 32 + [string] 32 38 + [|] 39 40 + [boolean] 41 48 + [>] 48 49 + [}] 50 51 L26 - [if] 3 4 - [(] 6 6 - [req] 7 9 - [::] 11 12 - [any] 14 16 - [)] 17 17 - [.] 18 18 - [keepAlive] 19 27 - [then] 29 32 + [if] 3 5 + [(] 6 7 + [req] 7 10 + [::] 11 13 + [any] 14 17 + [)] 17 18 + [.] 18 19 + [keepAlive] 19 28 + [then] 29 33 L27 - [local] 5 9 - [socketType] 11 20 - [:] 21 21 - ["Connection"] 23 34 - [|] 36 36 - ["Pingback"] 38 47 - [|] 49 49 - [""] 51 52 - [=] 54 54 - [""] 56 57 - [::] 59 60 - [""] 62 63 + [local] 5 10 + [socketType] 11 21 + [:] 21 22 + ["Connection"] 23 35 + [|] 36 37 + ["Pingback"] 38 48 + [|] 49 50 + [""] 51 53 + [=] 54 55 + [""] 56 58 + [::] 59 61 + [""] 62 64 L28 - [socketType] 5 14 - [=] 16 16 - ["Connection"] 18 29 - [::] 31 32 - ["Connection"] 34 45 + [socketType] 5 15 + [=] 16 17 + ["Connection"] 18 30 + [::] 31 33 + ["Connection"] 34 46 L29 - [res] 5 7 - [\[] 8 8 - [#] 9 9 - [res] 10 12 - [+] 14 14 - [1] 16 16 - [\]] 17 17 - [=] 19 19 - [{] 21 21 - [socketType] 23 32 - [::] 34 35 - [string] 37 42 - [,] 43 43 - [`\\`${req.keepAlive}\\``] 45 66 - [}] 68 68 + [res] 5 8 + [\[] 8 9 + [#] 9 10 + [res] 10 13 + [+] 14 15 + [1] 16 17 + [\]] 17 18 + [=] 19 20 + [{] 21 22 + [socketType] 23 33 + [::] 34 36 + [string] 37 43 + [,] 43 44 + [`\\`${req.keepAlive}\\``] 45 67 + [}] 68 69 L30 - [res] 5 7 - [\[] 8 8 - [#] 9 9 - [res] 10 12 - [-] 14 14 - [2] 16 16 - [\]] 17 17 - [=] 19 19 - [{] 21 21 - [...] 23 25 - [}] 27 27 + [res] 5 8 + [\[] 8 9 + [#] 9 10 + [res] 10 13 + [-] 14 15 + [2] 16 17 + [\]] 17 18 + [=] 19 20 + [{] 21 22 + [...] 23 26 + [}] 27 28 L31 - [end] 3 5 + [end] 3 6 L33 - [return] 3 8 - [(] 10 10 - [res] 11 13 - [::] 15 16 - [any] 18 20 - [)] 21 21 - [::] 23 24 - [{] 26 26 - [T] 28 28 - [}] 30 30 - [,] 31 31 - [(] 33 33 - [if] 34 35 - [req] 37 39 - [then] 41 44 - [body] 46 49 - [else] 51 54 - [""] 56 57 - [)] 58 58 - [::] 60 61 - [string] 63 68 - [,] 69 69 - [function] 71 78 - [(] 79 79 - [...] 80 82 - [)] 83 83 - [:] 84 84 - [...] 86 88 - [any] 89 91 - [return] 93 98 - [...] 100 102 - [end] 104 106 + [return] 3 9 + [(] 10 11 + [res] 11 14 + [::] 15 17 + [any] 18 21 + [)] 21 22 + [::] 23 25 + [{] 26 27 + [T] 28 29 + [}] 30 31 + [,] 31 32 + [(] 33 34 + [if] 34 36 + [req] 37 40 + [then] 41 45 + [body] 46 50 + [else] 51 55 + [""] 56 58 + [)] 58 59 + [::] 60 62 + [string] 63 69 + [,] 69 70 + [function] 71 79 + [(] 79 80 + [...] 80 83 + [)] 83 84 + [:] 84 85 + [...] 86 89 + [any] 89 92 + [return] 93 99 + [...] 100 103 + [end] 104 107 L34 - [end] 1 3 + [end] 1 4 EOF From f8e298dc22898c05f56c7c2d7febcf48bcde3fe4 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 30 Sep 2022 12:49:01 +0200 Subject: [PATCH 098/108] [java] UnnecessaryFullyQualifiedName - add test for #4133 Fixes #4133 --- docs/pages/release_notes.md | 1 + .../unnecessaryfullyqualifiedname/ClassA.java | 14 ++++++++++++++ .../unnecessaryfullyqualifiedname/Foo.java | 8 ++++++++ .../xml/UnnecessaryFullyQualifiedName.xml | 12 ++++++++++++ 4 files changed, 35 insertions(+) create mode 100644 pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/unnecessaryfullyqualifiedname/ClassA.java create mode 100644 pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/unnecessaryfullyqualifiedname/Foo.java diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md index 3d856296c2..69f47c9104 100644 --- a/docs/pages/release_notes.md +++ b/docs/pages/release_notes.md @@ -48,6 +48,7 @@ from Lua. This means, that the Lua language in PMD can now parse both Lua and Lu * java-codestyle * [#3859](https://github.com/pmd/pmd/issues/3859): \[java] CommentDefaultAccessModifier is triggered in JUnit5 test class * [#4085](https://github.com/pmd/pmd/issues/4085): \[java] UnnecessaryFullyQualifiedName false positive when nested and non-nested classes with the same name and in the same package are used together + * [#4133](https://github.com/pmd/pmd/issues/4133): \[java] UnnecessaryFullyQualifiedName - FP for inner class pkg.ClassA.Foo implementing pkg.Foo * java-design * [#4090](https://github.com/pmd/pmd/issues/4090): \[java] FinalFieldCouldBeStatic false positive with non-static synchronized block (regression in 6.48, worked with 6.47) * java-errorprone diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/unnecessaryfullyqualifiedname/ClassA.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/unnecessaryfullyqualifiedname/ClassA.java new file mode 100644 index 0000000000..cd5f6b9e40 --- /dev/null +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/unnecessaryfullyqualifiedname/ClassA.java @@ -0,0 +1,14 @@ +/* + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ + +package net.sourceforge.pmd.lang.java.rule.codestyle.unnecessaryfullyqualifiedname; + +/** + * Test case for #4133 + */ +public class ClassA { + public static class Foo implements net.sourceforge.pmd.lang.java.rule.codestyle.unnecessaryfullyqualifiedname.Foo { + + } +} diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/unnecessaryfullyqualifiedname/Foo.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/unnecessaryfullyqualifiedname/Foo.java new file mode 100644 index 0000000000..b3072fac8c --- /dev/null +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/unnecessaryfullyqualifiedname/Foo.java @@ -0,0 +1,8 @@ +/* + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ + +package net.sourceforge.pmd.lang.java.rule.codestyle.unnecessaryfullyqualifiedname; + +public interface Foo { +} diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UnnecessaryFullyQualifiedName.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UnnecessaryFullyQualifiedName.xml index 097e096767..8be00145a9 100644 --- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UnnecessaryFullyQualifiedName.xml +++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UnnecessaryFullyQualifiedName.xml @@ -718,4 +718,16 @@ public class SomeClass { } ]]> + + + [java] UnnecessaryFullyQualifiedName - FP for inner class pkg.ClassA.Foo implementing pkg.Foo #4133 + 0 + + From b7966798fa99aceb4178626e7d21fafe1c5bf3d2 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 30 Sep 2022 13:05:32 +0200 Subject: [PATCH 099/108] [java] Fix tests for ConstructorCallsOverridableMethodRule --- ...ConstructorCallsOverridableMethodRule.java | 59 +++++++++++-------- .../xml/ConstructorCallsOverridableMethod.xml | 8 +-- 2 files changed, 40 insertions(+), 27 deletions(-) diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java index 6858631354..771fc6d5ab 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodRule.java @@ -5,9 +5,13 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import java.lang.reflect.Modifier; +import java.util.Deque; import java.util.HashMap; +import java.util.LinkedList; import java.util.Map; +import java.util.stream.Collectors; +import org.checkerframework.checker.nullness.qual.NonNull; import org.pcollections.PVector; import org.pcollections.TreePVector; @@ -40,13 +44,15 @@ import net.sourceforge.pmd.lang.java.types.OverloadSelectionResult; public final class ConstructorCallsOverridableMethodRule extends AbstractJavaRulechainRule { private static final String MESSAGE = "Overridable method called during object construction: {0} "; - private static final String MESSAGE_TRANSITIVE = "This method may call an overridable method during object construction: {0}"; + private static final String MESSAGE_TRANSITIVE = "This method may call an overridable method during object construction: {0} (call stack: [{1}])"; - // Maps methods to the method that makes them unsafe - // Safe methods are mapped to null - // The value is used for better messages - private final Map safeMethods = new HashMap<>(); + // Maps methods to the method call stack that makes them unsafe + // Safe methods are mapped to an empty stack + // The method call stack (value of the map) is used for better messages + private final Map> safeMethods = new HashMap<>(); + + private static final Deque EMPTY_STACK = new LinkedList<>(); public ConstructorCallsOverridableMethodRule() { super(ASTConstructorDeclaration.class); @@ -64,47 +70,53 @@ public final class ConstructorCallsOverridableMethodRule extends AbstractJavaRul return null; // then cannot be overridden } for (ASTMethodCall call : node.getBody().descendants(ASTMethodCall.class)) { - JMethodSymbol unsafetyReason = getUnsafetyReason(call, TreePVector.empty()); - if (unsafetyReason != null) { + Deque unsafetyReason = getUnsafetyReason(call, TreePVector.empty()); + if (!unsafetyReason.isEmpty()) { JMethodSig overload = call.getOverloadSelectionInfo().getMethodType(); - JMethodSig unsafeMethod = call.getTypeSystem().sigOf(unsafetyReason); + JMethodSig unsafeMethod = call.getTypeSystem().sigOf(unsafetyReason.getLast()); String message = unsafeMethod.equals(overload) ? MESSAGE : MESSAGE_TRANSITIVE; - addViolationWithMessage(data, call, message, new Object[] { PrettyPrintingUtil.prettyPrintOverload(unsafetyReason) }); + String lastMethod = PrettyPrintingUtil.prettyPrintOverload(unsafetyReason.getLast()); + String stack = unsafetyReason.stream().map(PrettyPrintingUtil::prettyPrintOverload).collect(Collectors.joining(", ")); + asCtx(data).addViolationWithMessage(call, message, lastMethod, stack); } } return null; } - private JMethodSymbol getUnsafetyReason(ASTMethodCall call, PVector recursionGuard) { + @NonNull + private Deque getUnsafetyReason(ASTMethodCall call, PVector recursionGuard) { if (!isCallOnThisInstance(call)) { - return null; + return EMPTY_STACK; } OverloadSelectionResult overload = call.getOverloadSelectionInfo(); if (overload.isFailed()) { - return null; + return EMPTY_STACK; } JMethodSymbol method = (JMethodSymbol) overload.getMethodType().getSymbol(); if (isOverridable(method)) { - return method; // the method itself + Deque stack = new LinkedList<>(); + stack.addFirst(method); // the method itself + return stack; } else { return getUnsafetyReason(method, recursionGuard); } } - private JMethodSymbol getUnsafetyReason(JMethodSymbol method, PVector recursionGuard) { + @NonNull + private Deque getUnsafetyReason(JMethodSymbol method, PVector recursionGuard) { if (method.isStatic()) { - return null; // no access to this instance anyway + return EMPTY_STACK; // no access to this instance anyway } // we need to prove that all calls on this instance are safe ASTMethodDeclaration declaration = method.tryGetNode(); if (declaration == null) { - return null; // no idea + return EMPTY_STACK; // no idea } else if (recursionGuard.contains(declaration)) { // being visited, assume body is safe - return null; + return EMPTY_STACK; } // note we can't use computeIfAbsent because of comodification @@ -117,18 +129,19 @@ public final class ConstructorCallsOverridableMethodRule extends AbstractJavaRul for (ASTMethodCall call : NodeStream.of(declaration.getBody()) .descendants(ASTMethodCall.class) .filter(ConstructorCallsOverridableMethodRule::isCallOnThisInstance)) { - JMethodSymbol unsafetyReason = getUnsafetyReason(call, deeperRecursion); - if (unsafetyReason != null) { + Deque unsafetyReason = getUnsafetyReason(call, deeperRecursion); + if (!unsafetyReason.isEmpty()) { // this method call is unsafe for some reason, // body is unsafe for the same reason - safeMethods.put(method, unsafetyReason); - return unsafetyReason; + safeMethods.putIfAbsent(method, new LinkedList<>(unsafetyReason)); + safeMethods.get(method).addFirst(method); + return safeMethods.get(method); } } // body is safe - safeMethods.put(method, null); - return null; + safeMethods.remove(method); + return EMPTY_STACK; } private static boolean isCallOnThisInstance(ASTMethodCall call) { diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml index 394188fb42..feb2c14f31 100644 --- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml +++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ConstructorCallsOverridableMethod.xml @@ -328,7 +328,7 @@ import java.lang.annotation.*; 1 3 - This method may call an overridable method during object construction: Foo.bar(String) + This method may call an overridable method during object construction: Foo.bar(String) (call stack: [Foo.bar(boolean), Foo.bar(String)]) 3 3,4,5 - Overridable method 'overridableMethod' called during object construction (call stack: [intermediatePrivateMethod, otherMethod1, otherMethod2, overridableMethod]) - Overridable method 'overridableMethod' called during object construction (call stack: [shorterChain, overridableMethod]) - Overridable method 'otherOverridableMethod' called during object construction (call stack: [differentChain, otherOverridableMethod]) + This method may call an overridable method during object construction: Foo.overridableMethod() (call stack: [Foo.intermediatePrivateMethod(), Foo.otherMethod1(), Foo.otherMethod2(), Foo.overridableMethod()]) + This method may call an overridable method during object construction: Foo.overridableMethod() (call stack: [Foo.shorterChain(), Foo.overridableMethod()]) + This method may call an overridable method during object construction: Foo.otherOverridableMethod() (call stack: [Foo.differentChain(), Foo.otherOverridableMethod()]) Date: Fri, 30 Sep 2022 14:35:09 +0200 Subject: [PATCH 100/108] [doc] Update contributors * Add @koalalam as a contributor * Update @OlegAndreych as a contributor * Add @garydgregory as a contributor * Add @vanguard-1024 as a contributor * Update @abyss638 as a contributor * Update @dykov as a contributor * Add @ewantempero as a contributor * Update @JerritEic as a contributor * Add @cbfiddle as a contributor * Add @MartGit as a contributor * Update @gredler as a contributor * Add @Alexx-G as a contributor * Update @jborgers as a contributor --- .all-contributorsrc | 81 +++++- docs/pages/pmd/projectdocs/credits.md | 347 +++++++++++++------------- 2 files changed, 253 insertions(+), 175 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 4c1d194449..4c9d8d553e 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -3270,7 +3270,8 @@ "profile": "https://github.com/jborgers", "contributions": [ "bug", - "code" + "code", + "talk" ] }, { @@ -6523,7 +6524,8 @@ "avatar_url": "https://avatars.githubusercontent.com/u/36415196?v=4", "profile": "https://github.com/dykov", "contributions": [ - "code" + "code", + "bug" ] }, { @@ -6541,7 +6543,8 @@ "avatar_url": "https://avatars.githubusercontent.com/u/178883?v=4", "profile": "https://github.com/gredler", "contributions": [ - "code" + "code", + "bug" ] }, { @@ -6560,7 +6563,8 @@ "profile": "https://github.com/JerritEic", "contributions": [ "code", - "doc" + "doc", + "bug" ] }, { @@ -6778,7 +6782,8 @@ "avatar_url": "https://avatars.githubusercontent.com/u/90252673?v=4", "profile": "https://github.com/abyss638", "contributions": [ - "code" + "code", + "bug" ] }, { @@ -6842,7 +6847,8 @@ "avatar_url": "https://avatars.githubusercontent.com/u/2041351?v=4", "profile": "https://github.com/OlegAndreych", "contributions": [ - "code" + "code", + "bug" ] }, { @@ -6871,6 +6877,69 @@ "contributions": [ "code" ] + }, + { + "login": "koalalam", + "name": "koalalam", + "avatar_url": "https://avatars.githubusercontent.com/u/5452429?v=4", + "profile": "https://github.com/koalalam", + "contributions": [ + "bug" + ] + }, + { + "login": "garydgregory", + "name": "Gary Gregory", + "avatar_url": "https://avatars.githubusercontent.com/u/1187639?v=4", + "profile": "https://github.com/garydgregory", + "contributions": [ + "bug" + ] + }, + { + "login": "vanguard-1024", + "name": "Austin", + "avatar_url": "https://avatars.githubusercontent.com/u/87691060?v=4", + "profile": "https://github.com/vanguard-1024", + "contributions": [ + "bug" + ] + }, + { + "login": "ewantempero", + "name": "Ewan Tempero", + "avatar_url": "https://avatars.githubusercontent.com/u/8744237?v=4", + "profile": "http://www.cs.auckland.ac.nz/~ewan", + "contributions": [ + "bug" + ] + }, + { + "login": "cbfiddle", + "name": "cbfiddle", + "avatar_url": "https://avatars.githubusercontent.com/u/6628505?v=4", + "profile": "https://github.com/cbfiddle", + "contributions": [ + "bug" + ] + }, + { + "login": "MartGit", + "name": "MartGit", + "avatar_url": "https://avatars.githubusercontent.com/u/1518723?v=4", + "profile": "https://github.com/MartGit", + "contributions": [ + "bug" + ] + }, + { + "login": "Alexx-G", + "name": "Alex", + "avatar_url": "https://avatars.githubusercontent.com/u/3869268?v=4", + "profile": "https://github.com/Alexx-G", + "contributions": [ + "bug" + ] } ], "contributorsPerLine": 7, diff --git a/docs/pages/pmd/projectdocs/credits.md b/docs/pages/pmd/projectdocs/credits.md index 062fb281eb..4296e0d000 100644 --- a/docs/pages/pmd/projectdocs/credits.md +++ b/docs/pages/pmd/projectdocs/credits.md @@ -36,822 +36,831 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
Alan Hohn
🐛
Alberto Fernández
💻 🐛
Alex
💻 +
Alex
🐛
Alex Rentz
🐛
Alex Saveau
🐛 -
Alex Shesterov
💻 🐛 +
Alex Shesterov
💻 🐛
Alexey Markevich
🐛
Alexey Naumov
🐛
Alexey Yudichev
🐛
Alix
🐛
Alix
🐛
Amish Shah
🐛 -
Amit Prasad
🐛 +
Amit Prasad
🐛
Amitosh Swain Mahapatra
🐛
Anand Subramanian
💻 🐛
Anatoly Trosinenko
💻 🐛
Andi Pabst
💻 🐛
Andrea
🐛
Andrea Aime
🐛 -
Andreas Dangel
💻 📖 🐛 🚧 +
Andreas Dangel
💻 📖 🐛 🚧
Andreas Markussen
🐛
Andreas Schmid
🐛
Andreas Turban
🐛
Andrei Paikin
🐛
Andrew
🐛
Andrew Green
🐛 -
Andrey Fomin
🐛 +
Andrey Fomin
🐛
Andrey Hitrin
🐛
Andrey Mochalov
💻 🐛
Andro72
🐛
Andrwyw
🐛
Andrés Catalán
🐛
Andy Pattenden
🐛 -
Andy Ray
🐛 +
Andy Ray
🐛
Andy Robinson
🐛
Andy-2639
🐛
Ankush Somani
🐛
Anmol Kumar
🐛
Anthony Whitford
🐛
AnthonyKot
🐛 -
Aravind Hegde
🐛 +
Aravind Hegde
🐛
Arda Aslan
🐛
Ari Fogel
🐛
Arnaud Jeansen
💻 🐛
Arpit Koolwal
🐛
Artem
💻 🐛
Artem
🐛 -
Artem Sheremet
🐛 +
Artem Sheremet
🐛
Artur
🐛
Artur Bosch
🐛
Artur Dryomov
🐛
Artur Ossowski
🐛
AshTheMash
🐛
Ashish Rana
🐛 -
Atul Kaushal
🐛 +
Atul Kaushal
🐛
August Boland
🐛
Aurel Hudec
🐛 +
Austin
🐛
Austin Shalit
🐛
Austin Tice
🐛
Ayoub Kaanich
🐛 -
BBG
💻 📖 🐛 -
Bailey Tjiong
💻 +
BBG
💻 📖 🐛 +
Bailey Tjiong
💻
Barthélemy L.
🐛
Basavaraj K N
🐛
Basil Peace
🐛
Belle
🐛
Ben Lerner
🐛 -
Ben Manes
🐛 -
Ben McCann
🐛 +
Ben Manes
🐛 +
Ben McCann
🐛
Bendegúz Nagy
🐛
Bennet S Yee
🐛
Benoit Lacelle
🐛
Bernardo Macêdo
🐛
Bernd Farka
🐛 -
Betina Cynthia Mamani
🐛 -
Bhanu Prakash Pamidi
💻 🐛 +
Betina Cynthia Mamani
🐛 +
Bhanu Prakash Pamidi
💻 🐛
Bhargav Thanki
🐛
Binu R J
🐛
Björn Kautler
💻 🐛
Blightbuster
🐛
Bo Zhang
🐛 -
Bob "Wombat" Hogg
🐛 -
Bobby Wertman
🐛 +
Bob "Wombat" Hogg
🐛 +
Bobby Wertman
🐛
Bolarinwa Saheed Olayemi
💻 🐛
Boris Petrov
🐛
Brad Kent
🐛
Brandon Mikeska
🐛
Brian Batronis
🐛 -
Brian Johnson
🐛 -
Brice Dutheil
💻 🐛 +
Brian Johnson
🐛 +
Brice Dutheil
💻 🐛
Bruno Ferreira
🐛
Bruno Ritz
🐛
Cameron Donaldson
🐛
Carlos Macasaet
🐛
Carsten Otto
🐛 -
Charlie Housh
🐛 -
Charlie Jonas
🐛 +
Charlie Housh
🐛 +
Charlie Jonas
🐛
Chas Honton
🐛
Chen Yang
🐛
Chotu
🐛
Chris Smith
🐛
Christian Hujer
🐛 -
Christian Pontesegger
🐛 -
ChristianWulf
🐛 +
Christian Pontesegger
🐛 +
ChristianWulf
🐛
Christofer Dutz
💻
Christoffer Anselm
🐛
Christophe Vidal
🐛
Christopher Dancy
🐛
Clemens Prill
🐛 -
Clint Chester
💻 🐛 -
Clément Fournier
💻 📖 🐛 🚧 +
Clint Chester
💻 🐛 +
Clément Fournier
💻 📖 🐛 🚧
Codacy Badger
🐛
Code-Nil
🐛
ColColonCleaner
🐛
Colin Ingarfield
🐛
Craig Andrews
🐛 -
Craig Muchinsky
🐛 -
Cyril
💻 🐛 +
Craig Muchinsky
🐛 +
Cyril
💻 🐛
Dale
💻
Damien Jiang
🐛
Dan Berindei
🐛
Dan Rollo
🐛
Dan Ziemba
🐛 -
Daniel Gredler
💻 -
Daniel Jipa
🐛 +
Daniel Gredler
💻 🐛 +
Daniel Jipa
🐛
Daniel Paul Searles
💻
Daniel Reigada
🐛
Danilo Pianini
🐛
Darko
🐛
David
🐛 -
David Atkinson
🐛 -
David Burström
💻 🐛 +
David Atkinson
🐛 +
David Burström
💻 🐛
David Goaté
🐛
David Golpira
🐛
David Kovařík
🐛
David M. Karr (fullname at gmail.com)
🐛
David Renz
💻 🐛 -
David Renz
🐛 -
Deleted user
🐛 +
David Renz
🐛 +
Deleted user
🐛
Dell Green
🐛
Dem Pilafian
🐛
Den
🐛
Denis Borovikov
💻 🐛
Dennie Reniers
💻 🐛 -
Dennis Kieselhorst
🐛 -
Derek P. Moore
🐛 +
Dennis Kieselhorst
🐛 +
Derek P. Moore
🐛
Dichotomia
🐛
Dionisio Cortés Fernández
💻 🐛
Dmitri Bourlatchkov
🐛
Dmitriy Kuzmin
🐛
Dmytro Dashenkov
🐛 -
Drew Hall
🐛 -
Dumitru Postoronca
🐛 +
Drew Hall
🐛 +
Dumitru Postoronca
🐛
Dylan Adams
🐛
Eden Hao
🐛
Edward Klimoshenko
🐛 💻
Egor Bredikhin
🐛
Elan P. Kugelmass
🐛 -
Elder S.
🐛 -
Emile
🐛 +
Elder S.
🐛 +
Emile
🐛
Eric
🐛
Eric Kintzer
🐛
Eric Perret
🐛
Eric Squires
🐛
Erich L Foster
🐛 -
Erik Bleske
🐛 -
Ernst Reissner
🐛 +
Erik Bleske
🐛 +
Ernst Reissner
🐛 +
Ewan Tempero
🐛
F.W. Dekker
🐛
FSchliephacke
🐛
Facundo
🐛
Federico Giust
🐛 + +
Fedor Sherstobitov
🐛
Felix Lampe
🐛
Filip Golonka
🐛 - -
Filipe Esperandio
💻 🐛
Filippo Nova
🐛
Francesco la Torre
🐛
Francisco Duarte
🐛 + +
Frieder Bluemle
🐛
Frits Jalvingh
💻 🐛
G. Bazior
🐛 - -
Gabe Henkes
🐛 +
Gary Gregory
🐛
Genoud Magloire
🐛
Geoffrey555
🐛 + +
Georg Romstorfer
🐛
Gio
🐛
Gol
🐛
Gonzalo Exequiel Ibars Ingman
💻 🐛 - -
GooDer
🐛
Gregor Riegler
🐛
Grzegorz Olszewski
🐛 + +
Gunther Schrijvers
💻 🐛
Gustavo Krieger
🐛
Guy Elsmore-Paddock
🐛
Görkem Mülayim
🐛 - -
Hanzel Godinez
🐛
Haoliang Chen
🐛
Harsh Kukreja
🐛 + +
Heber
🐛
Henning Schmiedehausen
💻 🐛
Henning von Bargen
💻
Hervé Boutemy
🐛 - -
Himanshu Pandey
🐛
Hokwang Lee
🐛
Hooperbloob
💻 + +
Hung PHAN
🐛
IDoCodingStuffs
💻 🐛
Iccen Gan
🐛
Ignacio Mariano Tirabasso
🐛 - -
Igor Melnichenko
🐛
Igor Moreno
🐛
Intelesis-MS
🐛 + +
Iroha_
🐛
Ishan Srivastava
🐛
Ivano Guerini
🐛
Ivar Andreas Bonsaksen
🐛 - -
Ivo Šmíd
🐛
JJengility
🐛
Jake Hemmerle
🐛 + +
James Harrison
🐛 💻
Jan
🐛
Jan Aertgeerts
💻 🐛
Jan Brümmer
🐛 - -
Jan Tříska
🐛
Jan-Lukas Else
🐛
Jason Qiu
💻 📖 + +
Jason Williams
🐛
Jean-Paul Mayer
🐛
Jean-Simon Larochelle
🐛
Jeff Bartolotta
💻 🐛 - -
Jeff Hube
💻 🐛
Jeff Jensen
🐛
Jeff May
🐛 -
Jens Gerdes
🐛 -
Jeroen Borgers
🐛 💻 -
Jerome Russ
🐛 -
JerritEic
💻 📖 +
Jens Gerdes
🐛 +
Jeroen Borgers
🐛 💻 📢 +
Jerome Russ
🐛 +
JerritEic
💻 📖 🐛
Jiri Pejchal
🐛
Jithin Sunny
🐛
Jiří Škorpil
🐛 + +
Joao Machado
🐛
Jochen Krauss
🐛
Johan Hammar
🐛
John Karp
🐛 - -
John Zhang
🐛
John-Teng
💻 🐛
Jon Moroney
💻 🐛 + +
Jonas Geiregat
🐛
Jonathan Wiesel
💻 🐛
Jordan
🐛
Jordi Llach
🐛 - -
Jorge Solórzano
🐛
JorneVL
🐛
Jose Palafox
🐛 + +
Jose Stovall
🐛
Joseph
💻
Joseph Heenan
🐛
Josh Feingold
💻 🐛 - -
Josh Holthaus
🐛
Joshua S Arquilevich
🐛
João Ferreira
💻 🐛 + +
João Pedro Schmitt
🐛
Juan Martín Sotuyo Dodero
💻 📖 🐛 🚧
Juan Pablo Civile
🐛
Julian Voronetsky
🐛 - -
Julien
🐛
Julius
🐛
JustPRV
🐛 + +
Jörn Huxhorn
🐛
KThompso
🐛
Kai Amundsen
🐛
Karel Vervaeke
🐛 - -
Karl-Andero Mere
🐛
Karl-Philipp Richter
🐛
Karsten Silz
🐛 + +
Kazuma Watanabe
🐛
Kev
🐛
Keve Müller
🐛
Kevin Guerra
💻 - -
Kevin Jones
🐛
Kevin Wayne
🐛
Kieran Black
🐛 + +
Kirill Zubov
🐛
Kirk Clemens
💻 🐛
Klaus Hartl
🐛
Koen Van Looveren
🐛 - -
Kris Scheibe
💻 🐛
Kunal Thanki
🐛
LaLucid
💻 + +
Larry Diamond
💻 🐛
Lars Knickrehm
🐛
Leo Gutierrez
🐛
LiGaOg
💻 - -
Lintsi
🐛
Linus Fernandes
🐛
Lixon Lookose
🐛 + +
Logesh
🐛
Lorenzo Gabriele
🐛
Loïc Ledoyen
🐛
Lucas Silva
🐛 - -
Lucas Soncini
💻 🐛
Luis Alcantar
💻
Lukasz Slonina
🐛 + +
Lukebray
🐛
Lynn
💻
Lyor Goldstein
🐛
MCMicS
🐛 - -
Macarse
🐛
Machine account for PMD
💻
Maciek Siemczyk
🐛 + +
Maikel Steneker
💻 🐛
Maksim Moiseikin
🐛
Manfred Koch
🐛
Manuel Moya Ferrer
💻 🐛 - -
Manuel Ryan
🐛
Marat Vyshegorodtsev
🐛
Marcel Härle
🐛 + +
Marcello Fialho
🐛
Marcin Rataj
🐛
Mark Adamcin
🐛
Mark Hall
💻 🐛 - -
Mark Kolich
🐛
Mark Pritchard
🐛
Markus Rathgeb
🐛 + +
Marquis Wang
🐛 +
MartGit
🐛
Martin Feldsztejn
🐛
Martin Lehmann
🐛
Martin Spamer
🐛 - -
Martin Tarjányi
🐛
MatFl
🐛 + +
Mateusz Stefanski
🐛
Mathieu Gouin
🐛
MatiasComercio
💻 🐛
Matt Benson
🐛
Matt De Poorter
🐛 - -
Matt Hargett
💻 💵
Matt Harrah
🐛 + +
Matt Nelson
🐛
Matthew Amos
🐛
Matthew Duggan
🐛
Matthew Hall
🐛
Matías Fraga
💻 🐛 - -
Maxime Robert
💻 🐛
MetaBF
🐛 + +
Michael
🐛
Michael Bell
🐛
Michael Bernstein
🐛
Michael Clay
🐛
Michael Dombrowski
🐛 - -
Michael Hausegger
🐛
Michael Hoefer
🐛 + +
Michael Möbius
🐛
Michael N. Lipp
🐛
Michael Pellegrini
🐛
Michal Kordas
🐛
Michał Borek
🐛 - -
Michał Kuliński
🐛
Miguel Núñez Díaz-Montes
🐛 + +
Mihai Ionut
🐛
Mirek Hankus
🐛
Mladjan Gadzic
🐛
MrAngry52
🐛
Muminur Choudhury
🐛 - -
Mykhailo Palahuta
💻 🐛
Nagendra Kumar Singh
🐛 + +
Nahuel Barrios
🐛
Nathan Braun
🐛
Nathan Reynolds
🐛
Nathan Reynolds
🐛
Nathanaël
🐛 - -
Naveen
💻
Nazdravi
🐛 + +
Neha-Dhonde
🐛
Nicholas Doyle
🐛
Nick Butcher
🐛
Nico Gallinal
🐛
Nicola Dal Maso
🐛 - -
Nicolas Filotto
💻
Nicolas Vuillamy
📖 + +
Nikita Chursin
🐛
Niklas Baudy
🐛
Nikolas Havrikov
🐛
Nilesh Virkar
🐛
Nimit Patel
🐛 - -
Niranjan Harpale
🐛
Noah Sussman
🐛 + +
Noah0120
🐛
Noam Tamim
🐛
Noel Grandin
🐛
Olaf Haalstra
🐛 -
Oleg Andreych
💻 +
Oleg Andreych
💻 🐛 +
Oleg Pavlenko
🐛 +
Oleksii Dykov
💻 🐛 -
Oleg Pavlenko
🐛 -
Oleksii Dykov
💻
Oliver Eikemeier
🐛
Oliver Siegmar
💵
Olivier Parent
💻 🐛
Ollie Abbey
💻 🐛
OverDrone
🐛 - -
Ozan Gulle
💻 🐛
PUNEET JAIN
🐛 + +
Parbati Bose
🐛
Paul Berg
🐛
Pavel Bludov
🐛
Pavel Mička
🐛
Pedro Nuno Santos
🐛 - -
Pedro Rijo
🐛
Pelisse Romain
💻 📖 🐛 + +
Per Abich
💻
Pete Davids
🐛
Peter Bruin
🐛
Peter Chittum
💻 🐛
Peter Cudmore
🐛 - -
Peter Kasson
🐛
Peter Kofler
🐛 + +
Peter Paul Bakker
💻
Pham Hai Trung
🐛
Philip Graf
💻 🐛
Philip Hachey
🐛
Philippe Ozil
🐛 - -
Phinehas Artemix
🐛
Phokham Nonava
🐛 + +
Piotr Szymański
🐛
Piotrek Żygieło
💻 🐛 📖
Pranay Jaiswal
🐛
Prasad Kamath
🐛
Prasanna
🐛 - -
Presh-AR
🐛
Puneet1726
🐛 + +
Rafael Cortês
🐛
RaheemShaik999
🐛
RajeshR
💻 🐛
Ramachandra Mohan
🐛
Ramel0921
🐛 - -
Raquel Pau
🐛
Ravikiran Janardhana
🐛 + +
Reda Benhemmouche
🐛
Renato Oliveira
💻 🐛
Rich DiCroce
🐛
Riot R1cket
🐛
Rishabh Jain
🐛 - -
RishabhDeep Singh
🐛
Robbie Martinus
💻 🐛 + +
Robert Henry
🐛
Robert Painsi
🐛
Robert Russell
🐛
Robert Sösemann
💻 📖 📢 🐛
Robert Whitebit
🐛 - -
Robin Richtsfeld
🐛
Robin Stocker
💻 🐛 + +
Robin Wils
🐛
RochusOest
🐛
Rodolfo Noviski
🐛
Rodrigo Casara
🐛
Rodrigo Fernandes
🐛 - -
Roman Salvador
💻 🐛
Ronald Blaschke
🐛 + +
Róbert Papp
🐛
Saikat Sengupta
🐛
Saksham Handu
🐛
Saladoc
🐛
Salesforce Bob Lightning
🐛 - -
Sam Carlberg
🐛
Satoshi Kubo
🐛 + +
Scott Kennedy
🐛
Scott Wells
🐛 💻
Scrsloota
💻
Sebastian Bögl
🐛
Sebastian Schuberth
🐛 - -
Sebastian Schwarz
🐛
Sergey Gorbaty
🐛 + +
Sergey Kozlov
🐛
Sergey Yanzin
💻 🐛
Seth Wilcox
💻
Shubham
💻 🐛 -
Simon Abykov
💻 - - +
Simon Abykov
💻 🐛
Simon Xiao
🐛
Srinivasan Venkatachalam
🐛 + +
Stanislav Gromov
🐛
Stanislav Myachenkov
💻
Stefan Birkner
🐛
Stefan Bohn
🐛
Stefan Endrullis
🐛 - -
Stefan Klöss-Schuster
🐛
Stefan Wolf
🐛 + +
Stephan H. Wissel
🐛
Stephen
🐛
Stephen Friedrich
🐛
Steve Babula
💻
Stexxe
🐛 - -
Stian Lågstad
🐛
StuartClayton5
🐛 + +
Supun Arunoda
🐛
Suren Abrahamyan
🐛
Suvashri
📖
SwatiBGupta1110
🐛
SyedThoufich
🐛 - -
Szymon Sasin
🐛
T-chuangxin
🐛 + +
TERAI Atsuhiro
🐛
TIOBE Software
💻 🐛
Taylor Smock
🐛
Techeira Damián
💻 🐛
Ted Husted
🐛 - -
TehBakker
🐛
The Gitter Badger
🐛 + +
Theodoor
🐛
Thiago Henrique Hüpner
🐛
Thibault Meyer
🐛
Thomas Güttler
🐛
Thomas Jones-Low
🐛 - -
Thomas Smith
💻 🐛
ThrawnCA
🐛 + +
Thunderforge
💻 🐛
Tim van der Lippe
🐛
Tobias Weimer
💻 🐛
Tom Daly
🐛
Tomer Figenblat
🐛 - -
Tomi De Lucca
💻 🐛
Torsten Kleiber
🐛 + +
TrackerSB
🐛
Ullrich Hafner
🐛
Utku Cuhadaroglu
💻 🐛
Valentin Brandl
🐛
Valeria
🐛 - -
Vasily Anisimov
🐛
Vibhor Goyal
🐛 + +
Vickenty Fesunov
🐛
Victor Noël
🐛
Vincent Galloy
💻
Vincent HUYNH
🐛
Vincent Maurin
🐛 - -
Vincent Privat
🐛
Vishhwas
🐛 + +
Vitaly
🐛
Vitaly Polonetsky
🐛
Vojtech Polivka
🐛
Vsevolod Zholobov
🐛
Vyom Yadav
💻 - -
Wang Shidong
🐛
Waqas Ahmed
🐛 + +
Wayne J. Earl
🐛
Wchenghui
🐛
Will Winder
🐛
William Brockhus
💻 🐛
Wilson Kurniawan
🐛 - -
Wim Deblauwe
🐛
Woongsik Choi
🐛 + +
XenoAmess
💻 🐛
Yang
💻
YaroslavTER
🐛
Young Chan
💻 🐛
YuJin Kim
🐛 - -
Yuri Dolzhenko
🐛
Yurii Dubinka
🐛 + +
Zoltan Farkas
🐛
Zustin
🐛
aaronhurst-google
🐛 💻
alexmodis
🐛
andreoss
🐛 - -
andrey81inmd
💻 🐛
anicoara
🐛 + +
arunprasathav
🐛
asiercamara
🐛
astillich-igniti
💻
avesolovksyy
🐛
avishvat
🐛 - -
avivmu
🐛
axelbarfod1
🐛 + +
b-3-n
🐛
balbhadra9
🐛
base23de
🐛
bergander
🐛
berkam
💻 🐛 - -
breizh31
🐛
caesarkim
🐛 + +
carolyujing
🐛 +
cbfiddle
🐛
cesares-basilico
🐛
chrite
🐛
cobratbq
🐛
coladict
🐛 +
cosmoJFH
🐛 -
cosmoJFH
🐛
cristalp
🐛
crunsk
🐛
cwholmes
🐛
cyberjj999
🐛
cyw3
🐛
d1ss0nanz
🐛 +
dalizi007
💻 -
dalizi007
💻
danbrycefairsailcom
🐛
dariansanity
🐛
darrenmiliband
🐛
davidburstrom
🐛
dbirkman-paloalto
🐛
deepak-patra
🐛 +
dependabot[bot]
💻 🐛 -
dependabot[bot]
💻 🐛
dinesh150
🐛
diziaq
🐛
dreaminpast123
🐛
duanyanan
🐛
dutt-sanjay
🐛
dylanleung
🐛 +
dzeigler
🐛 -
dzeigler
🐛
ekkirala
🐛
emersonmoura
🐛
fairy
🐛
filiprafalowicz
💻
foxmason
🐛
frankegabor
🐛 +
frankl
🐛 -
frankl
🐛
freafrea
🐛
fsapatin
🐛
gracia19
🐛
guo fei
🐛
gurmsc5
🐛
gwilymatgearset
💻 🐛 +
haigsn
🐛 -
haigsn
🐛
hemanshu070
🐛
henrik242
🐛
hongpuwu
🐛
hvbtup
💻 🐛
igniti GmbH
🐛
ilovezfs
🐛 +
itaigilo
🐛 -
itaigilo
🐛
jakivey32
🐛
jbennett2091
🐛
jcamerin
🐛
jkeener1
🐛
jmetertea
🐛
johnra2
💻 +
josemanuelrolon
💻 🐛 -
josemanuelrolon
💻 🐛
kabroxiko
💻 🐛
karwer
🐛
kaulonline
🐛
kdaemonv
🐛
kenji21
💻 🐛
kfranic
🐛 +
khalidkh
🐛 -
khalidkh
🐛 +
koalalam
🐛
krzyk
🐛
lasselindqvist
🐛
lgemeinhardt
🐛 From 3f08ad70fe92fe69efd57705f69ac3bb07f980e9 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 30 Sep 2022 15:25:30 +0200 Subject: [PATCH 101/108] Prepare pmd release 6.50.0 --- docs/_config.yml | 2 +- docs/pages/next_major_development.md | 6 ++++++ docs/pages/release_notes.md | 5 +++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/docs/_config.yml b/docs/_config.yml index a2bce8a5ea..918ad6512d 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -1,7 +1,7 @@ repository: pmd/pmd pmd: - version: 6.50.0-SNAPSHOT + version: 6.50.0 previous_version: 6.49.0 date: 30-September-2022 release_type: minor diff --git a/docs/pages/next_major_development.md b/docs/pages/next_major_development.md index 45333ab4e7..3ce57cb596 100644 --- a/docs/pages/next_major_development.md +++ b/docs/pages/next_major_development.md @@ -125,6 +125,12 @@ the breaking API changes will be performed in 7.0.0. an API is tagged as `@Deprecated` or not in the latest minor release. During the development of 7.0.0, we may decide to remove some APIs that were not tagged as deprecated, though we'll try to avoid it." %} +#### 6.50.0 + +##### CPD CLI + +* CPD now supports the `--ignore-literal-sequences` argument when analyzing Lua code. + #### 6.49.0 ##### Deprecated API diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md index 69f47c9104..9488c1b613 100644 --- a/docs/pages/release_notes.md +++ b/docs/pages/release_notes.md @@ -80,5 +80,10 @@ Many thanks to our sponsors: * [#4131](https://github.com/pmd/pmd/pull/4131): \[doc] TooFewBranchesForASwitchStatement - Use "if-else" instead of "if-then" - [Suvashri](https://github.com/Suvashri) (@Suvashri) * [#4137](https://github.com/pmd/pmd/pull/4137): \[java] Fixes 3859: Exclude junit5 test methods from the commentDefaultAccessModifierRule - [Luis Alcantar](https://github.com/lfalcantar) (@lfalcantar) +### Stats +* 100 commits +* 26 closed tickets & PRs +* Days since last release: 29 + {% endtocmaker %} From 37f6d8254cc9dc7fa3d4437c72ea80f7448a675d Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 30 Sep 2022 15:39:08 +0200 Subject: [PATCH 102/108] [maven-release-plugin] prepare release pmd_releases/6.50.0 --- pmd-apex-jorje/pom.xml | 2 +- pmd-apex/pom.xml | 2 +- pmd-core/pom.xml | 2 +- pmd-cpp/pom.xml | 2 +- pmd-cs/pom.xml | 2 +- pmd-dart/pom.xml | 2 +- pmd-dist/pom.xml | 2 +- pmd-doc/pom.xml | 2 +- pmd-fortran/pom.xml | 2 +- pmd-gherkin/pom.xml | 2 +- pmd-go/pom.xml | 2 +- pmd-groovy/pom.xml | 2 +- pmd-html/pom.xml | 2 +- pmd-java/pom.xml | 2 +- pmd-java8/pom.xml | 2 +- pmd-javascript/pom.xml | 2 +- pmd-jsp/pom.xml | 2 +- pmd-kotlin/pom.xml | 2 +- pmd-lang-test/pom.xml | 2 +- pmd-lua/pom.xml | 2 +- pmd-matlab/pom.xml | 2 +- pmd-modelica/pom.xml | 2 +- pmd-objectivec/pom.xml | 2 +- pmd-perl/pom.xml | 2 +- pmd-php/pom.xml | 2 +- pmd-plsql/pom.xml | 2 +- pmd-python/pom.xml | 2 +- pmd-ruby/pom.xml | 2 +- pmd-scala-modules/pmd-scala-common/pom.xml | 2 +- pmd-scala-modules/pmd-scala_2.12/pom.xml | 2 +- pmd-scala-modules/pmd-scala_2.13/pom.xml | 2 +- pmd-scala/pom.xml | 2 +- pmd-swift/pom.xml | 2 +- pmd-test-schema/pom.xml | 2 +- pmd-test/pom.xml | 2 +- pmd-visualforce/pom.xml | 2 +- pmd-vm/pom.xml | 2 +- pmd-xml/pom.xml | 2 +- pom.xml | 6 +++--- 39 files changed, 41 insertions(+), 41 deletions(-) diff --git a/pmd-apex-jorje/pom.xml b/pmd-apex-jorje/pom.xml index e39ef4b13d..ecbcac193a 100644 --- a/pmd-apex-jorje/pom.xml +++ b/pmd-apex-jorje/pom.xml @@ -8,7 +8,7 @@ net.sourceforge.pmd pmd - 6.50.0-SNAPSHOT + 6.50.0 ../pom.xml diff --git a/pmd-apex/pom.xml b/pmd-apex/pom.xml index 0302dd9be0..159df7bfa2 100644 --- a/pmd-apex/pom.xml +++ b/pmd-apex/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0-SNAPSHOT + 6.50.0 ../pom.xml diff --git a/pmd-core/pom.xml b/pmd-core/pom.xml index 2cfe77ea15..46281e78cf 100644 --- a/pmd-core/pom.xml +++ b/pmd-core/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0-SNAPSHOT + 6.50.0 ../pom.xml diff --git a/pmd-cpp/pom.xml b/pmd-cpp/pom.xml index dc6312c4d8..897150ee2b 100644 --- a/pmd-cpp/pom.xml +++ b/pmd-cpp/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0-SNAPSHOT + 6.50.0 ../pom.xml diff --git a/pmd-cs/pom.xml b/pmd-cs/pom.xml index 39cb5a5124..48414d6d64 100644 --- a/pmd-cs/pom.xml +++ b/pmd-cs/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0-SNAPSHOT + 6.50.0 ../pom.xml diff --git a/pmd-dart/pom.xml b/pmd-dart/pom.xml index 62ecfa06d7..c4f92494c7 100644 --- a/pmd-dart/pom.xml +++ b/pmd-dart/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0-SNAPSHOT + 6.50.0 ../pom.xml diff --git a/pmd-dist/pom.xml b/pmd-dist/pom.xml index 5bf7cf2aa5..d6a2334e1e 100644 --- a/pmd-dist/pom.xml +++ b/pmd-dist/pom.xml @@ -8,7 +8,7 @@ net.sourceforge.pmd pmd - 6.50.0-SNAPSHOT + 6.50.0 ../pom.xml diff --git a/pmd-doc/pom.xml b/pmd-doc/pom.xml index c215c8b406..77533c002f 100644 --- a/pmd-doc/pom.xml +++ b/pmd-doc/pom.xml @@ -8,7 +8,7 @@ net.sourceforge.pmd pmd - 6.50.0-SNAPSHOT + 6.50.0 ../pom.xml diff --git a/pmd-fortran/pom.xml b/pmd-fortran/pom.xml index d6017d7530..0c36e644db 100644 --- a/pmd-fortran/pom.xml +++ b/pmd-fortran/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0-SNAPSHOT + 6.50.0 ../pom.xml diff --git a/pmd-gherkin/pom.xml b/pmd-gherkin/pom.xml index c134fc08fa..84f36b7f7d 100644 --- a/pmd-gherkin/pom.xml +++ b/pmd-gherkin/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0-SNAPSHOT + 6.50.0 ../pom.xml diff --git a/pmd-go/pom.xml b/pmd-go/pom.xml index 387bbcf234..25b0879980 100644 --- a/pmd-go/pom.xml +++ b/pmd-go/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0-SNAPSHOT + 6.50.0 ../pom.xml diff --git a/pmd-groovy/pom.xml b/pmd-groovy/pom.xml index 3c72a3acfc..ad7174ac67 100644 --- a/pmd-groovy/pom.xml +++ b/pmd-groovy/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0-SNAPSHOT + 6.50.0 ../pom.xml diff --git a/pmd-html/pom.xml b/pmd-html/pom.xml index cab9828d2d..c07047f7e0 100644 --- a/pmd-html/pom.xml +++ b/pmd-html/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0-SNAPSHOT + 6.50.0 ../pom.xml diff --git a/pmd-java/pom.xml b/pmd-java/pom.xml index 1999933e18..9ef87156d7 100644 --- a/pmd-java/pom.xml +++ b/pmd-java/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0-SNAPSHOT + 6.50.0 ../pom.xml diff --git a/pmd-java8/pom.xml b/pmd-java8/pom.xml index dfbfe23d76..ac901ab7dd 100644 --- a/pmd-java8/pom.xml +++ b/pmd-java8/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0-SNAPSHOT + 6.50.0 ../pom.xml diff --git a/pmd-javascript/pom.xml b/pmd-javascript/pom.xml index a88e165bd3..b42e4968f3 100644 --- a/pmd-javascript/pom.xml +++ b/pmd-javascript/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0-SNAPSHOT + 6.50.0 ../pom.xml diff --git a/pmd-jsp/pom.xml b/pmd-jsp/pom.xml index 3ec09898c0..a9de2a4774 100644 --- a/pmd-jsp/pom.xml +++ b/pmd-jsp/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0-SNAPSHOT + 6.50.0 ../pom.xml diff --git a/pmd-kotlin/pom.xml b/pmd-kotlin/pom.xml index 26d6620be5..18961bd724 100644 --- a/pmd-kotlin/pom.xml +++ b/pmd-kotlin/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0-SNAPSHOT + 6.50.0 ../pom.xml diff --git a/pmd-lang-test/pom.xml b/pmd-lang-test/pom.xml index 3bb187261e..7b77315a29 100644 --- a/pmd-lang-test/pom.xml +++ b/pmd-lang-test/pom.xml @@ -12,7 +12,7 @@ net.sourceforge.pmd pmd - 6.50.0-SNAPSHOT + 6.50.0 ../pom.xml diff --git a/pmd-lua/pom.xml b/pmd-lua/pom.xml index b93a17f046..b2c78f7d9e 100644 --- a/pmd-lua/pom.xml +++ b/pmd-lua/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0-SNAPSHOT + 6.50.0 ../pom.xml diff --git a/pmd-matlab/pom.xml b/pmd-matlab/pom.xml index ba5076d6e9..aa54496e58 100644 --- a/pmd-matlab/pom.xml +++ b/pmd-matlab/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0-SNAPSHOT + 6.50.0 ../pom.xml diff --git a/pmd-modelica/pom.xml b/pmd-modelica/pom.xml index 4d09398f22..18f837f12e 100644 --- a/pmd-modelica/pom.xml +++ b/pmd-modelica/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0-SNAPSHOT + 6.50.0 ../pom.xml diff --git a/pmd-objectivec/pom.xml b/pmd-objectivec/pom.xml index 6dd1bbe61f..ef7091cb7d 100644 --- a/pmd-objectivec/pom.xml +++ b/pmd-objectivec/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0-SNAPSHOT + 6.50.0 ../pom.xml diff --git a/pmd-perl/pom.xml b/pmd-perl/pom.xml index 5342902fd5..0e2d253c70 100644 --- a/pmd-perl/pom.xml +++ b/pmd-perl/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0-SNAPSHOT + 6.50.0 ../pom.xml diff --git a/pmd-php/pom.xml b/pmd-php/pom.xml index 983c228b54..aedc312e06 100644 --- a/pmd-php/pom.xml +++ b/pmd-php/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0-SNAPSHOT + 6.50.0 ../pom.xml diff --git a/pmd-plsql/pom.xml b/pmd-plsql/pom.xml index 31e821cd95..3f9a661958 100644 --- a/pmd-plsql/pom.xml +++ b/pmd-plsql/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0-SNAPSHOT + 6.50.0 ../pom.xml diff --git a/pmd-python/pom.xml b/pmd-python/pom.xml index 8e7a6451d9..3eb25924aa 100644 --- a/pmd-python/pom.xml +++ b/pmd-python/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0-SNAPSHOT + 6.50.0 ../pom.xml diff --git a/pmd-ruby/pom.xml b/pmd-ruby/pom.xml index f1c8297b34..7cfae82bf9 100644 --- a/pmd-ruby/pom.xml +++ b/pmd-ruby/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0-SNAPSHOT + 6.50.0 ../pom.xml diff --git a/pmd-scala-modules/pmd-scala-common/pom.xml b/pmd-scala-modules/pmd-scala-common/pom.xml index ec947f79b0..c817fcde1d 100644 --- a/pmd-scala-modules/pmd-scala-common/pom.xml +++ b/pmd-scala-modules/pmd-scala-common/pom.xml @@ -8,7 +8,7 @@ net.sourceforge.pmd pmd - 6.50.0-SNAPSHOT + 6.50.0 ../../pom.xml diff --git a/pmd-scala-modules/pmd-scala_2.12/pom.xml b/pmd-scala-modules/pmd-scala_2.12/pom.xml index 427a4fd367..bf2ece7eca 100644 --- a/pmd-scala-modules/pmd-scala_2.12/pom.xml +++ b/pmd-scala-modules/pmd-scala_2.12/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd-scala-common - 6.50.0-SNAPSHOT + 6.50.0 ../pmd-scala-common/pom.xml diff --git a/pmd-scala-modules/pmd-scala_2.13/pom.xml b/pmd-scala-modules/pmd-scala_2.13/pom.xml index 41597fc0d3..ef91087756 100644 --- a/pmd-scala-modules/pmd-scala_2.13/pom.xml +++ b/pmd-scala-modules/pmd-scala_2.13/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd-scala-common - 6.50.0-SNAPSHOT + 6.50.0 ../pmd-scala-common/pom.xml diff --git a/pmd-scala/pom.xml b/pmd-scala/pom.xml index 5b199fa762..7860589fd2 100644 --- a/pmd-scala/pom.xml +++ b/pmd-scala/pom.xml @@ -9,7 +9,7 @@ net.sourceforge.pmd pmd - 6.50.0-SNAPSHOT + 6.50.0 ../pom.xml diff --git a/pmd-swift/pom.xml b/pmd-swift/pom.xml index a363e59183..c444754f34 100644 --- a/pmd-swift/pom.xml +++ b/pmd-swift/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0-SNAPSHOT + 6.50.0 ../pom.xml diff --git a/pmd-test-schema/pom.xml b/pmd-test-schema/pom.xml index 37e4c2de71..7e0588a5d1 100644 --- a/pmd-test-schema/pom.xml +++ b/pmd-test-schema/pom.xml @@ -11,7 +11,7 @@ pmd net.sourceforge.pmd - 6.50.0-SNAPSHOT + 6.50.0 ../pom.xml diff --git a/pmd-test/pom.xml b/pmd-test/pom.xml index 6ddeaaff3a..a1f757160b 100644 --- a/pmd-test/pom.xml +++ b/pmd-test/pom.xml @@ -8,7 +8,7 @@ net.sourceforge.pmd pmd - 6.50.0-SNAPSHOT + 6.50.0 ../pom.xml diff --git a/pmd-visualforce/pom.xml b/pmd-visualforce/pom.xml index 61c823bda1..9daa0da9ce 100644 --- a/pmd-visualforce/pom.xml +++ b/pmd-visualforce/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0-SNAPSHOT + 6.50.0 ../pom.xml diff --git a/pmd-vm/pom.xml b/pmd-vm/pom.xml index 399246c0d5..d9e495abbf 100644 --- a/pmd-vm/pom.xml +++ b/pmd-vm/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0-SNAPSHOT + 6.50.0 ../pom.xml diff --git a/pmd-xml/pom.xml b/pmd-xml/pom.xml index ecb77817dc..c167b528f6 100644 --- a/pmd-xml/pom.xml +++ b/pmd-xml/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0-SNAPSHOT + 6.50.0 ../pom.xml diff --git a/pom.xml b/pom.xml index 569c34bfd1..1c7b111e49 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 net.sourceforge.pmd pmd - 6.50.0-SNAPSHOT + 6.50.0 pom PMD @@ -55,7 +55,7 @@ scm:git:git://github.com/pmd/pmd.git scm:git:ssh://git@github.com/pmd/pmd.git https://github.com/pmd/pmd - HEAD + pmd_releases/6.50.0 @@ -76,7 +76,7 @@ - 2022-08-31T17:19:27Z + 2022-09-30T13:25:39Z 7 From 13d9a9457f2b068bbe342e200c465c4a0d2eabb5 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 30 Sep 2022 15:39:14 +0200 Subject: [PATCH 103/108] [maven-release-plugin] prepare for next development iteration --- pmd-apex-jorje/pom.xml | 2 +- pmd-apex/pom.xml | 2 +- pmd-core/pom.xml | 2 +- pmd-cpp/pom.xml | 2 +- pmd-cs/pom.xml | 2 +- pmd-dart/pom.xml | 2 +- pmd-dist/pom.xml | 2 +- pmd-doc/pom.xml | 2 +- pmd-fortran/pom.xml | 2 +- pmd-gherkin/pom.xml | 2 +- pmd-go/pom.xml | 2 +- pmd-groovy/pom.xml | 2 +- pmd-html/pom.xml | 2 +- pmd-java/pom.xml | 2 +- pmd-java8/pom.xml | 2 +- pmd-javascript/pom.xml | 2 +- pmd-jsp/pom.xml | 2 +- pmd-kotlin/pom.xml | 2 +- pmd-lang-test/pom.xml | 2 +- pmd-lua/pom.xml | 2 +- pmd-matlab/pom.xml | 2 +- pmd-modelica/pom.xml | 2 +- pmd-objectivec/pom.xml | 2 +- pmd-perl/pom.xml | 2 +- pmd-php/pom.xml | 2 +- pmd-plsql/pom.xml | 2 +- pmd-python/pom.xml | 2 +- pmd-ruby/pom.xml | 2 +- pmd-scala-modules/pmd-scala-common/pom.xml | 2 +- pmd-scala-modules/pmd-scala_2.12/pom.xml | 2 +- pmd-scala-modules/pmd-scala_2.13/pom.xml | 2 +- pmd-scala/pom.xml | 2 +- pmd-swift/pom.xml | 2 +- pmd-test-schema/pom.xml | 2 +- pmd-test/pom.xml | 2 +- pmd-visualforce/pom.xml | 2 +- pmd-vm/pom.xml | 2 +- pmd-xml/pom.xml | 2 +- pom.xml | 6 +++--- 39 files changed, 41 insertions(+), 41 deletions(-) diff --git a/pmd-apex-jorje/pom.xml b/pmd-apex-jorje/pom.xml index ecbcac193a..3ecd79b58e 100644 --- a/pmd-apex-jorje/pom.xml +++ b/pmd-apex-jorje/pom.xml @@ -8,7 +8,7 @@ net.sourceforge.pmd pmd - 6.50.0 + 6.51.0-SNAPSHOT ../pom.xml diff --git a/pmd-apex/pom.xml b/pmd-apex/pom.xml index 159df7bfa2..d80050e0ce 100644 --- a/pmd-apex/pom.xml +++ b/pmd-apex/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0 + 6.51.0-SNAPSHOT ../pom.xml diff --git a/pmd-core/pom.xml b/pmd-core/pom.xml index 46281e78cf..d8c12a2db6 100644 --- a/pmd-core/pom.xml +++ b/pmd-core/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0 + 6.51.0-SNAPSHOT ../pom.xml diff --git a/pmd-cpp/pom.xml b/pmd-cpp/pom.xml index 897150ee2b..91c3734932 100644 --- a/pmd-cpp/pom.xml +++ b/pmd-cpp/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0 + 6.51.0-SNAPSHOT ../pom.xml diff --git a/pmd-cs/pom.xml b/pmd-cs/pom.xml index 48414d6d64..d0bac9376b 100644 --- a/pmd-cs/pom.xml +++ b/pmd-cs/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0 + 6.51.0-SNAPSHOT ../pom.xml diff --git a/pmd-dart/pom.xml b/pmd-dart/pom.xml index c4f92494c7..5fffeab190 100644 --- a/pmd-dart/pom.xml +++ b/pmd-dart/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0 + 6.51.0-SNAPSHOT ../pom.xml diff --git a/pmd-dist/pom.xml b/pmd-dist/pom.xml index d6a2334e1e..82070748b7 100644 --- a/pmd-dist/pom.xml +++ b/pmd-dist/pom.xml @@ -8,7 +8,7 @@ net.sourceforge.pmd pmd - 6.50.0 + 6.51.0-SNAPSHOT ../pom.xml diff --git a/pmd-doc/pom.xml b/pmd-doc/pom.xml index 77533c002f..3dfcfc73d1 100644 --- a/pmd-doc/pom.xml +++ b/pmd-doc/pom.xml @@ -8,7 +8,7 @@ net.sourceforge.pmd pmd - 6.50.0 + 6.51.0-SNAPSHOT ../pom.xml diff --git a/pmd-fortran/pom.xml b/pmd-fortran/pom.xml index 0c36e644db..5cba970f11 100644 --- a/pmd-fortran/pom.xml +++ b/pmd-fortran/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0 + 6.51.0-SNAPSHOT ../pom.xml diff --git a/pmd-gherkin/pom.xml b/pmd-gherkin/pom.xml index 84f36b7f7d..415023d340 100644 --- a/pmd-gherkin/pom.xml +++ b/pmd-gherkin/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0 + 6.51.0-SNAPSHOT ../pom.xml diff --git a/pmd-go/pom.xml b/pmd-go/pom.xml index 25b0879980..3138dc39ba 100644 --- a/pmd-go/pom.xml +++ b/pmd-go/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0 + 6.51.0-SNAPSHOT ../pom.xml diff --git a/pmd-groovy/pom.xml b/pmd-groovy/pom.xml index ad7174ac67..20166cfb4f 100644 --- a/pmd-groovy/pom.xml +++ b/pmd-groovy/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0 + 6.51.0-SNAPSHOT ../pom.xml diff --git a/pmd-html/pom.xml b/pmd-html/pom.xml index c07047f7e0..bf4ee5e693 100644 --- a/pmd-html/pom.xml +++ b/pmd-html/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0 + 6.51.0-SNAPSHOT ../pom.xml diff --git a/pmd-java/pom.xml b/pmd-java/pom.xml index 9ef87156d7..f711a40ab8 100644 --- a/pmd-java/pom.xml +++ b/pmd-java/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0 + 6.51.0-SNAPSHOT ../pom.xml diff --git a/pmd-java8/pom.xml b/pmd-java8/pom.xml index ac901ab7dd..e6d123c011 100644 --- a/pmd-java8/pom.xml +++ b/pmd-java8/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0 + 6.51.0-SNAPSHOT ../pom.xml diff --git a/pmd-javascript/pom.xml b/pmd-javascript/pom.xml index b42e4968f3..773e763b05 100644 --- a/pmd-javascript/pom.xml +++ b/pmd-javascript/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0 + 6.51.0-SNAPSHOT ../pom.xml diff --git a/pmd-jsp/pom.xml b/pmd-jsp/pom.xml index a9de2a4774..5ebcbaaaa2 100644 --- a/pmd-jsp/pom.xml +++ b/pmd-jsp/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0 + 6.51.0-SNAPSHOT ../pom.xml diff --git a/pmd-kotlin/pom.xml b/pmd-kotlin/pom.xml index 18961bd724..9c91119822 100644 --- a/pmd-kotlin/pom.xml +++ b/pmd-kotlin/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0 + 6.51.0-SNAPSHOT ../pom.xml diff --git a/pmd-lang-test/pom.xml b/pmd-lang-test/pom.xml index 7b77315a29..52520ed9c9 100644 --- a/pmd-lang-test/pom.xml +++ b/pmd-lang-test/pom.xml @@ -12,7 +12,7 @@ net.sourceforge.pmd pmd - 6.50.0 + 6.51.0-SNAPSHOT ../pom.xml diff --git a/pmd-lua/pom.xml b/pmd-lua/pom.xml index b2c78f7d9e..ecbe9b67c5 100644 --- a/pmd-lua/pom.xml +++ b/pmd-lua/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0 + 6.51.0-SNAPSHOT ../pom.xml diff --git a/pmd-matlab/pom.xml b/pmd-matlab/pom.xml index aa54496e58..132b9c6a41 100644 --- a/pmd-matlab/pom.xml +++ b/pmd-matlab/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0 + 6.51.0-SNAPSHOT ../pom.xml diff --git a/pmd-modelica/pom.xml b/pmd-modelica/pom.xml index 18f837f12e..5c3be1df60 100644 --- a/pmd-modelica/pom.xml +++ b/pmd-modelica/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0 + 6.51.0-SNAPSHOT ../pom.xml diff --git a/pmd-objectivec/pom.xml b/pmd-objectivec/pom.xml index ef7091cb7d..2783d6817a 100644 --- a/pmd-objectivec/pom.xml +++ b/pmd-objectivec/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0 + 6.51.0-SNAPSHOT ../pom.xml diff --git a/pmd-perl/pom.xml b/pmd-perl/pom.xml index 0e2d253c70..5ae65eb5dc 100644 --- a/pmd-perl/pom.xml +++ b/pmd-perl/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0 + 6.51.0-SNAPSHOT ../pom.xml diff --git a/pmd-php/pom.xml b/pmd-php/pom.xml index aedc312e06..f4800eac8c 100644 --- a/pmd-php/pom.xml +++ b/pmd-php/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0 + 6.51.0-SNAPSHOT ../pom.xml diff --git a/pmd-plsql/pom.xml b/pmd-plsql/pom.xml index 3f9a661958..707289b8df 100644 --- a/pmd-plsql/pom.xml +++ b/pmd-plsql/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0 + 6.51.0-SNAPSHOT ../pom.xml diff --git a/pmd-python/pom.xml b/pmd-python/pom.xml index 3eb25924aa..b8b3759af6 100644 --- a/pmd-python/pom.xml +++ b/pmd-python/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0 + 6.51.0-SNAPSHOT ../pom.xml diff --git a/pmd-ruby/pom.xml b/pmd-ruby/pom.xml index 7cfae82bf9..f30afe4fa6 100644 --- a/pmd-ruby/pom.xml +++ b/pmd-ruby/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0 + 6.51.0-SNAPSHOT ../pom.xml diff --git a/pmd-scala-modules/pmd-scala-common/pom.xml b/pmd-scala-modules/pmd-scala-common/pom.xml index c817fcde1d..3c1e1c3aa7 100644 --- a/pmd-scala-modules/pmd-scala-common/pom.xml +++ b/pmd-scala-modules/pmd-scala-common/pom.xml @@ -8,7 +8,7 @@ net.sourceforge.pmd pmd - 6.50.0 + 6.51.0-SNAPSHOT ../../pom.xml diff --git a/pmd-scala-modules/pmd-scala_2.12/pom.xml b/pmd-scala-modules/pmd-scala_2.12/pom.xml index bf2ece7eca..dfa1368708 100644 --- a/pmd-scala-modules/pmd-scala_2.12/pom.xml +++ b/pmd-scala-modules/pmd-scala_2.12/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd-scala-common - 6.50.0 + 6.51.0-SNAPSHOT ../pmd-scala-common/pom.xml diff --git a/pmd-scala-modules/pmd-scala_2.13/pom.xml b/pmd-scala-modules/pmd-scala_2.13/pom.xml index ef91087756..da71270591 100644 --- a/pmd-scala-modules/pmd-scala_2.13/pom.xml +++ b/pmd-scala-modules/pmd-scala_2.13/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd-scala-common - 6.50.0 + 6.51.0-SNAPSHOT ../pmd-scala-common/pom.xml diff --git a/pmd-scala/pom.xml b/pmd-scala/pom.xml index 7860589fd2..caaa746ba9 100644 --- a/pmd-scala/pom.xml +++ b/pmd-scala/pom.xml @@ -9,7 +9,7 @@ net.sourceforge.pmd pmd - 6.50.0 + 6.51.0-SNAPSHOT ../pom.xml diff --git a/pmd-swift/pom.xml b/pmd-swift/pom.xml index c444754f34..7632b8a40d 100644 --- a/pmd-swift/pom.xml +++ b/pmd-swift/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0 + 6.51.0-SNAPSHOT ../pom.xml diff --git a/pmd-test-schema/pom.xml b/pmd-test-schema/pom.xml index 7e0588a5d1..02e6b1e303 100644 --- a/pmd-test-schema/pom.xml +++ b/pmd-test-schema/pom.xml @@ -11,7 +11,7 @@ pmd net.sourceforge.pmd - 6.50.0 + 6.51.0-SNAPSHOT ../pom.xml diff --git a/pmd-test/pom.xml b/pmd-test/pom.xml index a1f757160b..e964fda20e 100644 --- a/pmd-test/pom.xml +++ b/pmd-test/pom.xml @@ -8,7 +8,7 @@ net.sourceforge.pmd pmd - 6.50.0 + 6.51.0-SNAPSHOT ../pom.xml diff --git a/pmd-visualforce/pom.xml b/pmd-visualforce/pom.xml index 9daa0da9ce..27ab62e969 100644 --- a/pmd-visualforce/pom.xml +++ b/pmd-visualforce/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0 + 6.51.0-SNAPSHOT ../pom.xml diff --git a/pmd-vm/pom.xml b/pmd-vm/pom.xml index d9e495abbf..f2e18a2f8f 100644 --- a/pmd-vm/pom.xml +++ b/pmd-vm/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0 + 6.51.0-SNAPSHOT ../pom.xml diff --git a/pmd-xml/pom.xml b/pmd-xml/pom.xml index c167b528f6..733153d749 100644 --- a/pmd-xml/pom.xml +++ b/pmd-xml/pom.xml @@ -7,7 +7,7 @@ net.sourceforge.pmd pmd - 6.50.0 + 6.51.0-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 1c7b111e49..11eefbd35a 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 net.sourceforge.pmd pmd - 6.50.0 + 6.51.0-SNAPSHOT pom PMD @@ -55,7 +55,7 @@ scm:git:git://github.com/pmd/pmd.git scm:git:ssh://git@github.com/pmd/pmd.git https://github.com/pmd/pmd - pmd_releases/6.50.0 + HEAD @@ -76,7 +76,7 @@ - 2022-09-30T13:25:39Z + 2022-09-30T13:39:13Z 7 From 090af8c3a50f66384e532dfd737b491aaddb36b7 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 30 Sep 2022 15:40:54 +0200 Subject: [PATCH 104/108] Prepare next development version [skip ci] --- docs/_config.yml | 6 +-- docs/pages/release_notes.md | 65 --------------------------------- docs/pages/release_notes_old.md | 1 + 3 files changed, 4 insertions(+), 68 deletions(-) diff --git a/docs/_config.yml b/docs/_config.yml index 918ad6512d..ad7e622526 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -1,9 +1,9 @@ repository: pmd/pmd pmd: - version: 6.50.0 - previous_version: 6.49.0 - date: 30-September-2022 + version: 6.51.0-SNAPSHOT + previous_version: 6.50.0 + date: 29-October-2022 release_type: minor # release types: major, minor, bugfix diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md index 9488c1b613..b8f8783555 100644 --- a/docs/pages/release_notes.md +++ b/docs/pages/release_notes.md @@ -14,76 +14,11 @@ This is a {{ site.pmd.release_type }} release. ### New and noteworthy -#### Lua now supports additionally Luau - -This release of PMD adds support for [Luau](https://github.com/Roblox/luau), a gradually typed language derived -from Lua. This means, that the Lua language in PMD can now parse both Lua and Luau. - -#### Modified rules - -* The Java rule {% rule java/bestpractices/UnusedPrivateField %} now ignores private fields, if the fields are - annotated with any annotation or the enclosing class has any annotation. Annotations often enable a - framework (such as dependency injection, mocking or e.g. Lombok) which use the fields by reflection or other - means. This usage can't be detected by static code analysis. Previously these frameworks where explicitly allowed - by listing their annotations in the property "ignoredAnnotations", but that turned out to be prone of false - positive for any not explicitly considered framework. That's why the property "ignoredAnnotations" has been - deprecated for this rule. -* The Java rule {% rule java/codestyle/CommentDefaultAccessModifier %} now by default ignores JUnit5 annotated - methods. This behavior can be customized using the property `ignoredAnnotations`. - ### Fixed Issues -* cli - * [#4118](https://github.com/pmd/pmd/issues/4118): \[cli] run.sh designer reports "integer expression expected" -* core - * [#4116](https://github.com/pmd/pmd/pull/4116): \[core] Missing --file arg in TreeExport CLI example -* doc - * [#4072](https://github.com/pmd/pmd/pull/4072): \[doc] Add architecture decision records - * [#4109](https://github.com/pmd/pmd/pull/4109): \[doc] Add page for 3rd party rulesets - * [#4124](https://github.com/pmd/pmd/pull/4124): \[doc] Fix typos in Java rule docs -* java - * [#3431](https://github.com/pmd/pmd/issues/3431): \[java] Add sample java project to regression-tester which uses new language constructs -* java-bestpractices - * [#4033](https://github.com/pmd/pmd/issues/4033): \[java] UnusedPrivateField - false positive with Lombok @ToString.Include - * [#4037](https://github.com/pmd/pmd/issues/4037): \[java] UnusedPrivateField - false positive with Spring @SpyBean -* java-codestyle - * [#3859](https://github.com/pmd/pmd/issues/3859): \[java] CommentDefaultAccessModifier is triggered in JUnit5 test class - * [#4085](https://github.com/pmd/pmd/issues/4085): \[java] UnnecessaryFullyQualifiedName false positive when nested and non-nested classes with the same name and in the same package are used together - * [#4133](https://github.com/pmd/pmd/issues/4133): \[java] UnnecessaryFullyQualifiedName - FP for inner class pkg.ClassA.Foo implementing pkg.Foo -* java-design - * [#4090](https://github.com/pmd/pmd/issues/4090): \[java] FinalFieldCouldBeStatic false positive with non-static synchronized block (regression in 6.48, worked with 6.47) -* java-errorprone - * [#1718](https://github.com/pmd/pmd/issues/1718): \[java] ConstructorCallsOverridableMethod false positive when calling super method - * [#2348](https://github.com/pmd/pmd/issues/2348): \[java] ConstructorCallsOverridableMethod occurs when unused overloaded method is defined - * [#4099](https://github.com/pmd/pmd/issues/4099): \[java] ConstructorCallsOverridableMethod should consider method calls with var access -* scala - * [#4138](https://github.com/pmd/pmd/pull/4138): \[scala] Upgrade scala-library to 2.12.7 / 2.13.9 and scalameta to 4.6.0 ### API Changes -#### CPD CLI - -* CPD now supports the `--ignore-literal-sequences` argument when analyzing Lua code. - -### Financial Contributions - -Many thanks to our sponsors: - -* [Oliver Siegmar](https://github.com/osiegmar) (@osiegmar) - ### External Contributions -* [#4066](https://github.com/pmd/pmd/pull/4066): \[lua] Add support for Luau syntax and skipping literal sequences in CPD - [Matt Hargett](https://github.com/matthargett) (@matthargett) -* [#4100](https://github.com/pmd/pmd/pull/4100): \[java] Update UnusedPrivateFieldRule - ignore any annotations - [Lynn](https://github.com/LynnBroe) (@LynnBroe) -* [#4116](https://github.com/pmd/pmd/pull/4116): \[core] Fix missing --file arg in TreeExport CLI example - [mohan-chinnappan-n](https://github.com/mohan-chinnappan-n) (@mohan-chinnappan-n) -* [#4124](https://github.com/pmd/pmd/pull/4124): \[doc] Fix typos in Java rule docs - [Piotrek Żygieło](https://github.com/pzygielo) (@pzygielo) -* [#4128](https://github.com/pmd/pmd/pull/4128): \[java] Fix False-positive UnnecessaryFullyQualifiedName when nested and non-nest… #4103 - [Oleg Andreych](https://github.com/OlegAndreych) (@OlegAndreych) -* [#4130](https://github.com/pmd/pmd/pull/4130): \[ci] GitHub Workflows security hardening - [Alex](https://github.com/sashashura) (@sashashura) -* [#4131](https://github.com/pmd/pmd/pull/4131): \[doc] TooFewBranchesForASwitchStatement - Use "if-else" instead of "if-then" - [Suvashri](https://github.com/Suvashri) (@Suvashri) -* [#4137](https://github.com/pmd/pmd/pull/4137): \[java] Fixes 3859: Exclude junit5 test methods from the commentDefaultAccessModifierRule - [Luis Alcantar](https://github.com/lfalcantar) (@lfalcantar) - -### Stats -* 100 commits -* 26 closed tickets & PRs -* Days since last release: 29 {% endtocmaker %} diff --git a/docs/pages/release_notes_old.md b/docs/pages/release_notes_old.md index 932e00b8b9..2f1f69559f 100644 --- a/docs/pages/release_notes_old.md +++ b/docs/pages/release_notes_old.md @@ -5,6 +5,7 @@ permalink: pmd_release_notes_old.html Previous versions of PMD can be downloaded here: https://github.com/pmd/pmd/releases + ## 31-August-2022 - 6.49.0 The PMD team is pleased to announce PMD 6.49.0. From a9647edb63eba1e2498a58e847a376127d6e4cd6 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 30 Sep 2022 15:44:10 +0200 Subject: [PATCH 105/108] [doc] Fix old release notes [skip ci] --- docs/pages/release_notes_old.md | 91 +++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/docs/pages/release_notes_old.md b/docs/pages/release_notes_old.md index 2f1f69559f..209d6a89cb 100644 --- a/docs/pages/release_notes_old.md +++ b/docs/pages/release_notes_old.md @@ -6,6 +6,97 @@ permalink: pmd_release_notes_old.html Previous versions of PMD can be downloaded here: https://github.com/pmd/pmd/releases +## 30-September-2022 - 6.50.0 + +The PMD team is pleased to announce PMD 6.50.0. + +This is a minor release. + +### Table Of Contents + +* [New and noteworthy](#new-and-noteworthy) + * [Lua now supports additionally Luau](#lua-now-supports-additionally-luau) + * [Modified rules](#modified-rules) +* [Fixed Issues](#fixed-issues) +* [API Changes](#api-changes) + * [CPD CLI](#cpd-cli) +* [Financial Contributions](#financial-contributions) +* [External Contributions](#external-contributions) +* [Stats](#stats) + +### New and noteworthy + +#### Lua now supports additionally Luau + +This release of PMD adds support for [Luau](https://github.com/Roblox/luau), a gradually typed language derived +from Lua. This means, that the Lua language in PMD can now parse both Lua and Luau. + +#### Modified rules + +* The Java rule [`UnusedPrivateField`](https://pmd.github.io/pmd-6.50.0/pmd_rules_java_bestpractices.html#unusedprivatefield) now ignores private fields, if the fields are + annotated with any annotation or the enclosing class has any annotation. Annotations often enable a + framework (such as dependency injection, mocking or e.g. Lombok) which use the fields by reflection or other + means. This usage can't be detected by static code analysis. Previously these frameworks where explicitly allowed + by listing their annotations in the property "ignoredAnnotations", but that turned out to be prone of false + positive for any not explicitly considered framework. That's why the property "ignoredAnnotations" has been + deprecated for this rule. +* The Java rule [`CommentDefaultAccessModifier`](https://pmd.github.io/pmd-6.50.0/pmd_rules_java_codestyle.html#commentdefaultaccessmodifier) now by default ignores JUnit5 annotated + methods. This behavior can be customized using the property `ignoredAnnotations`. + +### Fixed Issues +* cli + * [#4118](https://github.com/pmd/pmd/issues/4118): \[cli] run.sh designer reports "integer expression expected" +* core + * [#4116](https://github.com/pmd/pmd/pull/4116): \[core] Missing --file arg in TreeExport CLI example +* doc + * [#4072](https://github.com/pmd/pmd/pull/4072): \[doc] Add architecture decision records + * [#4109](https://github.com/pmd/pmd/pull/4109): \[doc] Add page for 3rd party rulesets + * [#4124](https://github.com/pmd/pmd/pull/4124): \[doc] Fix typos in Java rule docs +* java + * [#3431](https://github.com/pmd/pmd/issues/3431): \[java] Add sample java project to regression-tester which uses new language constructs +* java-bestpractices + * [#4033](https://github.com/pmd/pmd/issues/4033): \[java] UnusedPrivateField - false positive with Lombok @ToString.Include + * [#4037](https://github.com/pmd/pmd/issues/4037): \[java] UnusedPrivateField - false positive with Spring @SpyBean +* java-codestyle + * [#3859](https://github.com/pmd/pmd/issues/3859): \[java] CommentDefaultAccessModifier is triggered in JUnit5 test class + * [#4085](https://github.com/pmd/pmd/issues/4085): \[java] UnnecessaryFullyQualifiedName false positive when nested and non-nested classes with the same name and in the same package are used together + * [#4133](https://github.com/pmd/pmd/issues/4133): \[java] UnnecessaryFullyQualifiedName - FP for inner class pkg.ClassA.Foo implementing pkg.Foo +* java-design + * [#4090](https://github.com/pmd/pmd/issues/4090): \[java] FinalFieldCouldBeStatic false positive with non-static synchronized block (regression in 6.48, worked with 6.47) +* java-errorprone + * [#1718](https://github.com/pmd/pmd/issues/1718): \[java] ConstructorCallsOverridableMethod false positive when calling super method + * [#2348](https://github.com/pmd/pmd/issues/2348): \[java] ConstructorCallsOverridableMethod occurs when unused overloaded method is defined + * [#4099](https://github.com/pmd/pmd/issues/4099): \[java] ConstructorCallsOverridableMethod should consider method calls with var access +* scala + * [#4138](https://github.com/pmd/pmd/pull/4138): \[scala] Upgrade scala-library to 2.12.7 / 2.13.9 and scalameta to 4.6.0 + +### API Changes + +#### CPD CLI + +* CPD now supports the `--ignore-literal-sequences` argument when analyzing Lua code. + +### Financial Contributions + +Many thanks to our sponsors: + +* [Oliver Siegmar](https://github.com/osiegmar) (@osiegmar) + +### External Contributions +* [#4066](https://github.com/pmd/pmd/pull/4066): \[lua] Add support for Luau syntax and skipping literal sequences in CPD - [Matt Hargett](https://github.com/matthargett) (@matthargett) +* [#4100](https://github.com/pmd/pmd/pull/4100): \[java] Update UnusedPrivateFieldRule - ignore any annotations - [Lynn](https://github.com/LynnBroe) (@LynnBroe) +* [#4116](https://github.com/pmd/pmd/pull/4116): \[core] Fix missing --file arg in TreeExport CLI example - [mohan-chinnappan-n](https://github.com/mohan-chinnappan-n) (@mohan-chinnappan-n) +* [#4124](https://github.com/pmd/pmd/pull/4124): \[doc] Fix typos in Java rule docs - [Piotrek Żygieło](https://github.com/pzygielo) (@pzygielo) +* [#4128](https://github.com/pmd/pmd/pull/4128): \[java] Fix False-positive UnnecessaryFullyQualifiedName when nested and non-nest… #4103 - [Oleg Andreych](https://github.com/OlegAndreych) (@OlegAndreych) +* [#4130](https://github.com/pmd/pmd/pull/4130): \[ci] GitHub Workflows security hardening - [Alex](https://github.com/sashashura) (@sashashura) +* [#4131](https://github.com/pmd/pmd/pull/4131): \[doc] TooFewBranchesForASwitchStatement - Use "if-else" instead of "if-then" - [Suvashri](https://github.com/Suvashri) (@Suvashri) +* [#4137](https://github.com/pmd/pmd/pull/4137): \[java] Fixes 3859: Exclude junit5 test methods from the commentDefaultAccessModifierRule - [Luis Alcantar](https://github.com/lfalcantar) (@lfalcantar) + +### Stats +* 100 commits +* 26 closed tickets & PRs +* Days since last release: 29 + ## 31-August-2022 - 6.49.0 The PMD team is pleased to announce PMD 6.49.0. From d69a292d16d55861e7e122e6c3cf76f7bdb62037 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 30 Sep 2022 16:04:15 +0200 Subject: [PATCH 106/108] [ci] Escape ampersand to avoid pattern substitution replacement [skip ci] This is a new feature of bash 5.2... See also shopt patsub_replacement --- do-release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/do-release.sh b/do-release.sh index 3ddb331bbd..99c3c99c4c 100755 --- a/do-release.sh +++ b/do-release.sh @@ -116,7 +116,7 @@ echo "* Days since last release: $(( ( $(date +%s) - $(git log --max-count=1 --f ) TEMP_RELEASE_NOTES=$(cat docs/pages/release_notes.md) -TEMP_RELEASE_NOTES=${TEMP_RELEASE_NOTES/\{\% endtocmaker \%\}/$STATS$'\n'$'\n'\{\% endtocmaker \%\}$'\n'} +TEMP_RELEASE_NOTES=${TEMP_RELEASE_NOTES/\{\% endtocmaker \%\}/${STATS//\&/\\\&}$'\n'$'\n'\{\% endtocmaker \%\}$'\n'} echo "${TEMP_RELEASE_NOTES}" > docs/pages/release_notes.md echo From 905f1432f4de4beaeae0df05bd546df028f4e839 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 30 Sep 2022 16:08:44 +0200 Subject: [PATCH 107/108] Bump pmd from 6.49.0 to 6.50.0 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 11eefbd35a..1e3456c9ec 100644 --- a/pom.xml +++ b/pom.xml @@ -407,22 +407,22 @@ net.sourceforge.pmd pmd-core - 6.49.0 + 6.50.0 net.sourceforge.pmd pmd-java - 6.49.0 + 6.50.0 net.sourceforge.pmd pmd-jsp - 6.49.0 + 6.50.0 net.sourceforge.pmd pmd-javascript - 6.49.0 + 6.50.0 From 327164cc3cd5d8ffbe17730c63d556f5eddab7d9 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 30 Sep 2022 16:28:47 +0200 Subject: [PATCH 108/108] Fix build --- pmd-perl/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pmd-perl/pom.xml b/pmd-perl/pom.xml index b2dd58dd36..c758392950 100644 --- a/pmd-perl/pom.xml +++ b/pmd-perl/pom.xml @@ -1,4 +1,3 @@ - 4.0.0