Fixed MID-3314: problems with non-ascii characters in reports when de…

…fault encoding is not UTF-8
Evolveum · Jul 25, 2016 · dbc65bf · dbc65bf
1 parent e6ac8ed
commit dbc65bf
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 44 deletions.
diff --git a/...java/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel.java b/...java/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel.java
@@ -15,6 +15,7 @@
  */
 package com.evolveum.midpoint.web.page.admin.reports.component;
 
+import com.evolveum.midpoint.gui.api.component.BasePanel;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.web.component.form.DropDownFormGroup;
 import com.evolveum.midpoint.web.component.form.TextAreaFormGroup;
@@ -37,7 +38,7 @@
  * @author lazyman
  *
  */
-public class ReportConfigurationPanel extends SimplePanel<ReportDto> {
+public class ReportConfigurationPanel extends BasePanel<ReportDto> {
 
     private static final String ID_NAME = "name";
     private static final String ID_DESCRIPTION = "description";
@@ -56,9 +57,9 @@ public class ReportConfigurationPanel extends SimplePanel<ReportDto> {
 
     public ReportConfigurationPanel(String id, IModel<ReportDto> model) {
         super(id, model);
+		initLayout();
     }
 
-    @Override
     protected void initLayout() {
         TextFormGroup name = new TextFormGroup(ID_NAME, new PropertyModel<String>(getModel(), ID_NAME),
                 createStringResource("ObjectType.name"), ID_LABEL_SIZE, ID_INPUT_SIZE, true);

diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/JasperReportDto.java b/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/JasperReportDto.java
@@ -1,6 +1,7 @@
 package com.evolveum.midpoint.web.page.admin.reports.dto;
 
 import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -125,50 +126,49 @@ public byte[] getTemplate(){
 			design.getParametersList().clear();
             design.getFieldsMap().clear();
             design.getParametersMap().clear();
-            for (JasperReportFieldDto field : fields){
-			if (field.isEmpty()){
-				continue;
+            for (JasperReportFieldDto field : fields) {
+				if (field.isEmpty()){
+					continue;
+				}
+				JRDesignField f = new JRDesignField();
+				f.setValueClassName(field.getTypeAsString());
+				f.setValueClass(Class.forName(field.getTypeAsString()));
+				f.setName(field.getName());
+				design.addField(f);
 			}
-			JRDesignField f = new JRDesignField();
-			f.setValueClassName(field.getTypeAsString());
-			f.setValueClass(Class.forName(field.getTypeAsString()));
-			f.setName(field.getName());
-			design.addField(f);
-		}
-
-		for (JasperReportParameterDto param : parameters){
-			if (param.isEmpty()){
-				continue;
+
+			for (JasperReportParameterDto param : parameters) {
+				if (param.isEmpty()) {
+					continue;
+				}
+				JRDesignParameter p = new JRDesignParameter();
+				p.setValueClassName(param.getTypeAsString());
+				p.setValueClass(Class.forName(param.getTypeAsString()));
+				p.setName(param.getName());
+				p.setForPrompting(param.isForPrompting());
+				p.setDescription(param.getDescription());
+				p.setNestedType(param.getNestedType());
+				p.getPropertiesMap().setBaseProperties(param.getProperties());
+				//			p.getPropertiesMap().setProperty(propName, value);
+				design.addParameter(p);
 			}
-			JRDesignParameter p = new JRDesignParameter();
-			p.setValueClassName(param.getTypeAsString());
-			p.setValueClass(Class.forName(param.getTypeAsString()));
-			p.setName(param.getName());
-			p.setForPrompting(param.isForPrompting());
-			p.setDescription(param.getDescription());
-			p.setNestedType(param.getNestedType());
-			p.getPropertiesMap().setBaseProperties(param.getProperties());
-//			p.getPropertiesMap().setProperty(propName, value);
-			design.addParameter(p);
-		}
-
-
-		JasperDesign oldDesign = ReportTypeUtil.loadJasperDesign(jasperReportXml);
-		oldDesign.getParametersList().clear();
-		oldDesign.getParametersList().addAll(design.getParametersList());
-
-		oldDesign.getFieldsList().clear();
-		oldDesign.getFieldsList().addAll(design.getFieldsList());
-
-		JRDesignQuery q = new JRDesignQuery();
-		q.setLanguage("mql");
-		q.setText(query);
-		oldDesign.setQuery(q);
-
-		String reportAsString = JRXmlWriter.writeReport(oldDesign, "UTF-8");
-		return Base64.encodeBase64(reportAsString.getBytes());
-
-		} catch (JRException | ClassNotFoundException | SchemaException ex){
+
+			JasperDesign oldDesign = ReportTypeUtil.loadJasperDesign(jasperReportXml);
+			oldDesign.getParametersList().clear();
+			oldDesign.getParametersList().addAll(design.getParametersList());
+
+			oldDesign.getFieldsList().clear();
+			oldDesign.getFieldsList().addAll(design.getFieldsList());
+
+			JRDesignQuery q = new JRDesignQuery();
+			q.setLanguage("mql");
+			q.setText(query);
+			oldDesign.setQuery(q);
+
+			String reportAsString = JRXmlWriter.writeReport(oldDesign, "UTF-8");
+			return Base64.encodeBase64(reportAsString.getBytes("UTF-8"));
+
+		} catch (JRException | ClassNotFoundException | SchemaException | UnsupportedEncodingException ex) {
 			throw new IllegalStateException(ex.getMessage(), ex.getCause());
 		}