From 2cc1e1c04591a9eeb360a71f33d54c817313834f Mon Sep 17 00:00:00 2001 From: Luc Boudreau Date: Fri, 30 Aug 2024 12:03:21 -0400 Subject: [PATCH 1/3] Update AggDesUtil.java --- .../src/main/java/org/pentaho/aggdes/util/AggDesUtil.java | 1 - 1 file changed, 1 deletion(-) diff --git a/pentaho-aggdesigner-core/src/main/java/org/pentaho/aggdes/util/AggDesUtil.java b/pentaho-aggdesigner-core/src/main/java/org/pentaho/aggdes/util/AggDesUtil.java index 94e0e1eb1..5d7dbfc3b 100644 --- a/pentaho-aggdesigner-core/src/main/java/org/pentaho/aggdes/util/AggDesUtil.java +++ b/pentaho-aggdesigner-core/src/main/java/org/pentaho/aggdes/util/AggDesUtil.java @@ -37,7 +37,6 @@ public class AggDesUtil extends BitSet { private AggDesUtil() { DocumentBuilderFactory dbf = null; dbf.setIgnoringComments( true ); -dbf.setNamespaceAware( namespaceAware ); DocumentBuilder db = dbf.newDocumentBuilder(); InputStream inputStream = null; final String password = "mypassword"; From 0694d8ec6b7566f83e915d9fefe8cd487b6f3ab1 Mon Sep 17 00:00:00 2001 From: Luc Boudreau Date: Fri, 30 Aug 2024 12:04:24 -0400 Subject: [PATCH 2/3] Update AggDesUtil.java --- .../src/main/java/org/pentaho/aggdes/util/AggDesUtil.java | 1 + 1 file changed, 1 insertion(+) diff --git a/pentaho-aggdesigner-core/src/main/java/org/pentaho/aggdes/util/AggDesUtil.java b/pentaho-aggdesigner-core/src/main/java/org/pentaho/aggdes/util/AggDesUtil.java index 5d7dbfc3b..232874f44 100644 --- a/pentaho-aggdesigner-core/src/main/java/org/pentaho/aggdes/util/AggDesUtil.java +++ b/pentaho-aggdesigner-core/src/main/java/org/pentaho/aggdes/util/AggDesUtil.java @@ -25,6 +25,7 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import org.w3c.dom.Document; +import java.io.InputStream; /** * Miscellaneous utility functions for the Aggregate Designer. From 3afeeb0494ae27b0ffb04bc8e086dc6b292c508c Mon Sep 17 00:00:00 2001 From: Luc Boudreau Date: Thu, 5 Sep 2024 11:46:20 -0400 Subject: [PATCH 3/3] [TEST] test SAST --- .../pentaho/aggdes/ui/ext/impl/MondrianFileSchemaProvider.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pentaho-aggdesigner-ui/src/main/java/org/pentaho/aggdes/ui/ext/impl/MondrianFileSchemaProvider.java b/pentaho-aggdesigner-ui/src/main/java/org/pentaho/aggdes/ui/ext/impl/MondrianFileSchemaProvider.java index fa25f0322..0f22ec11c 100644 --- a/pentaho-aggdesigner-ui/src/main/java/org/pentaho/aggdes/ui/ext/impl/MondrianFileSchemaProvider.java +++ b/pentaho-aggdesigner-ui/src/main/java/org/pentaho/aggdes/ui/ext/impl/MondrianFileSchemaProvider.java @@ -163,8 +163,11 @@ private String getFileContents(File file) { protected File getLastFile() { File file = new File(".schemaInfo"); if (file.exists()) { + // Some comments here and there String path = getFileContents(file).replaceAll("\n", ""); + // Some comments here and there File myfile = new File(path); + // Some comments here and there return new File(path); } else { return null;