From 0cb1d5f379521bd8351ec244dbe75ac9ee095a68 Mon Sep 17 00:00:00 2001
From: nab <nabila-aazibou-el-gerrab@kereval.com>
Date: Fri, 24 Jun 2022 13:02:26 +0200
Subject: [PATCH] remove-HL7TEMP_RESOURCES_PATH option
---
.../peripherals/GOCExecutor.java | 8 +-------
.../peripherals/HL7Templates2GOC.java | 13 +------------
2 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/peripherals/GOCExecutor.java b/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/peripherals/GOCExecutor.java
index ca02c2b..4e87672 100644
--- a/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/peripherals/GOCExecutor.java
+++ b/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/peripherals/GOCExecutor.java
@@ -24,11 +24,6 @@ public class GOCExecutor {
private static final SimpleDateFormat formatter = new SimpleDateFormat("dd-MM-yyyy-HH-mm-ss");
- public GOCExecutor(String outputFile, String hl7Resources) {
- this.outputFile = outputFile;
- this.hl7Resources = hl7Resources;
- }
-
public GOCExecutor(String outputFile){
this.outputFile = outputFile;
}
@@ -56,8 +51,7 @@ public class GOCExecutor {
environementChecker.checkJavaVersion();
- this.hl7Resources = this.hl7Resources==null?
- getWorkspaceRoot()+"/hl7templates-resources":this.hl7Resources;
+ this.hl7Resources = getWorkspaceRoot()+"/hl7templates-resources";
String HL7ConfFolder = (hl7Conf == null) ? "cdabasic":hl7Conf;
diff --git a/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/peripherals/HL7Templates2GOC.java b/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/peripherals/HL7Templates2GOC.java
index 5cc9e0f..7ff750d 100644
--- a/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/peripherals/HL7Templates2GOC.java
+++ b/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/peripherals/HL7Templates2GOC.java
@@ -36,9 +36,6 @@ public class HL7Templates2GOC implements GOCEntry {
@Option(name = "-HL7TEMP_CDACONFFOLDERNAME", metaVar = "hl7temp_cdaconffoldername", usage = "hl7temp cda conf folder name", required = false)
private String HL7TEMP_CDACONFFOLDERNAME = "cdabasic";
- @Option(name="-HL7TEMP_RESOURCES_PATH", metaVar = "HL7TEMP_RESOURCES_PATH", usage = "path to hl7templates resources folder", required = false)
- private String HL7TEMP_RESOURCES_PATH;
-
@Deprecated
@Option(name = "-rootClassName", metaVar = "rootClassName", usage = "Root Class Name", required = false)
private String rootClassName;
@@ -132,14 +129,6 @@ public class HL7Templates2GOC implements GOCEntry {
this.HL7TEMP_CDACONFFOLDERNAME = HL7TEMP_CDACONFFOLDERNAME;
}
- public String getHL7TEMP_RESOURCES_PATH() {
- return HL7TEMP_RESOURCES_PATH;
- }
-
- public void setHL7TEMP_RESOURCES_PATH(String HL7TEMP_RESOURCES_PATH) {
- this.HL7TEMP_RESOURCES_PATH = HL7TEMP_RESOURCES_PATH;
- }
-
@Deprecated
public String getInputFile() {
@@ -201,7 +190,7 @@ public class HL7Templates2GOC implements GOCEntry {
try {
parser.parseArgument(args);
- GOCExecutor gocExecutor = new GOCExecutor(outputFile, HL7TEMP_RESOURCES_PATH);
+ GOCExecutor gocExecutor = new GOCExecutor(outputFile);
gocExecutor.execute(new PathBBRResource(bbr),mvnExecPath,versionLabel,
ignoreTemplateIdRequirements,ignoreCdaBasicRequirements, serviceName,ignoreChoicesPredicates, HL7TEMP_CDACONFFOLDERNAME);
--
GitLab