diff options
| author |   Francis Toth <francis.toth@yoppworks.com> | 2020-06-18 15:23:12 -0400 |
|---|---|---|
| committer |   Ofir Sonsino <ofir.sonsino@intl.att.com> | 2020-06-21 07:05:18 +0000 |
| commit | 9c414d7dbbe337c365b52f708ccd1c4ccf36021c (patch) | |
| tree | bffb9aa71fd0d3d3cac4a9ea722ef0d9a13677dc /asdctool/src/main/java | |
| parent | 8a44c78d37e82363cf572b6d9578e1cc6f6860bd (diff) | |
Decouple TXT Report file writing and formatting logic (2/6)
This commit aims to move the reportStartValidatorRun function's logic from ReportManager (deprecated) to ReportFile.
Signed-off-by: Francis Toth <francis.toth@yoppworks.com>
Change-Id: I93c2e8f98cdef598094647d734d0deec0f1941db
Issue-ID: SDC-2499
Diffstat (limited to 'asdctool/src/main/java')
3 files changed, 8 insertions, 8 deletions
diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/TopologyTemplateValidatorExecuter.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/TopologyTemplateValidatorExecuter.java index d6a5d12a25..967a6c68e5 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/TopologyTemplateValidatorExecuter.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/executers/TopologyTemplateValidatorExecuter.java @@ -88,7 +88,7 @@ public class TopologyTemplateValidatorExecuter { TXTFile reportFile, String outputFilePath ) { - ReportManager.reportStartValidatorRun(getName(), vertices.size(), outputFilePath); + reportFile.reportStartValidatorRun(getName(), vertices.size()); Set<String> failedTasks = new HashSet<>(); Set<String> successTasks = new HashSet<>(); boolean successAllVertices = true; diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/report/ReportFile.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/report/ReportFile.java index 8b767662ee..936ec4b251 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/report/ReportFile.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/report/ReportFile.java @@ -58,6 +58,13 @@ public class ReportFile { writer.writeln("-----------------------Vertex: " + vertex.getUniqueId() + ", Task " + taskName + " Started-----------------------"); } + + public void reportStartValidatorRun(String validatorName, int componentsNum) { + writer.writeln(""); + writer.writeln("------ValidatorExecuter " + + validatorName + " Validation Started, on " + + componentsNum + " components---------"); + } } /** diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/utils/ReportManager.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/utils/ReportManager.java index 6e8e2de64a..63e7ebe071 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/utils/ReportManager.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/validator/utils/ReportManager.java @@ -90,13 +90,6 @@ public class ReportManager { writeReportLineToFile(sb.toString(), outputFilePath); } - public static void reportStartValidatorRun(String validatorName, int componenentsNum, String outputFilePath) { - StrBuilder sb = new StrBuilder(); - sb.appendln("------ValidatorExecuter " + validatorName + " Validation Started, on " + componenentsNum - + " components---------"); - writeReportLineToFile(sb.toString(), outputFilePath); - } - public static void reportEndOfToolRun(Report report, String outputFilePath) { StrBuilder sb = new StrBuilder(); sb.appendln("-----------------------------------Validator Tool Summary-----------------------------------"); |