honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename to ValidationEngineTask

This commit is contained in:
dotasek 2023-06-05 17:06:10 -04:00
parent 19d557788c
commit a8051d6c45
15 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidatorCli.java
View File

@ -298,13 +298,13 @@ public class ValidatorCli {
final CliTask cliTask = selectCliTask(cliContext, params);
if (cliTask instanceof ValidationServiceTask) {
if (cliTask instanceof ValidationEngineTask) {
if (cliContext.getSv() == null) {
cliContext.setSv(myValidationService.determineVersion(cliContext));
}
ValidationEngine validationEngine = getValidationEngine(tt, cliContext);
tts.end();
((ValidationServiceTask) cliTask).executeTask(myValidationService, validationEngine, cliContext, params, tt, tts);
((ValidationEngineTask) cliTask).executeTask(myValidationService, validationEngine, cliContext, params, tt, tts);
} else if (cliTask instanceof StandaloneTask) {
((StandaloneTask) cliTask).executeTask(cliContext,params,tt,tts);
}

2
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/tasks/CompareTask.java
View File

@ -13,7 +13,7 @@ import org.hl7.fhir.validation.cli.utils.Params;
import java.io.File;
import java.io.PrintStream;
public class CompareTask extends ValidationServiceTask{
public class CompareTask extends ValidationEngineTask {
@Override
public String getName() {
return "compare";

3
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/tasks/CompileTask.java
View File

@ -1,7 +1,6 @@
package org.hl7.fhir.validation.cli.tasks;
import org.hl7.fhir.utilities.TimeTracker;
import org.hl7.fhir.validation.Scanner;
import org.hl7.fhir.validation.ValidationEngine;
import org.hl7.fhir.validation.cli.model.CliContext;
import org.hl7.fhir.validation.cli.services.ValidationService;
@ -9,7 +8,7 @@ import org.hl7.fhir.validation.cli.utils.EngineMode;
import java.io.PrintStream;
public class CompileTask extends ValidationServiceTask {
public class CompileTask extends ValidationEngineTask {
@Override
public String getName() {

2
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/tasks/ConvertTask.java
View File

@ -9,7 +9,7 @@ import org.hl7.fhir.validation.cli.utils.EngineMode;
import java.io.PrintStream;
public class ConvertTask extends ValidationServiceTask {
public class ConvertTask extends ValidationEngineTask {
@Override
public String getName() {

2
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/tasks/FhirpathTask.java
View File

@ -9,7 +9,7 @@ import org.hl7.fhir.validation.cli.utils.EngineMode;
import java.io.PrintStream;
public class FhirpathTask extends ValidationServiceTask {
public class FhirpathTask extends ValidationEngineTask {
@Override
public String getName() {

2
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/tasks/InstallTask.java
View File

@ -8,7 +8,7 @@ import org.hl7.fhir.validation.cli.utils.EngineMode;
import java.io.PrintStream;
public class InstallTask extends ValidationServiceTask {
public class InstallTask extends ValidationEngineTask {
@Override
public String getName() {

2
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/tasks/LangTransformTask.java
View File

@ -8,7 +8,7 @@ import org.hl7.fhir.validation.cli.utils.EngineMode;
import java.io.PrintStream;
public class LangTransformTask extends ValidationServiceTask {
public class LangTransformTask extends ValidationEngineTask {
@Override
public String getName() {

2
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/tasks/NarrativeTask.java
View File

@ -9,7 +9,7 @@ import org.hl7.fhir.validation.cli.utils.EngineMode;
import java.io.PrintStream;
public class NarrativeTask extends ValidationServiceTask {
public class NarrativeTask extends ValidationEngineTask {
@Override
public String getName() {

2
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/tasks/ScanTask.java
View File

@ -9,7 +9,7 @@ import org.hl7.fhir.validation.cli.utils.EngineMode;
import java.io.PrintStream;
public class ScanTask extends ValidationServiceTask {
public class ScanTask extends ValidationEngineTask {
@Override

2
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/tasks/SnapshotTask.java
View File

@ -9,7 +9,7 @@ import org.hl7.fhir.validation.cli.utils.EngineMode;
import java.io.PrintStream;
public class SnapshotTask extends ValidationServiceTask {
public class SnapshotTask extends ValidationEngineTask {
@Override
public String getName() {

2
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/tasks/SpreadsheetTask.java
View File

@ -8,7 +8,7 @@ import org.hl7.fhir.validation.cli.utils.EngineMode;
import java.io.PrintStream;
public class SpreadsheetTask extends ValidationServiceTask {
public class SpreadsheetTask extends ValidationEngineTask {
@Override
public String getName() {

2
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/tasks/TransformTask.java
View File

@ -9,7 +9,7 @@ import org.hl7.fhir.validation.cli.utils.EngineMode;
import java.io.PrintStream;
public class TransformTask extends ValidationServiceTask {
public class TransformTask extends ValidationEngineTask {
@Override
public String getName() {

2
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/tasks/ValidateTask.java
View File

@ -11,7 +11,7 @@ import org.hl7.fhir.validation.cli.utils.Display;
import java.io.PrintStream;
public class ValidateTask extends ValidationServiceTask {
public class ValidateTask extends ValidationEngineTask {
final static String[][] PLACEHOLDERS = {
{ "XML_AND_JSON_FHIR_VERSIONS", "1.0, 1.4, 3.0, 4.0, " + Constants.VERSION_MM },

3
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/tasks/ValidationServiceTask.java → org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/tasks/ValidationEngineTask.java
View File

@ -1,12 +1,11 @@
package org.hl7.fhir.validation.cli.tasks;
import lombok.Getter;
import org.hl7.fhir.utilities.TimeTracker;
import org.hl7.fhir.validation.ValidationEngine;
import org.hl7.fhir.validation.cli.model.CliContext;
import org.hl7.fhir.validation.cli.services.ValidationService;
public abstract class ValidationServiceTask extends CliTask{
public abstract class ValidationEngineTask extends CliTask{
public abstract void executeTask(ValidationService validationService, ValidationEngine validationEngine, CliContext cliContext, String[] args, org.hl7.fhir.utilities.TimeTracker tt, TimeTracker.Session tts) throws Exception;

2
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/tasks/VersionTask.java
View File

@ -9,7 +9,7 @@ import org.hl7.fhir.validation.cli.utils.EngineMode;
import java.io.PrintStream;
public class VersionTask extends ValidationServiceTask {
public class VersionTask extends ValidationEngineTask {
@Override
public String getName() {