Skip to content

Commit 9195990

Browse files
kusalkkusalk
authored
Merge pull request #986 from apache/WW-5440-convention
WW-5440 Fix OGNL allowlist compat with Convention plugin
2 parents 0c4d664 + cec4679 commit 9195990

File tree

141 files changed

+969
-420
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+969
-420
lines changed

Diff for: ‎apps/rest-showcase/src/main/java/org/demo/rest/example/OrdersController.java

+13-11
Original file line numberDiff line numberDiff line change
@@ -18,30 +18,30 @@
1818
*/
1919
package org.demo.rest.example;
2020

21-
import java.util.Collection;
22-
21+
import com.opensymphony.xwork2.ModelDriven;
22+
import com.opensymphony.xwork2.Validateable;
23+
import com.opensymphony.xwork2.ValidationAwareSupport;
2324
import org.apache.logging.log4j.LogManager;
2425
import org.apache.logging.log4j.Logger;
26+
import org.apache.struts2.convention.annotation.Result;
27+
import org.apache.struts2.convention.annotation.Results;
28+
import org.apache.struts2.interceptor.parameter.StrutsParameter;
2529
import org.apache.struts2.rest.DefaultHttpHeaders;
2630
import org.apache.struts2.rest.HttpHeaders;
27-
import org.apache.struts2.convention.annotation.Results;
28-
import org.apache.struts2.convention.annotation.Result;
2931

30-
import com.opensymphony.xwork2.ModelDriven;
31-
import com.opensymphony.xwork2.Validateable;
32-
import com.opensymphony.xwork2.ValidationAwareSupport;
32+
import java.util.Collection;
3333

