This is an automated email from the ASF dual-hosted git repository.
mbien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/roller.git
commit a7237f9d979a8618e95db8f49e0bc9dd4a557ac7
Author: Michael Bien <mbie...@gmail.com>
AuthorDate: Thu Jul 8 10:36:52 2021 +0200
struts2: refactored deprecated ParameterAware to HttpParametersAware.
---
.../roller/weblogger/planet/ui/PlanetConfig.java | 20 +++++++++--------
.../weblogger/ui/struts2/admin/GlobalConfig.java | 25 ++++++++++------------
.../weblogger/ui/struts2/editor/Members.java | 24 ++++++++-------------
3 files changed, 31 insertions(+), 38 deletions(-)
diff --git
a/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java
b/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java
index ce9f1ff..8d24508 100644
--- a/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java
+++ b/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java
@@ -30,7 +30,9 @@ import org.apache.roller.weblogger.config.runtime.PropertyDef;
import org.apache.roller.weblogger.config.runtime.RuntimeConfigDefs;
import org.apache.roller.weblogger.pojos.GlobalPermission;
import org.apache.roller.weblogger.pojos.RuntimeConfigProperty;
-import org.apache.struts2.interceptor.ParameterAware;
+import org.apache.struts2.interceptor.HttpParametersAware;
+import org.apache.struts2.dispatcher.HttpParameters;
+import org.apache.struts2.dispatcher.Parameter;
import java.util.Collections;
import java.util.List;
@@ -43,12 +45,12 @@ import java.util.Map;
* Handles editing of planet global runtime properties.
*/
// TODO: make this work @AllowedMethods({"execute","save"})
-public class PlanetConfig extends PlanetUIAction implements ParameterAware {
+public class PlanetConfig extends PlanetUIAction implements
HttpParametersAware {
- private static Log log = LogFactory.getLog(PlanetConfig.class);
+ private static final Log log = LogFactory.getLog(PlanetConfig.class);
// original request parameters
- private Map parameters = Collections.EMPTY_MAP;
+ private HttpParameters parameters = HttpParameters.create().build();
// runtime properties data
private Map<String, RuntimeConfigProperty> properties =
Collections.emptyMap();
@@ -128,10 +130,10 @@ public class PlanetConfig extends PlanetUIAction
implements ParameterAware {
getProperties().put( propName, updProp);
}
- String[] propValues = (String[])
getParameters().get(updProp.getName());
- if (propValues != null && propValues.length > 0) {
+ Parameter param =
getParameters().get(updProp.getName());
+ if (param != null && param.getValue() != null) {
// we don't deal with multi-valued props
- incomingProp = propValues[0];
+ incomingProp = param.getValue();
}
// some special treatment for booleans
@@ -174,12 +176,12 @@ public class PlanetConfig extends PlanetUIAction
implements ParameterAware {
}
- public Map getParameters() {
+ public HttpParameters getParameters() {
return parameters;
}
@Override
- public void setParameters(Map parameters) {
+ public void setParameters(HttpParameters parameters) {
this.parameters = parameters;
}
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java
index b6b3166..1943378 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java
@@ -39,7 +39,9 @@ import
org.apache.roller.weblogger.pojos.RuntimeConfigProperty;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
import org.apache.roller.weblogger.util.Utilities;
-import org.apache.struts2.interceptor.ParameterAware;
+import org.apache.struts2.dispatcher.HttpParameters;
+import org.apache.struts2.dispatcher.Parameter;
+import org.apache.struts2.interceptor.HttpParametersAware;
import org.apache.struts2.interceptor.ServletRequestAware;
@@ -47,12 +49,12 @@ import org.apache.struts2.interceptor.ServletRequestAware;
* Action which handles editing of global configuration.
*/
// TODO: make this work @AllowedMethods({"execute","save"})
-public class GlobalConfig extends UIAction implements ParameterAware,
ServletRequestAware {
+public class GlobalConfig extends UIAction implements HttpParametersAware,
ServletRequestAware {
- private static Log log = LogFactory.getLog(GlobalConfig.class);
+ private static final Log log = LogFactory.getLog(GlobalConfig.class);
// the request parameters
- private Map<String, String[]> params = Collections.emptyMap();
+ private HttpParameters params = HttpParameters.create().build();
// map of config properties
private Map<String, RuntimeConfigProperty> properties =
Collections.emptyMap();
@@ -70,7 +72,7 @@ public class GlobalConfig extends UIAction implements
ParameterAware, ServletReq
// GET on the GlobalConfig!save URL and thus sets all checkboxes to false
private String httpMethod = "GET";
- private ResourceBundle bundle =
ResourceBundle.getBundle("ApplicationResources");
+ private final ResourceBundle bundle =
ResourceBundle.getBundle("ApplicationResources");
// weblogs for frontpage blog chooser
private Collection<Weblog> weblogs;
@@ -251,26 +253,21 @@ public class GlobalConfig extends UIAction implements
ParameterAware, ServletReq
@Override
- public void setParameters(Map<String, String[]> parameters) {
+ public void setParameters(HttpParameters parameters) {
this.params = parameters;
if (log.isDebugEnabled()) {
log.debug("Parameter map:");
- for (Map.Entry<String, String[]> entry : parameters.entrySet()) {
- log.debug(entry.getKey() + " = " +
Utilities.stringArrayToString(entry.getValue(),","));
+ for (Map.Entry<String, Parameter> entry : parameters.entrySet()) {
+ log.debug(entry.getKey() + " = " +
Utilities.stringArrayToString(entry.getValue().getMultipleValues(), ","));
}
}
}
// convenience method for getting a single parameter as a String
private String getParameter(String key) {
-
- String[] p = this.params.get(key);
- if (p != null && p.length > 0) {
- return p[0];
- }
- return null;
+ return this.params.get(key).getValue();
}
diff --git
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
index 8e7fb91..bda8961 100644
---
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
+++
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
@@ -19,7 +19,6 @@
package org.apache.roller.weblogger.ui.struts2.editor;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
import org.apache.commons.logging.Log;
@@ -31,8 +30,9 @@ import org.apache.roller.weblogger.pojos.User;
import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
import org.apache.roller.weblogger.util.Utilities;
-import org.apache.struts2.convention.annotation.AllowedMethods;
-import org.apache.struts2.interceptor.ParameterAware;
+import org.apache.struts2.dispatcher.HttpParameters;
+import org.apache.struts2.dispatcher.Parameter;
+import org.apache.struts2.interceptor.HttpParametersAware;
/**
@@ -42,12 +42,12 @@ import org.apache.struts2.interceptor.ParameterAware;
* website.permissions collection when a permission is deleted.
*/
// TODO: make this work @AllowedMethods({"execute","save"})
-public class Members extends UIAction implements ParameterAware {
+public class Members extends UIAction implements HttpParametersAware {
- private static Log log = LogFactory.getLog(Members.class);
+ private static final Log log = LogFactory.getLog(Members.class);
// raw parameters from request
- private Map parameters = Collections.EMPTY_MAP;
+ private HttpParameters parameters = HttpParameters.create().build();
public Members() {
@@ -155,22 +155,16 @@ public class Members extends UIAction implements
ParameterAware {
// convenience for accessing a single parameter with a single value
public String getParameter(String key) {
- if(key != null) {
- String[] value = (String[]) getParameters().get(key);
- if(value != null && value.length > 0) {
- return value[0];
- }
- }
- return null;
+ return parameters.get(key).getValue();
}
- public Map getParameters() {
+ public Map<String, Parameter> getParameters() {
return parameters;
}
@Override
- public void setParameters(Map parameters) {
+ public void setParameters(HttpParameters parameters) {
this.parameters = parameters;
}
