fix OLAP instantiation

Author: eng-dedalus

knowage-export/src/test/java/it/eng/knowage/engine/api/export/dashboard/excel/DashboardExcelExporterTest.java

@@ -0,0 +1,38 @@
+package it.eng.knowage.engine.api.export.dashboard.excel;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class DashboardExcelExporterTest {
+
+    @Test
+    public void shouldKeepXlsxStyleEnabledByDefaultForSingleWidgetExports() {
+        assertTrue(DashboardExcelExporter.isXlsxStyleEnabled(new JSONObject(), true));
+    }
+
+    @Test
+    public void shouldReadXlsxStyleEnabledFromSingleWidgetRoot() throws JSONException {
+        JSONObject body = new JSONObject().put("xlsxStyleEnabled", false);
+
+        assertFalse(DashboardExcelExporter.isXlsxStyleEnabled(body, true));
+    }
+
+    @Test
+    public void shouldKeepXlsxStyleEnabledByDefaultForDashboardExports() {
+        assertTrue(DashboardExcelExporter.isXlsxStyleEnabled(new JSONObject(), false));
+    }
+
+    @Test
+    public void shouldReadXlsxStyleEnabledFromDashboardMenuWidgetsConfiguration() throws JSONException {
+        JSONObject body = new JSONObject()
+                .put("configuration", new JSONObject()
+                        .put("menuWidgets", new JSONObject()
+                                .put("xlsxStyleEnabled", false)));
+
+        assertFalse(DashboardExcelExporter.isXlsxStyleEnabled(body, false));
+    }
+}

knowageutils/src/main/java/it/eng/spagobi/utilities/engines/rest/AbstractEngineRestService.java

@@ -18,6 +18,8 @@
 
 package it.eng.spagobi.utilities.engines.rest;
 
+import java.io.StringReader;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 
 import javax.xml.bind.DatatypeConverter;
@@ -26,6 +28,7 @@
 import org.apache.logging.log4j.Logger;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.xml.sax.InputSource;
 
 import it.eng.spago.base.SourceBean;
 import it.eng.spago.base.SourceBeanException;
@@ -97,7 +100,7 @@ public abstract class AbstractEngineRestService extends AbstractRestService {
 	public SourceBean getTemplateAsSourceBean() {
 		SourceBean templateSB = null;
 		try {
-			templateSB = SourceBean.fromXMLString(getTemplateAsString());
+			templateSB = parseTemplateAsSourceBean(getTemplateAsString());
 		} catch (SourceBeanException e) {
 			SpagoBIEngineStartupException engineException = new SpagoBIEngineStartupException(getEngineName(),
 					"Impossible to parse template's content", e);
@@ -109,10 +112,33 @@ public SourceBean getTemplateAsSourceBean() {
 		return templateSB;
 	}
 
+	private static SourceBean parseTemplateAsSourceBean(String templateContent) throws SourceBeanException {
+		if (templateContent == null) {
+			return null;
+		}
+		String sanitizedTemplateContent = sanitizeTemplateContent(templateContent);
+		if (sanitizedTemplateContent.isEmpty()) {
+			throw new SourceBeanException("xmlSourceBean non valido");
+		}
+		return SourceBean.fromXMLStream(new InputSource(new StringReader(sanitizedTemplateContent)));
+	}
+
+	private static String sanitizeTemplateContent(String templateContent) {
+		String sanitizedTemplateContent = removeUtf8Bom(templateContent);
+		return sanitizedTemplateContent != null ? sanitizedTemplateContent.trim() : null;
+	}
+
+	private static String removeUtf8Bom(String templateContent) {
+		if (templateContent != null && !templateContent.isEmpty() && templateContent.charAt(0) == '\uFEFF') {
+			return templateContent.substring(1);
+		}
+		return templateContent;
+	}
+
 	public String getTemplateAsString() {
 		byte[] temp = getTemplate();
 		if (temp != null) {
-			return new String(temp);
+			return new String(temp, StandardCharsets.UTF_8);
 		} else {
 			return "";
 		}

knowageutils/src/test/java/it/eng/spagobi/utilities/engines/rest/AbstractEngineRestServiceTest.java

@@ -0,0 +1,82 @@
+/*
+ * Knowage, Open Source Business Intelligence suite
+ * Copyright (C) 2016 Engineering Ingegneria Informatica S.p.A.
+ *
+ * Knowage is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Knowage is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package it.eng.spagobi.utilities.engines.rest;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import it.eng.spago.base.SourceBean;
+import it.eng.spagobi.utilities.engines.SpagoBIEngineStartupException;
+
+public class AbstractEngineRestServiceTest {
+
+	@Test
+	public void testGetTemplateAsSourceBeanParsesXmlWithoutDeclaration() {
+		SourceBean template = new TestEngineRestService("<olap><cube reference=\"FoodMartMySQL\"/></olap>")
+				.getTemplateAsSourceBean();
+
+		Assert.assertEquals("OLAP", template.getName());
+		Assert.assertNotNull(template.getAttribute("CUBE"));
+	}
+
+	@Test
+	public void testGetTemplateAsSourceBeanStripsUtf8Bom() {
+		SourceBean template = new TestEngineRestService("\uFEFF<olap><cube reference=\"FoodMartMySQL\"/></olap>")
+				.getTemplateAsSourceBean();
+
+		Assert.assertEquals("OLAP", template.getName());
+		Assert.assertNotNull(template.getAttribute("CUBE"));
+	}
+
+	@Test
+	public void testGetTemplateAsSourceBeanWrapsInvalidTemplateErrors() {
+		try {
+			new TestEngineRestService("   ").getTemplateAsSourceBean();
+			Assert.fail("Expected SpagoBIEngineStartupException");
+		} catch (SpagoBIEngineStartupException e) {
+			Assert.assertEquals("Impossible to parse template's content", e.getMessage());
+			Assert.assertNotNull(e.getCause());
+		}
+	}
+
+	private static final class TestEngineRestService extends AbstractEngineRestService {
+
+		private final String templateAsString;
+
+		private TestEngineRestService(String templateAsString) {
+			this.templateAsString = templateAsString;
+		}
+
+		@Override
+		public String getEngineName() {
+			return "TestEngine";
+		}
+
+		@Override
+		public HttpServletRequest getServletRequest() {
+			return null;
+		}
+
+		@Override
+		public String getTemplateAsString() {
+			return templateAsString;
+		}
+	}
+}

knowageutils/src/test/java/it/eng/spagobi/utilities/engines/rest/AllTests.java

@@ -22,7 +22,7 @@
 import org.junit.runners.Suite.SuiteClasses;
 
 @RunWith(Suite.class)
-@SuiteClasses({ SimpleRestClientTest.class })
+@SuiteClasses({ SimpleRestClientTest.class, AbstractEngineRestServiceTest.class })
 public class AllTests {
 
 }