fix OLAP instantiation

Author: eng-dedalus

knowageutils/src/main/java/it/eng/spagobi/utilities/engines/EngineStartServletIOManager.java

@@ -218,7 +218,7 @@ public JSONObject getTemplateAsJSONObject() {
 			templateJSON = template != null ? new JSONObject(template) : null;
 		} catch (Throwable t) {
 			logger.error("Impossible to decode template's content\n" + t);
-			throw new SpagoBIRuntimeException("Impossible to decode template's content [" + template.getFileName() + "]", t);
+			throw new SpagoBIRuntimeException("Impossible to decode template's content [" + getCurrentTemplateName() + "]", t);
 
 		}
 
@@ -232,7 +232,7 @@ public SourceBean getTemplateAsSourceBean() {
 			templateSB = TemplateSourceBeanParser.parse(template);
 		} catch (SourceBeanException e) {
 			logger.error("Impossible to decode template's content\n" + e);
-			throw new SpagoBIRuntimeException("Impossible to decode template's content [" + template.getFileName() + "]", e);
+			throw new SpagoBIRuntimeException("Impossible to decode template's content [" + getCurrentTemplateName() + "]", e);
 
 		}
 
@@ -288,6 +288,16 @@ public String getTemplateName() {
 		return templateName;
 	}
 
+	private String getCurrentTemplateName() {
+		if (templateName != null) {
+			return templateName;
+		}
+		if (template != null) {
+			return template.getFileName();
+		}
+		return "unknown";
+	}
+
 	public IDataSource getDataSource() {
 		if (dataSource == null) {
 			String connectionName = getParameterAsString("connectionName");

knowageutils/src/main/java/it/eng/spagobi/utilities/engines/TemplateSourceBeanParser.java

@@ -23,21 +23,38 @@
 
 import it.eng.spago.base.SourceBean;
 import it.eng.spago.base.SourceBeanException;
+import it.eng.spago.util.XMLUtil;
 
 public final class TemplateSourceBeanParser {
 
 	private TemplateSourceBeanParser() {
 	}
 
 	public static SourceBean parse(String templateContent) throws SourceBeanException {
+		String normalizedTemplateContent = normalizeTemplateContent(templateContent);
+		if (normalizedTemplateContent == null) {
+			return null;
+		}
+		return SourceBean.fromXMLStream(new InputSource(new StringReader(normalizedTemplateContent)));
+	}
+
+	private static String normalizeTemplateContent(String templateContent) throws SourceBeanException {
 		String sanitizedTemplateContent = sanitizeTemplateContent(templateContent);
 		if (sanitizedTemplateContent == null) {
 			return null;
 		}
 		if (sanitizedTemplateContent.isEmpty()) {
 			throw new SourceBeanException("xmlSourceBean non valido");
 		}
-		return SourceBean.fromXMLStream(new InputSource(new StringReader(sanitizedTemplateContent)));
+		if (!sanitizedTemplateContent.startsWith("<")) {
+			String wrappedTemplateContent = getXmlHeader() + "\n<XMLSOURCEBEAN>\n" + sanitizedTemplateContent + "\n</XMLSOURCEBEAN>";
+			SourceBean wrappedTemplateSourceBean = SourceBean.fromXMLStream(new InputSource(new StringReader(wrappedTemplateContent)));
+			sanitizedTemplateContent = wrappedTemplateSourceBean.getCharacters();
+		}
+		if (!sanitizedTemplateContent.startsWith(XMLUtil.XML_HEADER_PREFIX)) {
+			sanitizedTemplateContent = getXmlHeader() + "\n" + sanitizedTemplateContent;
+		}
+		return sanitizedTemplateContent;
 	}
 
 	private static String sanitizeTemplateContent(String templateContent) {
@@ -51,4 +68,9 @@ private static String removeUtf8Bom(String templateContent) {
 		}
 		return templateContent;
 	}
+
+	private static String getXmlHeader() {
+		return XMLUtil.XML_HEADER_PREFIX + " version=\"" + XMLUtil.XML_HEADER_DEFAULT_VERSION + "\" "
+				+ "encoding=\"" + XMLUtil.XML_HEADER_DEFAULT_ENCODING + "\"?>";
+	}
 }

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

@@ -36,6 +36,15 @@ public void testGetTemplateAsSourceBeanParsesXmlWithoutDeclaration() {
 		Assert.assertNotNull(template.getAttribute("CUBE"));
 	}
 
+	@Test
+	public void testGetTemplateAsSourceBeanParsesXmlWithDeclaration() {
+		SourceBean template = new TestEngineRestService("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?><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>")