Repository: struts Updated Branches: refs/heads/develop bf6b37f2e -> ca50c1aed
WW-4064 WW-3698 Adds additional flag to cover both cases Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/ca50c1ae Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/ca50c1ae Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/ca50c1ae Branch: refs/heads/develop Commit: ca50c1aeddf0325485224b75b3e0cf0cb816a0f2 Parents: bf6b37f Author: Lukasz Lenart <[email protected]> Authored: Tue Jul 29 10:04:18 2014 +0200 Committer: Lukasz Lenart <[email protected]> Committed: Tue Jul 29 10:04:18 2014 +0200 ---------------------------------------------------------------------- .../jasperreports/JasperReportsResult.java | 7 ++++++- .../jasperreports/ValueStackDataSource.java | 21 +++++++++++--------- 2 files changed, 18 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/ca50c1ae/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java ---------------------------------------------------------------------- diff --git a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java index 0e366a1..4cb7de6 100644 --- a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java +++ b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java @@ -155,6 +155,7 @@ public class JasperReportsResult extends StrutsResultSupport implements JasperRe protected String delimiter; protected String imageServletUrl = "/images/"; protected String timeZone; + protected boolean wrapField = true; /** * Connection which can be passed to the report @@ -227,6 +228,10 @@ public class JasperReportsResult extends StrutsResultSupport implements JasperRe this.timeZone = timeZone; } + public void setWrapField(boolean wrapField) { + this.wrapField = wrapField; + } + public String getReportParameters() { return reportParameters; } @@ -284,7 +289,7 @@ public class JasperReportsResult extends StrutsResultSupport implements JasperRe Connection conn = (Connection) stack.findValue(connection); if (conn == null) - stackDataSource = new ValueStackDataSource(stack, dataSource); + stackDataSource = new ValueStackDataSource(stack, dataSource, wrapField); if ("https".equalsIgnoreCase(request.getScheme())) { // set the the HTTP Header to work around IE SSL weirdness http://git-wip-us.apache.org/repos/asf/struts/blob/ca50c1ae/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java ---------------------------------------------------------------------- diff --git a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java index 57986b6..6ca1a4a 100644 --- a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java +++ b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java @@ -41,12 +41,12 @@ public class ValueStackDataSource implements JRRewindableDataSource { */ private static Logger LOG = LoggerFactory.getLogger(ValueStackDataSource.class); + private Iterator iterator; + private ValueStack valueStack; + private String dataSource; + private boolean wrapField; - Iterator iterator; - ValueStack valueStack; - String dataSource; - boolean firstTimeThrough = true; - + private boolean firstTimeThrough = true; /** * Create a value stack data source on the given iterable property @@ -54,10 +54,11 @@ public class ValueStackDataSource implements JRRewindableDataSource { * @param valueStack The value stack to base the data source on * @param dataSourceParam The property to iterate over for the report */ - public ValueStackDataSource(ValueStack valueStack, String dataSourceParam) { + public ValueStackDataSource(ValueStack valueStack, String dataSourceParam, boolean wrapField) { this.valueStack = valueStack; + this.dataSource = dataSourceParam; + this.wrapField = wrapField; - dataSource = dataSourceParam; Object dataSourceValue = valueStack.findValue(dataSource); if (dataSourceValue != null) { @@ -104,9 +105,11 @@ public class ValueStackDataSource implements JRRewindableDataSource { LOG.debug("Field [#0] = [#1]", field.getName(), value); } - if (MakeIterator.isIterable(value)) { + if (!wrapField && MakeIterator.isIterable(value) && !field.getValueClass().isInstance(value)) { + return value; + } else if (MakeIterator.isIterable(value)) { // wrap value with ValueStackDataSource if not already wrapped - return new ValueStackDataSource(this.valueStack, expression); + return new ValueStackDataSource(this.valueStack, expression, wrapField); } else { return value; }
