Skip to content

Commit 5f82993

Browse files
owen-mcowen-mc
committed
Put parameters with inline expectation comments on their own lines
1 parent 5d00bb2 commit 5f82993

File tree

4 files changed

+87
-24
lines changed

4 files changed

+87
-24
lines changed

‎java/ql/test/library-tests/frameworks/JaxWs/JakartaRs1.java

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,14 @@ class AnotherNonRootResourceClassJakarta { // $NonRootResourceClass
106106
public AnotherNonRootResourceClassJakarta() {
107107
}
108108

109-
public AnotherNonRootResourceClassJakarta(@BeanParam int beanParam, @CookieParam("") int cookieParam, @FormParam("") int formParam, // $InjectionAnnotation
110-
@HeaderParam("") int headerParam, @MatrixParam("") int matrixParam, @PathParam("") int pathParam, @QueryParam("") int queryParam, // $InjectionAnnotation
109+
public AnotherNonRootResourceClassJakarta(
110+
@BeanParam int beanParam, // $InjectionAnnotation
111+
@CookieParam("") int cookieParam, // $InjectionAnnotation
112+
@FormParam("") int formParam, // $InjectionAnnotation
113+
@HeaderParam("") int headerParam, // $InjectionAnnotation
114+
@MatrixParam("") int matrixParam, // $InjectionAnnotation
115+
@PathParam("") int pathParam, // $InjectionAnnotation
116+
@QueryParam("") int queryParam, // $InjectionAnnotation
111117
@Context int context) { // $InjectionAnnotation
112118
}
113119

@@ -120,14 +126,27 @@ class FooJakarta {
120126
FooJakarta() { // $BeanParamConstructor
121127
}
122128

123-
public FooJakarta(@BeanParam int beanParam, @CookieParam("") int cookieParam, @FormParam("") int formParam, // $InjectionAnnotation $BeanParamConstructor
124-
@HeaderParam("") int headerParam, @MatrixParam("") int matrixParam, @PathParam("") int pathParam, @QueryParam("") int queryParam, // $InjectionAnnotation
129+
public FooJakarta( // $BeanParamConstructor
130+
@BeanParam int beanParam, // $InjectionAnnotation
131+
@CookieParam("") int cookieParam, // $InjectionAnnotation
132+
@FormParam("") int formParam, // $InjectionAnnotation
133+
@HeaderParam("") int headerParam, // $InjectionAnnotation
134+
@MatrixParam("") int matrixParam, // $InjectionAnnotation
135+
@PathParam("") int pathParam, // $InjectionAnnotation
136+
@QueryParam("") int queryParam, // $InjectionAnnotation
125137
@Context int context) { // $InjectionAnnotation
126138
}
127139

128-
public FooJakarta(@BeanParam int beanParam, @CookieParam("") int cookieParam, @FormParam("") int formParam, // $InjectionAnnotation
129-
@HeaderParam("") int headerParam, @MatrixParam("") int matrixParam, @PathParam("") int pathParam, @QueryParam("") int queryParam, // $InjectionAnnotation
130-
@Context int context, int paramWithoutAnnotation) { // $InjectionAnnotation
140+
public FooJakarta(
141+
@BeanParam int beanParam, // $InjectionAnnotation
142+
@CookieParam("") int cookieParam, // $InjectionAnnotation
143+
@FormParam("") int formParam, // $InjectionAnnotation
144+
@HeaderParam("") int headerParam, // $InjectionAnnotation
145+
@MatrixParam("") int matrixParam, // $InjectionAnnotation
146+
@PathParam("") int pathParam, // $InjectionAnnotation
147+
@QueryParam("") int queryParam, // $InjectionAnnotation
148+
@Context int context, // $InjectionAnnotation
149+
int paramWithoutAnnotation) {
131150
}
132151
}
133152

‎java/ql/test/library-tests/frameworks/JaxWs/JakartaRs2.java

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,26 @@ class JakartaRs2 { // $RootResourceClass
2929
JakartaRs2() {
3030
}
3131

32-
public JakartaRs2(@BeanParam int beanParam, @CookieParam("") int cookieParam, @FormParam("") int formParam, // $InjectionAnnotation $InjectableConstructor
33-
@HeaderParam("") int headerParam, @MatrixParam("") int matrixParam, @PathParam("") int pathParam, @QueryParam("") int queryParam, // $InjectionAnnotation
32+
public JakartaRs2(// $InjectableConstructor
33+
@BeanParam int beanParam, // $InjectionAnnotation
34+
@CookieParam("") int cookieParam, // $InjectionAnnotation
35+
@FormParam("") int formParam, // $InjectionAnnotation
36+
@HeaderParam("") int headerParam, // $InjectionAnnotation
37+
@MatrixParam("") int matrixParam, // $InjectionAnnotation
38+
@PathParam("") int pathParam, // $InjectionAnnotation
39+
@QueryParam("") int queryParam, // $InjectionAnnotation
3440
@Context int context) { // $InjectionAnnotation
3541
}
3642

37-
public JakartaRs2(@BeanParam int beanParam, @CookieParam("") int cookieParam, @FormParam("") int formParam, // $InjectionAnnotation
38-
@HeaderParam("") int headerParam, @MatrixParam("") int matrixParam, @PathParam("") int pathParam, @QueryParam("") int queryParam, // $InjectionAnnotation
39-
@Context int context, int paramWithoutAnnotation) { // $InjectionAnnotation
43+
public JakartaRs2(@BeanParam int beanParam, // $InjectionAnnotation
44+
@CookieParam("") int cookieParam, // $InjectionAnnotation
45+
@FormParam("") int formParam, // $InjectionAnnotation
46+
@HeaderParam("") int headerParam, // $InjectionAnnotation
47+
@MatrixParam("") int matrixParam, // $InjectionAnnotation
48+
@PathParam("") int pathParam, // $InjectionAnnotation
49+
@QueryParam("") int queryParam, // $InjectionAnnotation
50+
@Context int context, // $InjectionAnnotation
51+
int paramWithoutAnnotation) {
4052
}
4153

4254
@BeanParam // $InjectionAnnotation

‎java/ql/test/library-tests/frameworks/JaxWs/JaxRs1.java

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,14 @@ class AnotherNonRootResourceClass { // $NonRootResourceClass
106106
public AnotherNonRootResourceClass() {
107107
}
108108

109-
public AnotherNonRootResourceClass(@BeanParam int beanParam, @CookieParam("") int cookieParam, @FormParam("") int formParam, // $InjectionAnnotation
110-
@HeaderParam("") int headerParam, @MatrixParam("") int matrixParam, @PathParam("") int pathParam, @QueryParam("") int queryParam, // $InjectionAnnotation
109+
public AnotherNonRootResourceClass(
110+
@BeanParam int beanParam, // $InjectionAnnotation
111+
@CookieParam("") int cookieParam, // $InjectionAnnotation
112+
@FormParam("") int formParam, // $InjectionAnnotation
113+
@HeaderParam("") int headerParam, // $InjectionAnnotation
114+
@MatrixParam("") int matrixParam, // $InjectionAnnotation
115+
@PathParam("") int pathParam, // $InjectionAnnotation
116+
@QueryParam("") int queryParam, // $InjectionAnnotation
111117
@Context int context) { // $InjectionAnnotation
112118
}
113119

@@ -120,14 +126,27 @@ class Foo {
120126
Foo() { // $BeanParamConstructor
121127
}
122128

123-
public Foo(@BeanParam int beanParam, @CookieParam("") int cookieParam, @FormParam("") int formParam, // $InjectionAnnotation $BeanParamConstructor
124-
@HeaderParam("") int headerParam, @MatrixParam("") int matrixParam, @PathParam("") int pathParam, @QueryParam("") int queryParam, // $InjectionAnnotation
129+
public Foo( // $BeanParamConstructor
130+
@BeanParam int beanParam, // $InjectionAnnotation
131+
@CookieParam("") int cookieParam, // $InjectionAnnotation
132+
@FormParam("") int formParam, // $InjectionAnnotation
133+
@HeaderParam("") int headerParam, // $InjectionAnnotation
134+
@MatrixParam("") int matrixParam, // $InjectionAnnotation
135+
@PathParam("") int pathParam, // $InjectionAnnotation
136+
@QueryParam("") int queryParam, // $InjectionAnnotation
125137
@Context int context) { // $InjectionAnnotation
126138
}
127139

128-
public Foo(@BeanParam int beanParam, @CookieParam("") int cookieParam, @FormParam("") int formParam, // $InjectionAnnotation
129-
@HeaderParam("") int headerParam, @MatrixParam("") int matrixParam, @PathParam("") int pathParam, @QueryParam("") int queryParam, // $InjectionAnnotation
130-
@Context int context, int paramWithoutAnnotation) { // $InjectionAnnotation
140+
public Foo(
141+
@BeanParam int beanParam, // $InjectionAnnotation
142+
@CookieParam("") int cookieParam, // $InjectionAnnotation
143+
@FormParam("") int formParam, // $InjectionAnnotation
144+
@HeaderParam("") int headerParam, // $InjectionAnnotation
145+
@MatrixParam("") int matrixParam, // $InjectionAnnotation
146+
@PathParam("") int pathParam, // $InjectionAnnotation
147+
@QueryParam("") int queryParam, // $InjectionAnnotation
148+
@Context int context, // $InjectionAnnotation
149+
int paramWithoutAnnotation) {
131150
}
132151
}
133152

‎java/ql/test/library-tests/frameworks/JaxWs/JaxRs2.java

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,27 @@ class JaxRs2 { // $RootResourceClass
2929
JaxRs2() {
3030
}
3131

32-
public JaxRs2(@BeanParam int beanParam, @CookieParam("") int cookieParam, @FormParam("") int formParam, // $InjectionAnnotation $InjectableConstructor
33-
@HeaderParam("") int headerParam, @MatrixParam("") int matrixParam, @PathParam("") int pathParam, @QueryParam("") int queryParam, // $InjectionAnnotation
32+
public JaxRs2(// $InjectableConstructor
33+
@BeanParam int beanParam, // $InjectionAnnotation
34+
@CookieParam("") int cookieParam, // $InjectionAnnotation
35+
@FormParam("") int formParam, // $InjectionAnnotation
36+
@HeaderParam("") int headerParam, // $InjectionAnnotation
37+
@MatrixParam("") int matrixParam, // $InjectionAnnotation
38+
@PathParam("") int pathParam, // $InjectionAnnotation
39+
@QueryParam("") int queryParam, // $InjectionAnnotation
3440
@Context int context) { // $InjectionAnnotation
3541
}
3642

37-
public JaxRs2(@BeanParam int beanParam, @CookieParam("") int cookieParam, @FormParam("") int formParam, // $InjectionAnnotation
38-
@HeaderParam("") int headerParam, @MatrixParam("") int matrixParam, @PathParam("") int pathParam, @QueryParam("") int queryParam, // $InjectionAnnotation
39-
@Context int context, int paramWithoutAnnotation) { // $InjectionAnnotation
43+
public JaxRs2(
44+
@BeanParam int beanParam, // $InjectionAnnotation
45+
@CookieParam("") int cookieParam, // $InjectionAnnotation
46+
@FormParam("") int formParam, // $InjectionAnnotation
47+
@HeaderParam("") int headerParam, // $InjectionAnnotation
48+
@MatrixParam("") int matrixParam, // $InjectionAnnotation
49+
@PathParam("") int pathParam, // $InjectionAnnotation
50+
@QueryParam("") int queryParam, // $InjectionAnnotation
51+
@Context int context, // $InjectionAnnotation
52+
int paramWithoutAnnotation) {
4053
}
4154

4255
@BeanParam // $InjectionAnnotation

0 commit comments

Comments
 (0)