You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by jo...@apache.org on 2015/06/08 19:27:20 UTC
[2/5] struts git commit: Minor code improvements's in the struts core
module
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/main/java/org/apache/struts2/util/IteratorGenerator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/util/IteratorGenerator.java b/core/src/main/java/org/apache/struts2/util/IteratorGenerator.java
index 1d005c2..f211154 100644
--- a/core/src/main/java/org/apache/struts2/util/IteratorGenerator.java
+++ b/core/src/main/java/org/apache/struts2/util/IteratorGenerator.java
@@ -21,15 +21,15 @@
package org.apache.struts2.util;
+import com.opensymphony.xwork2.Action;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.StringTokenizer;
-import com.opensymphony.xwork2.Action;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
-
/**
* A bean that generates an iterator filled with a given object depending on the count,
@@ -93,9 +93,7 @@ public class IteratorGenerator implements Iterator, Action {
values.add(convertedObj);
}
catch(Exception e) { // make sure things, goes on, we just ignore the bad ones
- if (LOG.isWarnEnabled()) {
- LOG.warn("unable to convert ["+token+"], skipping this token, it will not appear in the generated iterator", e);
- }
+ LOG.warn("Unable to convert [{}], skipping this token, it will not appear in the generated iterator", token, e);
}
}
else {
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/main/java/org/apache/struts2/util/RegexPatternMatcher.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/util/RegexPatternMatcher.java b/core/src/main/java/org/apache/struts2/util/RegexPatternMatcher.java
index 0f90365..f550b68 100644
--- a/core/src/main/java/org/apache/struts2/util/RegexPatternMatcher.java
+++ b/core/src/main/java/org/apache/struts2/util/RegexPatternMatcher.java
@@ -49,7 +49,7 @@ public class RegexPatternMatcher implements PatternMatcher<RegexPatternMatcherEx
private static final Pattern PATTERN = Pattern.compile("\\{(.*?)\\}");
public RegexPatternMatcherExpression compilePattern(String data) {
- Map<Integer, String> params = new HashMap<Integer, String>();
+ Map<Integer, String> params = new HashMap<>();
Matcher matcher = PATTERN.matcher(data);
int count = 0;
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/main/java/org/apache/struts2/util/SortIteratorFilter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/util/SortIteratorFilter.java b/core/src/main/java/org/apache/struts2/util/SortIteratorFilter.java
index f57b5e6..b5850ff 100644
--- a/core/src/main/java/org/apache/struts2/util/SortIteratorFilter.java
+++ b/core/src/main/java/org/apache/struts2/util/SortIteratorFilter.java
@@ -21,14 +21,11 @@
package org.apache.struts2.util;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-
import com.opensymphony.xwork2.Action;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.util.*;
/**
@@ -38,6 +35,7 @@ import org.apache.logging.log4j.LogManager;
* @see org.apache.struts2.views.jsp.iterator.SortIteratorTag
*/
public class SortIteratorFilter extends IteratorFilterSupport implements Iterator, Action {
+ private static final Logger LOG = LogManager.getLogger(IteratorGenerator.class);
Comparator comparator;
Iterator iterator;
@@ -67,8 +65,7 @@ public class SortIteratorFilter extends IteratorFilterSupport implements Iterato
} else {
try {
if (!MakeIterator.isIterable(source)) {
- LogManager.getLogger(SortIteratorFilter.class.getName()).warn("Cannot create SortIterator for source " + source);
-
+ LOG.warn("Cannot create SortIterator for source: {}", source);
return ERROR;
}
@@ -86,8 +83,7 @@ public class SortIteratorFilter extends IteratorFilterSupport implements Iterato
return SUCCESS;
} catch (Exception e) {
- LogManager.getLogger(SortIteratorFilter.class.getName()).warn("Error creating sort iterator.", e);
-
+ LOG.warn("Error creating sort iterator.", e);
return ERROR;
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java b/core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java
index 546c74d..0d2e7c6 100644
--- a/core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java
+++ b/core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java
@@ -21,21 +21,19 @@
package org.apache.struts2.util;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.opensymphony.xwork2.inject.Container;
-import org.apache.struts2.dispatcher.Dispatcher;
-
import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.util.LocalizedTextUtil;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
+import org.apache.struts2.dispatcher.Dispatcher;
import org.apache.struts2.dispatcher.DispatcherErrorHandler;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.Map;
/**
* Generic test setup methods to be used with any unit testing framework.
@@ -52,7 +50,7 @@ public class StrutsTestCaseHelper {
public static Dispatcher initDispatcher(ServletContext ctx, Map<String,String> params) {
if (params == null) {
- params = new HashMap<String,String>();
+ params = new HashMap<>();
}
Dispatcher du = new DispatcherWrapper(ctx, params);
du.init();
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/main/java/org/apache/struts2/util/StrutsUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/util/StrutsUtil.java b/core/src/main/java/org/apache/struts2/util/StrutsUtil.java
index 2641109..fad2c36 100644
--- a/core/src/main/java/org/apache/struts2/util/StrutsUtil.java
+++ b/core/src/main/java/org/apache/struts2/util/StrutsUtil.java
@@ -27,8 +27,8 @@ import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.util.ClassLoaderUtil;
import com.opensymphony.xwork2.util.TextParseUtil;
import com.opensymphony.xwork2.util.ValueStack;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.struts2.views.jsp.ui.OgnlTool;
import org.apache.struts2.views.util.UrlHelper;
@@ -42,12 +42,7 @@ import java.io.PrintWriter;
import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* Struts base utility class, for use in Velocity and Freemarker templates
@@ -58,7 +53,7 @@ public class StrutsUtil {
protected HttpServletRequest request;
protected HttpServletResponse response;
- protected Map<String, Class> classes = new Hashtable<String, Class>();
+ protected Map<String, Class> classes = new Hashtable<>();
protected OgnlTool ognl;
protected ValueStack stack;
@@ -117,9 +112,7 @@ public class StrutsUtil {
return responseWrapper.getData();
}
catch (Exception e) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Cannot include {}", e, aName.toString());
- }
+ LOG.debug("Cannot include {}", aName.toString(), e);
throw e;
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/main/java/org/apache/struts2/util/TextProviderHelper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/util/TextProviderHelper.java b/core/src/main/java/org/apache/struts2/util/TextProviderHelper.java
index 6449667..1c19a2f 100644
--- a/core/src/main/java/org/apache/struts2/util/TextProviderHelper.java
+++ b/core/src/main/java/org/apache/struts2/util/TextProviderHelper.java
@@ -23,8 +23,8 @@ package org.apache.struts2.util;
import com.opensymphony.xwork2.TextProvider;
import com.opensymphony.xwork2.util.ValueStack;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import java.util.Collections;
import java.util.List;
@@ -79,7 +79,7 @@ public class TextProviderHelper {
}
if (msg == null) {
- // evaluate the defaultMesage as an OGNL expression
+ // evaluate the defaultMessage as an OGNL expression
if (searchStack)
msg = stack.findString(defaultMessage);
@@ -90,14 +90,14 @@ public class TextProviderHelper {
if (LOG.isWarnEnabled()) {
if (tp != null) {
- LOG.warn("The first TextProvider in the ValueStack ("+tp.getClass().getName()+") could not locate the message resource with key '"+key+"'");
+ LOG.warn("The first TextProvider in the ValueStack ({}) could not locate the message resource with key '{}'", tp.getClass().getName(), key);
} else {
- LOG.warn("Could not locate the message resource '"+key+"' as there is no TextProvider in the ValueStack.");
+ LOG.warn("Could not locate the message resource '{}' as there is no TextProvider in the ValueStack.", key);
}
if (defaultMessage.equals(msg)) {
- LOG.warn("The default value expression '"+defaultMessage+"' was evaluated and did not match a property. The literal value '"+defaultMessage+"' will be used.");
+ LOG.warn("The default value expression '{}' was evaluated and did not match a property. The literal value '{}' will be used.", defaultMessage, defaultMessage);
} else {
- LOG.warn("The default value expression '"+defaultMessage+"' evaluated to '"+msg+"'");
+ LOG.warn("The default value expression '{}' evaluated to '{}'", defaultMessage, msg);
}
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/main/java/org/apache/struts2/util/TokenHelper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/util/TokenHelper.java b/core/src/main/java/org/apache/struts2/util/TokenHelper.java
index c19a3ba..d6e042e 100644
--- a/core/src/main/java/org/apache/struts2/util/TokenHelper.java
+++ b/core/src/main/java/org/apache/struts2/util/TokenHelper.java
@@ -23,8 +23,8 @@ package org.apache.struts2.util;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.util.LocalizedTextUtil;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import java.math.BigInteger;
import java.security.SecureRandom;
@@ -91,11 +91,9 @@ public class TokenHelper {
session.put(buildTokenSessionAttributeName(tokenName), token);
} catch ( IllegalStateException e ) {
// WW-1182 explain to user what the problem is
- String msg = "Error creating HttpSession due response is commited to client. You can use the CreateSessionInterceptor or create the HttpSession from your action before the result is rendered to the client: " + e.getMessage();
- if (LOG.isErrorEnabled()) {
- LOG.error(msg, e);
- }
- throw new IllegalArgumentException(msg);
+ String msg = "Error creating HttpSession due response is committed to client. You can use the CreateSessionInterceptor or create the HttpSession from your action before the result is rendered to the client: " + e.getMessage();
+ LOG.error(msg, e);
+ throw new IllegalArgumentException(msg);
}
}
@@ -135,15 +133,11 @@ public class TokenHelper {
String token;
if ((tokens == null) || (tokens.length < 1)) {
- if (LOG.isWarnEnabled()) {
- LOG.warn("Could not find token mapped to token name " + tokenName);
- }
-
+ LOG.warn("Could not find token mapped to token name: {}", tokenName);
return null;
}
token = tokens[0];
-
return token;
}
@@ -156,10 +150,7 @@ public class TokenHelper {
Map params = ActionContext.getContext().getParameters();
if (!params.containsKey(TOKEN_NAME_FIELD)) {
- if (LOG.isWarnEnabled()) {
LOG.warn("Could not find token name in params.");
- }
-
return null;
}
@@ -167,15 +158,11 @@ public class TokenHelper {
String tokenName;
if ((tokenNames == null) || (tokenNames.length < 1)) {
- if (LOG.isWarnEnabled()) {
LOG.warn("Got a null or empty token name.");
- }
-
return null;
}
tokenName = tokenNames[0];
-
return tokenName;
}
@@ -189,18 +176,14 @@ public class TokenHelper {
String tokenName = getTokenName();
if (tokenName == null) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("no token name found -> Invalid token ");
- }
+ LOG.debug("No token name found -> Invalid token ");
return false;
}
String token = getToken(tokenName);
if (token == null) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("no token found for token name "+tokenName+" -> Invalid token ");
- }
+ LOG.debug("No token found for token name {} -> Invalid token ", tokenName);
return false;
}
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
index c221915..f32a5a6 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
@@ -27,24 +27,16 @@ import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.ClassLoaderUtil;
import com.opensymphony.xwork2.util.ValueStack;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
-import freemarker.cache.ClassTemplateLoader;
-import freemarker.cache.FileTemplateLoader;
-import freemarker.cache.MultiTemplateLoader;
-import freemarker.cache.TemplateLoader;
-import freemarker.cache.WebappTemplateLoader;
+import freemarker.cache.*;
import freemarker.ext.jsp.TaglibFactory;
import freemarker.ext.servlet.HttpRequestHashModel;
import freemarker.ext.servlet.HttpRequestParametersHashModel;
import freemarker.ext.servlet.HttpSessionHashModel;
import freemarker.ext.servlet.ServletContextHashModel;
-import freemarker.template.Configuration;
-import freemarker.template.ObjectWrapper;
-import freemarker.template.TemplateException;
-import freemarker.template.TemplateExceptionHandler;
-import freemarker.template.TemplateModel;
+import freemarker.template.*;
import freemarker.template.utility.StringUtil;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.views.JspSupportServlet;
import org.apache.struts2.views.TagLibrary;
@@ -60,13 +52,7 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
+import java.util.*;
/**
@@ -210,14 +196,14 @@ public class FreemarkerManager {
@Inject
public void setContainer(Container container) {
- Map<String,TagLibraryModelProvider> map = new HashMap<String,TagLibraryModelProvider>();
+ Map<String, TagLibraryModelProvider> map = new HashMap<>();
Set<String> prefixes = container.getInstanceNames(TagLibraryModelProvider.class);
for (String prefix : prefixes) {
map.put(prefix, container.getInstance(TagLibraryModelProvider.class, prefix));
}
this.tagLibraries = Collections.unmodifiableMap(map);
- Map<String, TagLibrary> oldMap = new HashMap<String, TagLibrary>();
+ Map<String, TagLibrary> oldMap = new HashMap<>();
Set<String> oldPrefixes = container.getInstanceNames(TagLibrary.class);
for (String prefix : oldPrefixes) {
oldMap.put(prefix, container.getInstance(TagLibrary.class, prefix));
@@ -268,9 +254,7 @@ public class FreemarkerManager {
try {
init(servletContext);
} catch (TemplateException e) {
- if (LOG.isErrorEnabled()) {
- LOG.error("Cannot load freemarker configuration: ",e);
- }
+ LOG.error("Cannot load freemarker configuration: ", e);
}
// store this configuration in the servlet context
servletContext.setAttribute(CONFIG_SERVLET_CONTEXT_KEY, config);
@@ -287,9 +271,7 @@ public class FreemarkerManager {
// Process object_wrapper init-param out of order:
wrapper = createObjectWrapper(servletContext);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Using object wrapper of class " + wrapper.getClass().getName());
- }
+ LOG.debug("Using object wrapper of class {}", wrapper.getClass().getName());
config.setObjectWrapper(wrapper);
// Process TemplatePath init-param out of order:
@@ -480,21 +462,15 @@ public class FreemarkerManager {
}
}
} catch (IOException e) {
- if (LOG.isErrorEnabled()) {
- LOG.error("Error while loading freemarker settings from /freemarker.properties", e);
- }
+ LOG.error("Error while loading freemarker settings from /freemarker.properties", e);
} catch (TemplateException e) {
- if (LOG.isErrorEnabled()) {
- LOG.error("Error while loading freemarker settings from /freemarker.properties", e);
- }
+ LOG.error("Error while loading freemarker settings from /freemarker.properties", e);
} finally {
if (in != null) {
try {
in.close();
} catch(IOException io) {
- if (LOG.isWarnEnabled()) {
- LOG.warn("Unable to close input stream", io);
- }
+ LOG.warn("Unable to close input stream", io);
}
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/main/java/org/apache/struts2/views/freemarker/ScopesHashModel.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/ScopesHashModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/ScopesHashModel.java
index f74d213..47ea5ef 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/ScopesHashModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/ScopesHashModel.java
@@ -50,7 +50,7 @@ public class ScopesHashModel extends SimpleHash implements TemplateModel {
private HttpServletRequest request;
private ServletContext servletContext;
private ValueStack stack;
- private final Map<String,TemplateModel> unlistedModels = new HashMap<String,TemplateModel>();
+ private final Map<String, TemplateModel> unlistedModels = new HashMap<>();
private volatile Object parametersCache;
public ScopesHashModel(ObjectWrapper objectWrapper, ServletContext context, HttpServletRequest request, ValueStack stack) {
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java
index 81ac85c..e9d229a 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java
@@ -21,16 +21,15 @@
package org.apache.struts2.views.jsp.iterator;
-import javax.servlet.jsp.JspException;
-
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.struts2.util.IteratorGenerator;
import org.apache.struts2.util.IteratorGenerator.Converter;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import org.apache.struts2.views.jsp.StrutsBodyTagSupport;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
+import javax.servlet.jsp.JspException;
/**
@@ -206,9 +205,7 @@ public class IteratorGeneratorTag extends StrutsBodyTagSupport {
count = Integer.parseInt((String)countObj);
}
catch(NumberFormatException e) {
- if (LOG.isWarnEnabled()) {
- LOG.warn("unable to convert count attribute ["+countObj+"] to number, ignore count attribute", e);
- }
+ LOG.warn("Unable to convert count attribute [{}] to number, ignore count attribute", countObj, e);
}
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java
index 0149f59..aa702da 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java
@@ -21,16 +21,15 @@
package org.apache.struts2.views.jsp.iterator;
-import javax.servlet.jsp.JspException;
-
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.struts2.util.SubsetIteratorFilter;
import org.apache.struts2.util.SubsetIteratorFilter.Decider;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import org.apache.struts2.views.jsp.StrutsBodyTagSupport;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
+import javax.servlet.jsp.JspException;
/**
@@ -223,9 +222,7 @@ public class SubsetIteratorTag extends StrutsBodyTagSupport {
count = Integer.parseInt((String)countObj);
}
catch(NumberFormatException e) {
- if (LOG.isWarnEnabled()) {
- LOG.warn("unable to convert count attribute ["+countObj+"] to number, ignore count attribute", e);
- }
+ LOG.warn("unable to convert count attribute [{}] to number, ignore count attribute", countObj, e);
}
}
}
@@ -251,9 +248,7 @@ public class SubsetIteratorTag extends StrutsBodyTagSupport {
start = Integer.parseInt((String)startObj);
}
catch(NumberFormatException e) {
- if (LOG.isWarnEnabled()) {
- LOG.warn("unable to convert count attribute ["+startObj+"] to number, ignore count attribute", e);
- }
+ LOG.warn("unable to convert count attribute [{}] to number, ignore count attribute", startObj, e);
}
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
index 65b80cf..4b65e11 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
@@ -82,7 +82,7 @@ public abstract class AbstractUITag extends ComponentTagSupport implements Dynam
protected String tooltipIconPath;
// dynamic attributes.
- protected Map<String, Object> dynamicAttributes = new HashMap<String, Object>();
+ protected Map<String, Object> dynamicAttributes = new HashMap<>();
protected void populateParams() {
super.populateParams();
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITagBeanInfo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITagBeanInfo.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITagBeanInfo.java
index aa6379d..c521c99 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITagBeanInfo.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITagBeanInfo.java
@@ -21,8 +21,8 @@
package org.apache.struts2.views.jsp.ui;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import java.beans.PropertyDescriptor;
import java.beans.SimpleBeanInfo;
@@ -42,7 +42,7 @@ public class AbstractUITagBeanInfo extends SimpleBeanInfo {
@Override
public PropertyDescriptor[] getPropertyDescriptors() {
try {
- List<PropertyDescriptor> descriptors = new ArrayList<PropertyDescriptor>();
+ List<PropertyDescriptor> descriptors = new ArrayList<>();
// Add the tricky one first
Method classSetter = AbstractUITag.class.getMethod("setCssClass", String.class);
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java
index 9efedc4..3257cae 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java
@@ -21,13 +21,13 @@
package org.apache.struts2.views.jsp.ui;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.commons.lang3.BooleanUtils;
import org.apache.struts2.components.Anchor;
import org.apache.struts2.components.Component;
-import com.opensymphony.xwork2.util.ValueStack;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
/**
* @see Anchor
@@ -72,16 +72,16 @@ public class AnchorTag extends AbstractClosingTag {
tag.setAnchor(anchor);
if (encode != null) {
- tag.setEncode(Boolean.valueOf(encode).booleanValue());
+ tag.setEncode(BooleanUtils.toBoolean(encode));
}
if (includeContext != null) {
- tag.setIncludeContext(Boolean.valueOf(includeContext).booleanValue());
+ tag.setIncludeContext(BooleanUtils.toBoolean(includeContext));
}
if (escapeAmp != null) {
- tag.setEscapeAmp(Boolean.valueOf(escapeAmp).booleanValue());
+ tag.setEscapeAmp(BooleanUtils.toBoolean(escapeAmp));
}
if (forceAddSchemeHostAndPort != null) {
- tag.setForceAddSchemeHostAndPort(Boolean.valueOf(forceAddSchemeHostAndPort).booleanValue());
+ tag.setForceAddSchemeHostAndPort(BooleanUtils.toBoolean(forceAddSchemeHostAndPort));
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/main/java/org/apache/struts2/views/util/DefaultUrlHelper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/views/util/DefaultUrlHelper.java b/core/src/main/java/org/apache/struts2/views/util/DefaultUrlHelper.java
index ab9c4dc..9459b7d 100644
--- a/core/src/main/java/org/apache/struts2/views/util/DefaultUrlHelper.java
+++ b/core/src/main/java/org/apache/struts2/views/util/DefaultUrlHelper.java
@@ -22,10 +22,10 @@
package org.apache.struts2.views.util;
import com.opensymphony.xwork2.inject.Inject;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.struts2.StrutsConstants;
import javax.servlet.http.HttpServletRequest;
@@ -33,12 +33,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* Default implementation of UrlHelper
@@ -187,9 +182,7 @@ public class DefaultUrlHelper implements UrlHelper {
try {
result = encodeResult ? response.encodeURL(result) : result;
} catch (Exception ex) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Could not encode the URL for some reason, use it unchanged", ex);
- }
+ LOG.debug("Could not encode the URL for some reason, use it unchanged", ex);
result = link.toString();
}
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java b/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java
index 51aff4a..f60a10f 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java
@@ -25,9 +25,9 @@ import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.ValueStack;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.StrutsException;
@@ -51,14 +51,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.StringTokenizer;
+import java.util.*;
/**
@@ -110,14 +103,14 @@ public class VelocityManager {
@Inject
public void setContainer(Container container) {
- List<TagLibraryDirectiveProvider> list = new ArrayList<TagLibraryDirectiveProvider>();
+ List<TagLibraryDirectiveProvider> list = new ArrayList<>();
Set<String> prefixes = container.getInstanceNames(TagLibraryDirectiveProvider.class);
for (String prefix : prefixes) {
list.add(container.getInstance(TagLibraryDirectiveProvider.class, prefix));
}
this.tagLibraries = Collections.unmodifiableList(list);
- List<TagLibrary> oldList = new ArrayList<TagLibrary>();
+ List<TagLibrary> oldList = new ArrayList<>();
Set<String> oldPrefixes = container.getInstanceNames(TagLibrary.class);
for (String prefix : oldPrefixes) {
oldList.add(container.getInstance(TagLibrary.class, prefix));
@@ -165,9 +158,7 @@ public class VelocityManager {
ctx = ServletActionContext.getServletContext();
} catch (NullPointerException npe) {
// in case this was used outside the lifecycle of struts servlet
- if (LOG.isDebugEnabled()) {
- LOG.debug("internal toolbox context ignored");
- }
+ LOG.debug("internal toolbox context ignored");
}
if (toolboxManager != null && ctx != null) {
@@ -203,9 +194,7 @@ public class VelocityManager {
VelocityContext velocityContext = (VelocityContext) objectFactory.buildBean(className, null);
contextList.add(velocityContext);
} catch (Exception e) {
- if (LOG.isWarnEnabled()) {
- LOG.warn("Warning. " + e.getClass().getName() + " caught while attempting to instantiate a chained VelocityContext, " + className + " -- skipping");
- }
+ LOG.warn("Warning. {} caught while attempting to instantiate a chained VelocityContext, {} -- skipping", e.getClass().getName(), className);
}
}
if (contextList.size() > 0) {
@@ -312,15 +301,11 @@ public class VelocityManager {
// if we've got something, load 'er up
if (in != null) {
- if (LOG.isInfoEnabled()) {
- LOG.info("Initializing velocity using " + resourceLocation);
- }
+ LOG.info("Initializing velocity using {}", resourceLocation);
properties.load(in);
}
} catch (IOException e) {
- if (LOG.isWarnEnabled()) {
- LOG.warn("Unable to load velocity configuration " + resourceLocation, e);
- }
+ LOG.warn("Unable to load velocity configuration {}", resourceLocation, e);
} finally {
if (in != null) {
try {
@@ -354,14 +339,10 @@ public class VelocityManager {
if (LOG.isDebugEnabled()) {
LOG.debug("Initializing Velocity with the following properties ...");
- for (Iterator iter = properties.keySet().iterator();
- iter.hasNext();) {
+ for (Iterator iter = properties.keySet().iterator(); iter.hasNext(); ) {
String key = (String) iter.next();
String value = properties.getProperty(key);
-
- if (LOG.isDebugEnabled()) {
- LOG.debug(" '" + key + "' = '" + value + "'");
- }
+ LOG.debug(" '{}' = '{}'", key, value);
}
}
@@ -392,7 +373,7 @@ public class VelocityManager {
public void setChainedContexts(String contexts) {
// we expect contexts to be a comma separated list of classnames
StringTokenizer st = new StringTokenizer(contexts, ",");
- List<String> contextList = new ArrayList<String>();
+ List<String> contextList = new ArrayList<>();
while (st.hasMoreTokens()) {
String classname = st.nextToken();
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/main/java/org/apache/struts2/views/xslt/AbstractAdapterNode.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/views/xslt/AbstractAdapterNode.java b/core/src/main/java/org/apache/struts2/views/xslt/AbstractAdapterNode.java
index 5d1e567..d110d2d 100644
--- a/core/src/main/java/org/apache/struts2/views/xslt/AbstractAdapterNode.java
+++ b/core/src/main/java/org/apache/struts2/views/xslt/AbstractAdapterNode.java
@@ -21,21 +21,15 @@
package org.apache.struts2.views.xslt;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.struts2.StrutsException;
+import org.w3c.dom.*;
+
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
-import org.apache.struts2.StrutsException;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.UserDataHandler;
-
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
-
/**
* AbstractAdapterNode is the base for childAdapters that expose a read-only view
* of a Java object as a DOM Node. This class implements the core parent-child
@@ -134,8 +128,8 @@ public abstract class AbstractAdapterNode implements AdapterNode {
log.debug("getChildBeforeOrAfter: ");
List adapters = getChildAdapters();
if (log.isDebugEnabled()) {
- log.debug("childAdapters = " + adapters);
- log.debug("child = " + child);
+ log.debug("childAdapters = {}", adapters);
+ log.debug("child = {}", child);
}
int index = adapters.indexOf(child);
if (index < 0)
@@ -146,12 +140,12 @@ public abstract class AbstractAdapterNode implements AdapterNode {
}
public Node getChildAfter(Node child) {
- log.trace("getChildafter");
+ log.trace("getChildAfter");
return getChildBeforeOrAfter(child, false/*after*/);
}
public Node getChildBefore(Node child) {
- log.trace("getchildbefore");
+ log.trace("getChildBefore");
return getChildBeforeOrAfter(child, true/*after*/);
}
@@ -159,7 +153,7 @@ public abstract class AbstractAdapterNode implements AdapterNode {
if (tagName.equals("*")) {
return getChildNodes();
} else {
- LinkedList<Node> filteredChildren = new LinkedList<Node>();
+ LinkedList<Node> filteredChildren = new LinkedList<>();
for (Node adapterNode : getChildAdapters()) {
if (adapterNode.getNodeName().equals(tagName)) {
@@ -184,9 +178,7 @@ public abstract class AbstractAdapterNode implements AdapterNode {
public NodeList getChildNodes() {
NodeList nl = new SimpleNodeList(getChildAdapters());
- if (log.isDebugEnabled())
- log.debug("getChildNodes for tag: "
- + getNodeName() + " num children: " + nl.getLength());
+ log.debug("getChildNodes for tag: {} num children: {}", getNodeName(), nl.getLength());
return nl;
}
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/main/java/org/apache/struts2/views/xslt/AdapterFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/views/xslt/AdapterFactory.java b/core/src/main/java/org/apache/struts2/views/xslt/AdapterFactory.java
index 5383750..69a8ad3 100644
--- a/core/src/main/java/org/apache/struts2/views/xslt/AdapterFactory.java
+++ b/core/src/main/java/org/apache/struts2/views/xslt/AdapterFactory.java
@@ -22,12 +22,7 @@
package org.apache.struts2.views.xslt;
import org.apache.struts2.StrutsException;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
+import org.w3c.dom.*;
import java.util.Collection;
import java.util.HashMap;
@@ -91,7 +86,7 @@ import java.util.Map;
*/
public class AdapterFactory {
- private Map<Class, Class> adapterTypes = new HashMap<Class, Class>();
+ private Map<Class, Class> adapterTypes = new HashMap<>();
/**
* Register an adapter type for a Java class type.
@@ -115,9 +110,6 @@ public class AdapterFactory {
*/
public Document adaptDocument(String propertyName, Object propertyValue)
throws IllegalAccessException, InstantiationException {
- //if ( propertyValue instanceof Document )
- // return (Document)propertyValue;
-
return new SimpleAdapterDocument(this, null, propertyName, propertyValue);
}
@@ -131,30 +123,34 @@ public class AdapterFactory {
*/
public Node adaptNode(AdapterNode parent, String propertyName, Object value) {
Class adapterClass = getAdapterForValue(value);
- if (adapterClass != null)
+ if (adapterClass != null) {
return constructAdapterInstance(adapterClass, parent, propertyName, value);
+ }
// If the property is a Document, "unwrap" it to the root element
- if (value instanceof Document)
+ if (value instanceof Document) {
value = ((Document) value).getDocumentElement();
+ }
// If the property is already a Node, proxy it
- if (value instanceof Node)
+ if (value instanceof Node) {
return proxyNode(parent, (Node) value);
+ }
// Check other supported types or default to generic JavaBean introspecting adapter
Class valueType = value.getClass();
- if (valueType.isArray())
+ if (valueType.isArray()) {
adapterClass = ArrayAdapter.class;
- else if (value instanceof String || value instanceof Number || value instanceof Boolean || valueType.isPrimitive())
+ } else if (value instanceof String || value instanceof Number || value instanceof Boolean || valueType.isPrimitive()) {
adapterClass = StringAdapter.class;
- else if (value instanceof Collection)
+ } else if (value instanceof Collection) {
adapterClass = CollectionAdapter.class;
- else if (value instanceof Map)
+ } else if (value instanceof Map) {
adapterClass = MapAdapter.class;
- else
+ } else {
adapterClass = BeanAdapter.class;
+ }
return constructAdapterInstance(adapterClass, parent, propertyName, value);
}
@@ -173,17 +169,22 @@ public class AdapterFactory {
*/
public Node proxyNode(AdapterNode parent, Node node) {
// If the property is a Document, "unwrap" it to the root element
- if (node instanceof Document)
+ if (node instanceof Document) {
node = ((Document) node).getDocumentElement();
+ }
- if (node == null)
+ if (node == null) {
return null;
- if (node.getNodeType() == Node.ELEMENT_NODE)
+ }
+ if (node.getNodeType() == Node.ELEMENT_NODE) {
return new ProxyElementAdapter(this, parent, (Element) node);
- if (node.getNodeType() == Node.TEXT_NODE)
+ }
+ if (node.getNodeType() == Node.TEXT_NODE) {
return new ProxyTextNodeAdapter(this, parent, (Text) node);
- if (node.getNodeType() == Node.ATTRIBUTE_NODE)
+ }
+ if (node.getNodeType() == Node.ATTRIBUTE_NODE) {
return new ProxyAttrAdapter(this, parent, (Attr) node);
+ }
return null; // Unsupported Node type - ignore for now
}
@@ -201,8 +202,7 @@ public class AdapterFactory {
try {
adapterClass.getConstructor(new Class []{});
} catch (NoSuchMethodException e1) {
- throw new StrutsException("Adapter class: " + adapterClass
- + " does not have a no-args consructor.");
+ throw new StrutsException("Adapter class: " + adapterClass + " does not have a no-args constructor.");
}
try {
@@ -214,9 +214,7 @@ public class AdapterFactory {
return adapterNode;
- } catch (IllegalAccessException e) {
- throw new StrutsException("Cannot adapt " + propertyValue + " (" + propertyName + ") :" + e.getMessage(), e);
- } catch (InstantiationException e) {
+ } catch (IllegalAccessException | InstantiationException e) {
throw new StrutsException("Cannot adapt " + propertyValue + " (" + propertyName + ") :" + e.getMessage(), e);
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java
index 75ad827..d550624 100644
--- a/core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java
+++ b/core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java
@@ -21,13 +21,12 @@
package org.apache.struts2.views.xslt;
-import java.util.ArrayList;
-import java.util.List;
-
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.w3c.dom.Node;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
+import java.util.ArrayList;
+import java.util.List;
/**
@@ -44,7 +43,7 @@ public class ArrayAdapter extends AbstractAdapterElement {
}
protected List<Node> buildChildAdapters() {
- List<Node> children = new ArrayList<Node>();
+ List<Node> children = new ArrayList<>();
Object[] values = (Object[]) getPropertyValue();
for (Object value : values) {
@@ -52,9 +51,7 @@ public class ArrayAdapter extends AbstractAdapterElement {
if (childAdapter != null)
children.add(childAdapter);
- if (log.isDebugEnabled()) {
- log.debug(this + " adding adapter: " + childAdapter);
- }
+ log.debug("{} adding adapter: {}", this, childAdapter);
}
return children;
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java
index d552bdb..e9b8413 100644
--- a/core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java
+++ b/core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java
@@ -21,8 +21,8 @@
package org.apache.struts2.views.xslt;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.struts2.StrutsException;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -54,7 +54,7 @@ import java.util.Map;
* would be rendered as: <myPerson> <firstName>...</firstName> <lastName>...</lastName> </myPerson>
*/
public class BeanAdapter extends AbstractAdapterElement {
- //~ Static fields/initializers /////////////////////////////////////////////
+ //Static fields/initializer
private static final Object[] NULLPARAMS = new Object[0];
@@ -63,11 +63,11 @@ public class BeanAdapter extends AbstractAdapterElement {
*/
private static Map<Class, PropertyDescriptor[]> propertyDescriptorCache;
- //~ Instance fields ////////////////////////////////////////////////////////
+ //Instance fields
private Logger log = LogManager.getLogger(this.getClass());
- //~ Constructors ///////////////////////////////////////////////////////////
+ //Constructors
public BeanAdapter() {
}
@@ -77,7 +77,7 @@ public class BeanAdapter extends AbstractAdapterElement {
setContext(adapterFactory, parent, propertyName, value);
}
- //~ Methods ////////////////////////////////////////////////////////////////
+ //Methods
public String getTagName() {
return getPropertyName();
@@ -87,15 +87,15 @@ public class BeanAdapter extends AbstractAdapterElement {
NodeList nl = super.getChildNodes();
// Log child nodes for debug:
if (log.isDebugEnabled() && nl != null) {
- log.debug("BeanAdapter getChildNodes for: " + getTagName());
+ log.debug("BeanAdapter getChildNodes for: {}", getTagName());
log.debug(nl.toString());
}
return nl;
}
protected List<Node> buildChildAdapters() {
- log.debug("BeanAdapter building children. PropName = " + getPropertyName());
- List<Node> newAdapters = new ArrayList<Node>();
+ log.debug("BeanAdapter building children. Property name: {}", getPropertyName());
+ List<Node> newAdapters = new ArrayList<>();
Class type = getPropertyValue().getClass();
PropertyDescriptor[] props = getPropertyDescriptors(getPropertyValue());
@@ -107,7 +107,7 @@ public class BeanAdapter extends AbstractAdapterElement {
//FIXME: write only property or indexed access
continue;
}
- log.debug("Bean reading property method: " + m.getName());
+ log.debug("Bean reading property method: {}", m.getName());
String propertyName = prop.getName();
Object propertyValue;
@@ -120,11 +120,10 @@ public class BeanAdapter extends AbstractAdapterElement {
try {
propertyValue = m.invoke(getPropertyValue(), NULLPARAMS);
} catch (Exception e) {
- if (e instanceof InvocationTargetException)
+ if (e instanceof InvocationTargetException) {
e = (Exception) ((InvocationTargetException) e).getTargetException();
- if (log.isErrorEnabled()) {
- log.error("Cannot access bean property: {}", propertyName, e);
}
+ log.error("Cannot access bean property: {}", propertyName, e);
continue;
}
@@ -161,14 +160,13 @@ public class BeanAdapter extends AbstractAdapterElement {
PropertyDescriptor[] props = propertyDescriptorCache.get(bean.getClass());
if (props == null) {
- log.debug("Caching property descriptor for " + bean.getClass().getName());
+ log.debug("Caching property descriptor for {}", bean.getClass().getName());
props = Introspector.getBeanInfo(bean.getClass(), Object.class).getPropertyDescriptors();
propertyDescriptorCache.put(bean.getClass(), props);
}
return props;
} catch (IntrospectionException e) {
- e.printStackTrace();
throw new StrutsException("Error getting property descriptors for " + bean + " : " + e.getMessage());
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/main/java/org/apache/struts2/views/xslt/CollectionAdapter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/views/xslt/CollectionAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/CollectionAdapter.java
index a720ccb..9301897 100644
--- a/core/src/main/java/org/apache/struts2/views/xslt/CollectionAdapter.java
+++ b/core/src/main/java/org/apache/struts2/views/xslt/CollectionAdapter.java
@@ -21,15 +21,14 @@
package org.apache.struts2.views.xslt;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.w3c.dom.Node;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.w3c.dom.Node;
-
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
-
/**
*/
@@ -45,7 +44,7 @@ public class CollectionAdapter extends AbstractAdapterElement {
protected List<Node> buildChildAdapters() {
Collection values = (Collection) getPropertyValue();
- List<Node> children = new ArrayList<Node>(values.size());
+ List<Node> children = new ArrayList<>(values.size());
for (Object value : values) {
Node childAdapter;
@@ -57,9 +56,7 @@ public class CollectionAdapter extends AbstractAdapterElement {
if (childAdapter != null)
children.add(childAdapter);
- if (log.isDebugEnabled()) {
- log.debug(this + " adding adapter: " + childAdapter);
- }
+ log.debug("{} adding adapter: {}", this, childAdapter);
}
return children;
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/main/java/org/apache/struts2/views/xslt/MapAdapter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/views/xslt/MapAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/MapAdapter.java
index 646e8af..8566637 100644
--- a/core/src/main/java/org/apache/struts2/views/xslt/MapAdapter.java
+++ b/core/src/main/java/org/apache/struts2/views/xslt/MapAdapter.java
@@ -21,12 +21,12 @@
package org.apache.struts2.views.xslt;
+import org.w3c.dom.Node;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.w3c.dom.Node;
-
/**
* MapAdapter adapters a java.util.Map type to an XML DOM with the following
* structure:
@@ -53,14 +53,13 @@ public class MapAdapter extends AbstractAdapterElement {
}
protected List<Node> buildChildAdapters() {
- List<Node> children = new ArrayList<Node>(map().entrySet().size());
+ List<Node> children = new ArrayList<>(map().entrySet().size());
for (Object o : map().entrySet()) {
Map.Entry entry = (Map.Entry) o;
Object key = entry.getKey();
Object value = entry.getValue();
- EntryElement child = new EntryElement(
- getAdapterFactory(), this, "entry", key, value);
+ EntryElement child = new EntryElement(getAdapterFactory(), this, "entry", key, value);
children.add(child);
}
@@ -78,7 +77,7 @@ public class MapAdapter extends AbstractAdapterElement {
}
protected List<Node> buildChildAdapters() {
- List<Node> children = new ArrayList<Node>();
+ List<Node> children = new ArrayList<>();
children.add( getAdapterFactory().adaptNode( this, "key", key ) );
children.add( getAdapterFactory().adaptNode( this, "value", value ) );
return children;
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/main/java/org/apache/struts2/views/xslt/ProxyElementAdapter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/views/xslt/ProxyElementAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/ProxyElementAdapter.java
index 5c3389a..31dca8b 100644
--- a/core/src/main/java/org/apache/struts2/views/xslt/ProxyElementAdapter.java
+++ b/core/src/main/java/org/apache/struts2/views/xslt/ProxyElementAdapter.java
@@ -21,19 +21,13 @@
package org.apache.struts2.views.xslt;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.w3c.dom.*;
+
import java.util.ArrayList;
import java.util.List;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
-
/**
* ProxyElementAdapter is a pass-through adapter for objects which already
* implement the Element interface. All methods are proxied to the underlying
@@ -59,13 +53,13 @@ public class ProxyElementAdapter extends ProxyNodeAdapter implements Element {
}
protected List<Node> buildChildAdapters() {
- List<Node> adapters = new ArrayList<Node>();
+ List<Node> adapters = new ArrayList<>();
NodeList children = node().getChildNodes();
for (int i = 0; i < children.getLength(); i++) {
Node child = children.item(i);
Node adapter = wrap(child);
if (adapter != null) {
- log.debug("wrapped child node: " + child.getNodeName());
+ log.debug("Wrapped child node: {}", child.getNodeName());
adapters.add(adapter);
}
}
@@ -91,7 +85,7 @@ public class ProxyElementAdapter extends ProxyNodeAdapter implements Element {
}
public Attr getAttributeNode(String name) {
- log.debug("wrapping attribute");
+ log.debug("Wrapping attribute: {}", name);
return (Attr) wrap(element().getAttributeNode(name));
}
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/main/java/org/apache/struts2/views/xslt/ProxyNodeAdapter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/views/xslt/ProxyNodeAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/ProxyNodeAdapter.java
index 26b23ee..f7ce1bb 100644
--- a/core/src/main/java/org/apache/struts2/views/xslt/ProxyNodeAdapter.java
+++ b/core/src/main/java/org/apache/struts2/views/xslt/ProxyNodeAdapter.java
@@ -21,13 +21,12 @@
package org.apache.struts2.views.xslt;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.w3c.dom.DOMException;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
-
/**
* ProxyNodeAdapter is a read-only delegating adapter for objects which already
* implement the Node interface. All methods are proxied to the underlying
@@ -40,10 +39,10 @@ public abstract class ProxyNodeAdapter extends AbstractAdapterNode {
public ProxyNodeAdapter(AdapterFactory factory, AdapterNode parent, Node value) {
setContext(factory, parent, "document"/*propname unused*/, value);
- log.debug("proxied node is: " + value);
- log.debug("node class is: " + value.getClass());
- log.debug("node type is: " + value.getNodeType());
- log.debug("node name is: " + value.getNodeName());
+ log.debug("Proxied node is: {}" + value);
+ log.debug("Node class is: {}", value.getClass());
+ log.debug("Node type is: {}", value.getNodeType());
+ log.debug("Node name is: {}", value.getNodeName());
}
/**
@@ -84,15 +83,17 @@ public abstract class ProxyNodeAdapter extends AbstractAdapterNode {
}
public short getNodeType() {
- if (log.isTraceEnabled())
+ if (log.isTraceEnabled()) {
log.trace("getNodeType: " + getNodeName() + ": " + node().getNodeType());
+ }
return node().getNodeType();
}
public NamedNodeMap getAttributes() {
NamedNodeMap nnm = wrap(node().getAttributes());
- if (log.isTraceEnabled())
+ if (log.isTraceEnabled()) {
log.trace("getAttributes: " + nnm);
+ }
return nnm;
}
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/main/java/org/apache/struts2/views/xslt/ServletURIResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/views/xslt/ServletURIResolver.java b/core/src/main/java/org/apache/struts2/views/xslt/ServletURIResolver.java
index 0496c4d..1aa1d45 100644
--- a/core/src/main/java/org/apache/struts2/views/xslt/ServletURIResolver.java
+++ b/core/src/main/java/org/apache/struts2/views/xslt/ServletURIResolver.java
@@ -21,16 +21,15 @@
package org.apache.struts2.views.xslt;
-import java.io.InputStream;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import javax.servlet.ServletContext;
import javax.xml.transform.Source;
import javax.xml.transform.TransformerException;
import javax.xml.transform.URIResolver;
import javax.xml.transform.stream.StreamSource;
-
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
+import java.io.InputStream;
/**
@@ -48,15 +47,15 @@ public class ServletURIResolver implements URIResolver {
private ServletContext sc;
public ServletURIResolver(ServletContext sc) {
- log.trace("ServletURIResolver: " + sc);
+ log.trace("ServletURIResolver: {}", sc);
this.sc = sc;
}
public Source resolve(String href, String base) throws TransformerException {
- log.debug("ServletURIResolver resolve(): href=" + href + ", base=" + base);
+ log.debug("ServletURIResolver resolve(): href={}, base={}", href, base);
if (href.startsWith(PROTOCOL)) {
String res = href.substring(PROTOCOL.length());
- log.debug("Resolving resource <" + res + ">");
+ log.debug("Resolving resource <{}>", res);
InputStream is = sc.getResourceAsStream(res);
@@ -69,6 +68,6 @@ public class ServletURIResolver implements URIResolver {
}
throw new TransformerException(
- "Cannot handle procotol of resource " + href);
+ "Cannot handle protocol of resource " + href);
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/main/java/org/apache/struts2/views/xslt/SimpleNodeList.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/views/xslt/SimpleNodeList.java b/core/src/main/java/org/apache/struts2/views/xslt/SimpleNodeList.java
index a1c2092..d70207e 100644
--- a/core/src/main/java/org/apache/struts2/views/xslt/SimpleNodeList.java
+++ b/core/src/main/java/org/apache/struts2/views/xslt/SimpleNodeList.java
@@ -21,13 +21,12 @@
package org.apache.struts2.views.xslt;
-import java.util.List;
-
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
+import java.util.List;
public class SimpleNodeList implements NodeList {
private Logger log = LogManager.getLogger(SimpleNodeList.class);
@@ -39,13 +38,14 @@ public class SimpleNodeList implements NodeList {
}
public int getLength() {
- if (log.isTraceEnabled())
- log.trace("getLength: " + nodes.size());
+ if (log.isTraceEnabled()) {
+ log.trace("getLength: {}", nodes.size());
+ }
return nodes.size();
}
public Node item(int i) {
- log.trace("getItem: " + i);
+ log.trace("getItem: {}", i);
return nodes.get(i);
}
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java
index d4509d1..59f77d0 100644
--- a/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java
+++ b/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java
@@ -21,16 +21,15 @@
package org.apache.struts2.views.xslt;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.List;
-
+import com.opensymphony.xwork2.util.DomHelper;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.w3c.dom.Node;
import org.xml.sax.InputSource;
-import com.opensymphony.xwork2.util.DomHelper;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.List;
/**
* StringAdapter adapts a Java String value to a DOM Element with the specified
@@ -73,17 +72,17 @@ public class StringAdapter extends AbstractAdapterElement {
protected List<Node> buildChildAdapters() {
Node node;
if (getParseStringAsXML()) {
- log.debug("parsing string as xml: " + getStringValue());
+ log.debug("parsing string as xml: {}", getStringValue());
// Parse the String to a DOM, then proxy that as our child
node = DomHelper.parse(new InputSource(new StringReader(getStringValue())));
node = getAdapterFactory().proxyNode(this, node);
} else {
- log.debug("using string as is: " + getStringValue());
+ log.debug("using string as is: {}", getStringValue());
// Create a Text node as our child
node = new SimpleTextNode(getAdapterFactory(), this, "text", getStringValue());
}
- List<Node> children = new ArrayList<Node>();
+ List<Node> children = new ArrayList<>();
children.add(node);
return children;
}
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java b/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
index d3f474b..faa222d 100644
--- a/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
+++ b/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
@@ -27,21 +27,15 @@ import com.opensymphony.xwork2.Result;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.TextParseUtil;
import com.opensymphony.xwork2.util.ValueStack;
-import org.apache.logging.log4j.Logger;
+import org.apache.commons.lang3.BooleanUtils;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.StrutsException;
import javax.servlet.http.HttpServletResponse;
-import javax.xml.transform.ErrorListener;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Source;
-import javax.xml.transform.Templates;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.URIResolver;
+import javax.xml.transform.*;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
@@ -215,11 +209,13 @@ public class XSLTResult implements Result {
/** 'stylesheetLocation' parameter. Points to the xsl. */
public static final String DEFAULT_PARAM = "stylesheetLocation";
- /** Cache of all tempaltes. */
+ /**
+ * Cache of all templates.
+ */
private static final Map<String, Templates> templatesCache;
static {
- templatesCache = new HashMap<String, Templates>();
+ templatesCache = new HashMap<>();
}
// Configurable Parameters
@@ -256,8 +252,8 @@ public class XSLTResult implements Result {
}
@Inject(StrutsConstants.STRUTS_XSLT_NOCACHE)
- public void setNoCache(String val) {
- noCache = "true".equals(val);
+ public void setNoCache(String xsltNoCache) {
+ this.noCache = BooleanUtils.toBoolean(xsltNoCache);
}
/**
@@ -410,16 +406,12 @@ public class XSLTResult implements Result {
Source xmlSource = getDOMSourceForStack(result);
// Transform the source XML to System.out.
- if (LOG.isDebugEnabled()) {
- LOG.debug("xmlSource = " + xmlSource);
- }
+ LOG.debug("xmlSource = {}", xmlSource);
transformer.transform(xmlSource, new StreamResult(writer));
writer.flush(); // ...and flush...
- if (LOG.isDebugEnabled()) {
- LOG.debug("Time:" + (System.currentTimeMillis() - startTime) + "ms");
- }
+ LOG.debug("Time: {}ms", (System.currentTimeMillis() - startTime));
} catch (Exception e) {
LOG.error("Unable to render XSLT Template, '{}'", location, e);
@@ -465,9 +457,7 @@ public class XSLTResult implements Result {
throw new TransformerException("Stylesheet " + path + " not found in resources.");
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("Preparing XSLT stylesheet templates: " + path);
- }
+ LOG.debug("Preparing XSLT stylesheet templates: {}", path);
TransformerFactory factory = TransformerFactory.newInstance();
factory.setURIResolver(getURIResolver());
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/site/resources/tags/a.html
----------------------------------------------------------------------
diff --git a/core/src/site/resources/tags/a.html b/core/src/site/resources/tags/a.html
index dbaf26d..827d56d 100644
--- a/core/src/site/resources/tags/a.html
+++ b/core/src/site/resources/tags/a.html
@@ -12,7 +12,7 @@ Please do not edit it directly.
<h2>Description</h2>
<p>
<!-- START SNIPPET: tagdescription -->
- Render a HTML href element that when clicked can optionally call a URL via remote XMLHttpRequest and updates its targets
+ Render a HTML href element
<!-- END SNIPPET: tagdescription -->
</p>
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/site/resources/tags/actionmessage.html
----------------------------------------------------------------------
diff --git a/core/src/site/resources/tags/actionmessage.html b/core/src/site/resources/tags/actionmessage.html
index d683c53..55fc078 100644
--- a/core/src/site/resources/tags/actionmessage.html
+++ b/core/src/site/resources/tags/actionmessage.html
@@ -103,7 +103,7 @@ Please do not edit it directly.
<td align="left" valign="top">true</td>
<td align="left" valign="top">false</td>
<td align="left" valign="top">Boolean</td>
- <td align="left" valign="top"> Whether to escape HTML</td>
+ <td align="left" valign="top">Whether to escape HTML</td>
</tr>
<tr>
<td align="left" valign="top">id</td>
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/site/resources/tags/checkboxlist.html
----------------------------------------------------------------------
diff --git a/core/src/site/resources/tags/checkboxlist.html b/core/src/site/resources/tags/checkboxlist.html
index 27e90b2..41f3922 100644
--- a/core/src/site/resources/tags/checkboxlist.html
+++ b/core/src/site/resources/tags/checkboxlist.html
@@ -175,7 +175,7 @@ Please do not edit it directly.
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left" valign="top">String</td>
- <td align="left" valign="top"> Property of list objects to get field value from</td>
+ <td align="left" valign="top">Property of list objects to get field value from</td>
</tr>
<tr>
<td align="left" valign="top">listLabelKey</td>
@@ -207,7 +207,7 @@ Please do not edit it directly.
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left" valign="top">String</td>
- <td align="left" valign="top"> Property of list objects to get field value label from</td>
+ <td align="left" valign="top">Property of list objects to get field value label from</td>
</tr>
<tr>
<td align="left" valign="top">name</td>
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/site/resources/tags/combobox.html
----------------------------------------------------------------------
diff --git a/core/src/site/resources/tags/combobox.html b/core/src/site/resources/tags/combobox.html
index 393e8c2..39ae8d4 100644
--- a/core/src/site/resources/tags/combobox.html
+++ b/core/src/site/resources/tags/combobox.html
@@ -175,7 +175,7 @@ Please do not edit it directly.
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left" valign="top">String</td>
- <td align="left" valign="top">Iteratable source to populate from. If this is missing, the select widget is simply not displayed.</td>
+ <td align="left" valign="top">Iterable source to populate from. If this is missing, the select widget is simply not displayed.</td>
</tr>
<tr>
<td align="left" valign="top">listKey</td>
@@ -183,7 +183,7 @@ Please do not edit it directly.
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left" valign="top">String</td>
- <td align="left" valign="top">Set the key used to retrive the option key.</td>
+ <td align="left" valign="top">Set the key used to retrieve the option key.</td>
</tr>
<tr>
<td align="left" valign="top">listValue</td>
@@ -191,7 +191,7 @@ Please do not edit it directly.
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left" valign="top">String</td>
- <td align="left" valign="top">Set the value used to retrive the option value.</td>
+ <td align="left" valign="top">Set the value used to retrieve the option value.</td>
</tr>
<tr>
<td align="left" valign="top">maxLength</td>
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/site/resources/tags/doubleselect.html
----------------------------------------------------------------------
diff --git a/core/src/site/resources/tags/doubleselect.html b/core/src/site/resources/tags/doubleselect.html
index b472837..9e19fbe 100644
--- a/core/src/site/resources/tags/doubleselect.html
+++ b/core/src/site/resources/tags/doubleselect.html
@@ -463,7 +463,7 @@ Please do not edit it directly.
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left" valign="top">String</td>
- <td align="left" valign="top"> Property of list objects to get field value from</td>
+ <td align="left" valign="top">Property of list objects to get field value from</td>
</tr>
<tr>
<td align="left" valign="top">listLabelKey</td>
@@ -495,7 +495,7 @@ Please do not edit it directly.
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left" valign="top">String</td>
- <td align="left" valign="top"> Property of list objects to get field value label from</td>
+ <td align="left" valign="top">Property of list objects to get field value label from</td>
</tr>
<tr>
<td align="left" valign="top">multiple</td>
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/site/resources/tags/inputtransferselect.html
----------------------------------------------------------------------
diff --git a/core/src/site/resources/tags/inputtransferselect.html b/core/src/site/resources/tags/inputtransferselect.html
index c8cf852..550ae3e 100644
--- a/core/src/site/resources/tags/inputtransferselect.html
+++ b/core/src/site/resources/tags/inputtransferselect.html
@@ -247,7 +247,7 @@ Please do not edit it directly.
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left" valign="top">String</td>
- <td align="left" valign="top"> Property of list objects to get field value from</td>
+ <td align="left" valign="top">Property of list objects to get field value from</td>
</tr>
<tr>
<td align="left" valign="top">listLabelKey</td>
@@ -279,7 +279,7 @@ Please do not edit it directly.
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left" valign="top">String</td>
- <td align="left" valign="top"> Property of list objects to get field value label from</td>
+ <td align="left" valign="top">Property of list objects to get field value label from</td>
</tr>
<tr>
<td align="left" valign="top">multiple</td>
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/site/resources/tags/optiontransferselect.html
----------------------------------------------------------------------
diff --git a/core/src/site/resources/tags/optiontransferselect.html b/core/src/site/resources/tags/optiontransferselect.html
index 762b110..0dd58b0 100644
--- a/core/src/site/resources/tags/optiontransferselect.html
+++ b/core/src/site/resources/tags/optiontransferselect.html
@@ -623,7 +623,7 @@ Please do not edit it directly.
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left" valign="top">String</td>
- <td align="left" valign="top"> Property of list objects to get field value from</td>
+ <td align="left" valign="top">Property of list objects to get field value from</td>
</tr>
<tr>
<td align="left" valign="top">listLabelKey</td>
@@ -655,7 +655,7 @@ Please do not edit it directly.
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left" valign="top">String</td>
- <td align="left" valign="top"> Property of list objects to get field value label from</td>
+ <td align="left" valign="top">Property of list objects to get field value label from</td>
</tr>
<tr>
<td align="left" valign="top">multiple</td>
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/site/resources/tags/radio.html
----------------------------------------------------------------------
diff --git a/core/src/site/resources/tags/radio.html b/core/src/site/resources/tags/radio.html
index 5fba64c..df37c32 100644
--- a/core/src/site/resources/tags/radio.html
+++ b/core/src/site/resources/tags/radio.html
@@ -175,7 +175,7 @@ Please do not edit it directly.
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left" valign="top">String</td>
- <td align="left" valign="top"> Property of list objects to get field value from</td>
+ <td align="left" valign="top">Property of list objects to get field value from</td>
</tr>
<tr>
<td align="left" valign="top">listLabelKey</td>
@@ -207,7 +207,7 @@ Please do not edit it directly.
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left" valign="top">String</td>
- <td align="left" valign="top"> Property of list objects to get field value label from</td>
+ <td align="left" valign="top">Property of list objects to get field value label from</td>
</tr>
<tr>
<td align="left" valign="top">name</td>
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/site/resources/tags/select.html
----------------------------------------------------------------------
diff --git a/core/src/site/resources/tags/select.html b/core/src/site/resources/tags/select.html
index 444e23e..b3ab30e 100644
--- a/core/src/site/resources/tags/select.html
+++ b/core/src/site/resources/tags/select.html
@@ -199,7 +199,7 @@ Please do not edit it directly.
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left" valign="top">String</td>
- <td align="left" valign="top"> Property of list objects to get field value from</td>
+ <td align="left" valign="top">Property of list objects to get field value from</td>
</tr>
<tr>
<td align="left" valign="top">listLabelKey</td>
@@ -231,7 +231,7 @@ Please do not edit it directly.
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left" valign="top">String</td>
- <td align="left" valign="top"> Property of list objects to get field value label from</td>
+ <td align="left" valign="top">Property of list objects to get field value label from</td>
</tr>
<tr>
<td align="left" valign="top">multiple</td>
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/site/resources/tags/text.html
----------------------------------------------------------------------
diff --git a/core/src/site/resources/tags/text.html b/core/src/site/resources/tags/text.html
index 7909912..cee74ce 100644
--- a/core/src/site/resources/tags/text.html
+++ b/core/src/site/resources/tags/text.html
@@ -47,7 +47,7 @@ Please do not edit it directly.
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left" valign="top">String</td>
- <td align="left" valign="top"> Name of resource property to fetch</td>
+ <td align="left" valign="top">Name of resource property to fetch</td>
</tr>
<tr>
<td align="left" valign="top">searchValueStack</td>
http://git-wip-us.apache.org/repos/asf/struts/blob/e47a1127/core/src/site/resources/tags/updownselect.html
----------------------------------------------------------------------
diff --git a/core/src/site/resources/tags/updownselect.html b/core/src/site/resources/tags/updownselect.html
index 1e08e6a..79947d8 100644
--- a/core/src/site/resources/tags/updownselect.html
+++ b/core/src/site/resources/tags/updownselect.html
@@ -223,7 +223,7 @@ Please do not edit it directly.
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left" valign="top">String</td>
- <td align="left" valign="top"> Property of list objects to get field value from</td>
+ <td align="left" valign="top">Property of list objects to get field value from</td>
</tr>
<tr>
<td align="left" valign="top">listLabelKey</td>
@@ -255,7 +255,7 @@ Please do not edit it directly.
<td align="left" valign="top"></td>
<td align="left" valign="top">false</td>
<td align="left" valign="top">String</td>
- <td align="left" valign="top"> Property of list objects to get field value label from</td>
+ <td align="left" valign="top">Property of list objects to get field value label from</td>
</tr>
<tr>
<td align="left" valign="top">moveDownLabel</td>