3434
@Results({
3535
@Result(name="success", type="redirectAction", params = {"actionName" , "orders"})
3636
})
37-
public class OrdersController extends ValidationAwareSupport implements ModelDriven<Object>, Validateable{
37+
public class OrdersController extends ValidationAwareSupport implements ModelDriven<Object>, Validateable {
3838

3939
private static final Logger log = LogManager.getLogger(OrdersController.class);
4040

4141
private Order model = new Order();
4242
private String id;
4343
private Collection<Order> list;
44-
private OrdersService ordersService = new OrdersService();
44+
private final OrdersService ordersService = new OrdersService();
4545

4646
// GET /orders/1
4747
public HttpHeaders show() {
@@ -54,7 +54,7 @@ public HttpHeaders index() {
5454
return new DefaultHttpHeaders("index")
5555
.disableCaching();
5656
}
57-
57+
5858
// GET /orders/1/edit
5959
public String edit() {
6060
return "edit";
@@ -101,13 +101,15 @@ public void validate() {
101101
}
102102
}
103103

104+
@StrutsParameter
104105
public void setId(String id) {
105106
if (id != null) {
106107
this.model = ordersService.get(id);
107108
}
108109
this.id = id;
109110
}
110-
111+
112+
@Override
111113
public Object getModel() {
112114
return (list != null ? list : model);
113115
}

Diff for: ‎apps/rest-showcase/src/main/java/org/demo/rest/example/OrdersService.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,14 @@
1818
*/
1919
package org.demo.rest.example;
2020

21-
import java.util.*;
21+
import java.util.ArrayList;
22+
import java.util.HashMap;
23+
import java.util.List;
24+
import java.util.Map;
2225

2326
public class OrdersService {
2427

25-
private static Map<String,Order> orders = new HashMap<String,Order>();
28+
private static final Map<String,Order> orders = new HashMap<>();
2629
private static int nextId = 6;
2730
static {
2831
orders.put("3", new Order("3", "Bob", 33));

Diff for: ‎apps/showcase/pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,12 @@
137137
<scope>test</scope>
138138
</dependency>
139139

140+
<dependency>
141+
<groupId>org.assertj</groupId>
142+
<artifactId>assertj-core</artifactId>
143+
<scope>test</scope>
144+
</dependency>
145+
140146
<dependency>
141147
<groupId>net.sourceforge.htmlunit</groupId>
142148
<artifactId>htmlunit</artifactId>

Diff for: ‎apps/showcase/src/main/java/org/apache/struts2/showcase/DynamicTreeSelectAction.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
package org.apache.struts2.showcase;
2222

2323
import com.opensymphony.xwork2.ActionSupport;
24+
import org.apache.struts2.interceptor.parameter.StrutsParameter;
2425
import org.apache.struts2.showcase.ajax.tree.Category;
2526

2627
//START SNIPPET: treeExampleDynamicJavaSelected
@@ -30,7 +31,7 @@ public class DynamicTreeSelectAction extends ActionSupport {
3031
private long nodeId;
3132
private Category currentCategory;
3233

33-
34+
@StrutsParameter
3435
public void setNodeId(long nodeId) {
3536
this.nodeId = nodeId;
3637
}

Diff for: ‎apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfOptiontransferselectAction.java

+16-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
package org.apache.struts2.showcase;
2222

2323
import com.opensymphony.xwork2.ActionSupport;
24+
import org.apache.struts2.interceptor.parameter.StrutsParameter;
2425

2526
import java.util.ArrayList;
2627
import java.util.LinkedHashMap;
@@ -74,6 +75,7 @@ public List getFavouriteCartoonCharacters() {
7475
return _favouriteCartoonCharactersKeys;
7576
}
7677

78+
@StrutsParameter
7779
public void setFavouriteCartoonCharacters(List favouriteCartoonCharacters) {
7880
_favouriteCartoonCharactersKeys = favouriteCartoonCharacters;
7981
}
@@ -82,6 +84,7 @@ public List getNotFavouriteCartoonCharacters() {
8284
return _notFavouriteCartoonCharactersKeys;
8385
}
8486

87+
@StrutsParameter
8588
public void setNotFavouriteCartoonCharacters(List notFavouriteCartoonCharacters) {
8689
_notFavouriteCartoonCharactersKeys = notFavouriteCartoonCharacters;
8790
}
@@ -108,6 +111,7 @@ public List getFavouriteCars() {
108111
return _favouriteCarsKeys;
109112
}
110113

114+
@StrutsParameter
111115
public void setFavouriteCars(List favouriteCars) {
112116
_favouriteCarsKeys = favouriteCars;
113117
}
@@ -116,6 +120,7 @@ public List getNotFavouriteCars() {
116120
return _notFavouriteCarsKeys;
117121
}
118122

123+
@StrutsParameter
119124
public void setNotFavouriteCars(List notFavouriteCars) {
120125
_notFavouriteCarsKeys = notFavouriteCars;
121126
}
@@ -142,6 +147,7 @@ public List getFavouriteMotorcycles() {
142147
return _favouriteMotorcyclesKeys;
143148
}
144149

150+
@StrutsParameter
145151
public void setFavouriteMotorcycles(List favouriteMotorcycles) {
146152
_favouriteMotorcyclesKeys = favouriteMotorcycles;
147153
}
@@ -150,6 +156,7 @@ public List getNotFavouriteMotorcycles() {
150156
return _notFavouriteMotorcyclesKeys;
151157
}
152158

159+
@StrutsParameter
153160
public void setNotFavouriteMotorcycles(List notFavouriteMotorcycles) {
154161
_notFavouriteMotorcyclesKeys = notFavouriteMotorcycles;
155162
}
@@ -176,6 +183,7 @@ public List getFavouriteCountries() {
176183
return _favouriteCountriesKeys;
177184
}
178185

186+
@StrutsParameter
179187
public void setFavouriteCountries(List favouriteCountries) {
180188
_favouriteCountriesKeys = favouriteCountries;
181189
}
@@ -184,6 +192,7 @@ public List getNotFavouriteCountries() {
184192
return _notFavouriteCountriesKeys;
185193
}
186194

195+
@StrutsParameter
187196
public void setNotFavouriteCountries(List notFavouriteCountries) {
188197
_notFavouriteCountriesKeys = notFavouriteCountries;
189198
}
@@ -205,6 +214,7 @@ public List getFavouriteSports() {
205214
return _favouriteSportsKeys;
206215
}
207216

217+
@StrutsParameter
208218
public void setFavouriteSports(List favouriteSportsKeys) {
209219
this._favouriteSportsKeys = favouriteSportsKeys;
210220
}
@@ -213,6 +223,7 @@ public List getNonFavouriteSports() {
213223
return _nonFavouriteSportsKeys;
214224
}
215225

226+
@StrutsParameter
216227
public void setNonFavouriteSports(List notFavouriteSportsKeys) {
217228
this._nonFavouriteSportsKeys = notFavouriteSportsKeys;
218229
}
@@ -222,6 +233,7 @@ public List getPrioritisedFavouriteCartoonCharacters() {
222233
return _prioritisedFavouriteCartoonCharacters;
223234
}
224235

236+
@StrutsParameter
225237
public void setPrioritisedFavouriteCartoonCharacters(List prioritisedFavouriteCartoonCharacters) {
226238
_prioritisedFavouriteCartoonCharacters = prioritisedFavouriteCartoonCharacters;
227239
}
@@ -230,6 +242,7 @@ public List getPrioritisedFavouriteCars() {
230242
return _prioritisedFavouriteCars;
231243
}
232244

245+
@StrutsParameter
233246
public void setPrioritisedFavouriteCars(List prioritisedFavouriteCars) {
234247
_prioritisedFavouriteCars = prioritisedFavouriteCars;
235248
}
@@ -239,6 +252,7 @@ public List getPrioritisedFavouriteCountries() {
239252
return _prioritisedFavouriteCountries;
240253
}
241254

255+
@StrutsParameter
242256
public void setPrioritisedFavouriteCountries(List prioritisedFavouriteCountries) {
243257
_prioritisedFavouriteCountries = prioritisedFavouriteCountries;
244258
}
@@ -264,12 +278,13 @@ public List getFavouriteCities() {
264278
return _favouriteCities;
265279
}
266280

281+
@StrutsParameter
267282
public void setFavouriteCities(List favouriteCities) {
268283
this._favouriteCities = favouriteCities;
269284
}
270285

271286
// actions
272-
287+
@Override
273288
public String input() throws Exception {
274289
return SUCCESS;
275290
}

Diff for: ‎apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfRichtexteditorAction.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
package org.apache.struts2.showcase;
2222

2323
import com.opensymphony.xwork2.ActionSupport;
24+
import org.apache.struts2.interceptor.parameter.StrutsParameter;
2425

2526
/**
2627
*
@@ -36,6 +37,7 @@ public String getDescription1() {
3637
return this.description1;
3738
}
3839

40+
@StrutsParameter
3941
public void setDescription1(String description1) {
4042
this.description1 = description1;
4143
}
@@ -45,6 +47,7 @@ public String getDescription2() {
4547
return this.description2;
4648
}
4749

50+
@StrutsParameter
4851
public void setDescription2(String description2) {
4952
this.description2 = description2;
5053
}
@@ -54,6 +57,7 @@ public String getDescription3() {
5457
return this.description3;
5558
}
5659

60+
@StrutsParameter
5761
public void setDescription3(String description3) {
5862
this.description3 = description3;
5963
}
@@ -63,11 +67,12 @@ public String getDescription4() {
6367
return this.description4;
6468
}
6569

70+
@StrutsParameter
6671
public void setDescription4(String description4) {
6772
this.description4 = description4;
6873
}
6974

70-
75+
@Override
7176
public String input() throws Exception {
7277
return SUCCESS;
7378
}

Diff for: ‎apps/showcase/src/main/java/org/apache/struts2/showcase/MoreSelectsAction.java

+7-3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
package org.apache.struts2.showcase;
2222

2323
import com.opensymphony.xwork2.ActionSupport;
24+
import org.apache.struts2.interceptor.parameter.StrutsParameter;
2425

2526
import java.util.ArrayList;
2627
import java.util.LinkedHashMap;
@@ -75,11 +76,11 @@ public List getDefaultFavouriteNumbers() {
7576
return list;
7677
}
7778

78-
7979
public List getPrioritisedFavouriteCartoonCharacters() {
8080
return _prioritisedFavouriteCartoonCharacters;
8181
}
8282

83+
@StrutsParameter
8384
public void setPrioritisedFavouriteCartoonCharacters(List prioritisedFavouriteCartoonCharacters) {
8485
_prioritisedFavouriteCartoonCharacters = prioritisedFavouriteCartoonCharacters;
8586
}
@@ -88,15 +89,16 @@ public List getPrioritisedFavouriteCars() {
8889
return _prioritisedFavouriteCars;
8990
}
9091

92+
@StrutsParameter
9193
public void setPrioritisedFavouriteCars(List prioritisedFavouriteCars) {
9294
_prioritisedFavouriteCars = prioritisedFavouriteCars;
9395
}
9496

95-
9697
public List getPrioritisedFavouriteCountries() {
9798
return _prioritisedFavouriteCountries;
9899
}
99100

101+
@StrutsParameter
100102
public void setPrioritisedFavouriteCountries(List prioritisedFavouriteCountries) {
101103
_prioritisedFavouriteCountries = prioritisedFavouriteCountries;
102104
}
@@ -105,6 +107,7 @@ public List getFavouriteNumbers() {
105107
return favouriteNumbers;
106108
}
107109

110+
@StrutsParameter
108111
public void setFavouriteNumbers(List favouriteNumbers) {
109112
this.favouriteNumbers = favouriteNumbers;
110113
}
@@ -129,12 +132,13 @@ public List getFavouriteCities() {
129132
return favouriteCities;
130133
}
131134

135+
@StrutsParameter
132136
public void setFavouriteCities(List favouriteCities) {
133137
this.favouriteCities = favouriteCities;
134138
}
135139

136140
// actions
137-
141+
@Override
138142
public String input() throws Exception {
139143
return SUCCESS;
140144
}

Diff for: ‎apps/showcase/src/main/java/org/apache/struts2/showcase/ShowAjaxDynamicTreeAction.java

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
package org.apache.struts2.showcase;
2222

2323
import com.opensymphony.xwork2.ActionSupport;
24+
import org.apache.struts2.interceptor.parameter.StrutsParameter;
2425
import org.apache.struts2.showcase.ajax.tree.Category;
2526

2627
public class ShowAjaxDynamicTreeAction extends ActionSupport {
@@ -34,6 +35,7 @@ public int getNodeId() {
3435
return nodeId;
3536
}
3637

38+
@StrutsParameter
3739
public void setNodeId(int nodeId) {
3840
this.nodeId = nodeId;
3941
}

0 commit comments

Comments
 (0)