Skip to content

Commit 6265455

Browse files
kusalkkusalk
authored
Merge pull request #1004 from apache/7.0.x/WW-5411-delete-deprecated-3
WW-5411 WW-5386 Delete final deprecated code
2 parents 5cd03aa + 1ecfbae commit 6265455

File tree

11 files changed

+17
-990
lines changed

11 files changed

+17
-990
lines changed

‎apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/Hangman.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,18 @@
2020
*/
2121
package org.apache.struts2.showcase.hangman;
2222

23+
import org.apache.logging.log4j.LogManager;
24+
import org.apache.logging.log4j.Logger;
25+
2326
import java.io.Serial;
2427
import java.io.Serializable;
2528
import java.util.ArrayList;
2629
import java.util.List;
2730

2831
public class Hangman implements Serializable {
2932

33+
private static final Logger log = LogManager.getLogger(Hangman.class);
34+
3035
@Serial
3136
private static final long serialVersionUID = 8566954355839652509L;
3237

@@ -64,8 +69,8 @@ public void guess(Character character) {
6469
}
6570
if (vocab.containsAllCharacter(charactersGuessed)) {
6671
win = true;
72+
log.info("Game won");
6773
}
68-
System.out.println(" *********************************** " + win);
6974
}
7075
}
7176

‎apps/showcase/src/main/resources/struts.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
"/>
4343
<constant name="struts.allowlist.classes" value="
4444
org.apache.struts2.showcase.hangman.Hangman,
45-
org.apache.struts2.showcase.hangman.HangmanConstants,
4645
org.apache.struts2.showcase.hangman.Vocab
4746
"/>
4847

‎apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/ifTag/testIf.jsp

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
* under the License.
1919
*/
2020
-->
21-
<%@page import="org.apache.struts2.showcase.hangman.HangmanConstants" %>
2221
<%@taglib prefix="s" uri="/struts-tags" %>
2322
<html>
2423
<head>
@@ -636,18 +635,5 @@
636635
</div>
637636
</div>
638637
</div>
639-
<br>
640-
<br>
641-
<p>
642-
A secondary test for this JSP visually verifies expression access to a public constant.
643-
A direct access to the same public constant via scriptlet provides secondary verification.
644-
</p>
645-
<br>
646-
<div>
647-
Test public static (constant) access (expression). Value: <s:property default="unavailable" value="@org.apache.struts2.showcase.hangman.HangmanConstants@HANGMAN_SESSION_KEY" />
648-
</div>
649-
<div>
650-
Test public static (constant) access (scriptlet). Value: <%=org.apache.struts2.showcase.hangman.HangmanConstants.HANGMAN_SESSION_KEY%>
651-
</div>
652638
</body>
653639
</html>

‎core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -103,22 +103,6 @@ protected void setEnableExpressionCache(String cache) {
103103
enableExpressionCache = BooleanUtils.toBoolean(cache);
104104
}
105105

106-
/**
107-
* @deprecated since 6.4.0, changing maximum cache size after initialisation is not necessary.
108-
*/
109-
@Deprecated
110-
protected void setExpressionCacheMaxSize(String maxSize) {
111-
expressionCache.setEvictionLimit(Integer.parseInt(maxSize));
112-
}
113-
114-
/**
115-
* @deprecated since 6.4.0, changing maximum cache size after initialisation is not necessary.
116-
*/
117-
@Deprecated
118-
protected void setBeanInfoCacheMaxSize(String maxSize) {
119-
beanInfoCache.setEvictionLimit(Integer.parseInt(maxSize));
120-
}
121-
122106
@Inject(value = StrutsConstants.STRUTS_OGNL_ENABLE_EVAL_EXPRESSION, required = false)
123107
protected void setEnableEvalExpression(String evalExpression) {
124108
this.enableEvalExpression = BooleanUtils.toBoolean(evalExpression);

‎core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java

Lines changed: 0 additions & 273 deletions
This file was deleted.

‎core/src/main/resources/struts-default.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
<interceptor name="debugging" class="org.apache.struts2.interceptor.debugging.DebuggingInterceptor"/>
5858
<interceptor name="execAndWait" class="org.apache.struts2.interceptor.ExecuteAndWaitInterceptor"/>
5959
<interceptor name="exception" class="com.opensymphony.xwork2.interceptor.ExceptionMappingInterceptor"/>
60-
<interceptor name="fileUpload" class="org.apache.struts2.interceptor.FileUploadInterceptor"/>
6160
<interceptor name="actionFileUpload" class="org.apache.struts2.interceptor.ActionFileUploadInterceptor"/>
6261
<interceptor name="i18n" class="org.apache.struts2.interceptor.I18nInterceptor"/>
6362
<interceptor name="logger" class="com.opensymphony.xwork2.interceptor.LoggingInterceptor"/>
@@ -114,12 +113,6 @@
114113
<interceptor-ref name="workflow"/>
115114
</interceptor-stack>
116115

117-
<!-- Sample file upload stack -->
118-
<interceptor-stack name="fileUploadStack">
119-
<interceptor-ref name="fileUpload"/>
120-
<interceptor-ref name="basicStack"/>
121-
</interceptor-stack>
122-
123116
<!-- Action based file upload stack -->
124117
<interceptor-stack name="actionFileUploadStack">
125118
<interceptor-ref name="actionFileUpload"/>
@@ -169,7 +162,6 @@
169162
<interceptor-ref name="prepare"/>
170163
<interceptor-ref name="chain"/>
171164
<interceptor-ref name="modelDriven"/>
172-
<interceptor-ref name="fileUpload"/>
173165
<interceptor-ref name="actionFileUpload"/>
174166
<interceptor-ref name="staticParams"/>
175167
<interceptor-ref name="actionMappingParams"/>
@@ -208,7 +200,6 @@
208200
<interceptor-ref name="chain"/>
209201
<interceptor-ref name="scopedModelDriven"/>
210202
<interceptor-ref name="modelDriven"/>
211-
<interceptor-ref name="fileUpload"/>
212203
<interceptor-ref name="actionFileUpload"/>
213204
<interceptor-ref name="checkbox"/>
214205
<interceptor-ref name="datetime"/>

0 commit comments

Comments
 (0)