From 3a1d621f653f43e3da722e69df6683a62ee2732e Mon Sep 17 00:00:00 2001 From: markiantorno Date: Mon, 24 Feb 2020 15:30:34 -0500 Subject: [PATCH] reorg package structure --- org.hl7.fhir.validation.cli/pom.xml | 2 +- .../hl7/fhir/{r5 => }/validation/BaseValidator.java | 2 +- .../fhir/{r5 => }/validation/NativeHostServices.java | 2 +- .../fhir/{r5 => }/validation/ValidationEngine.java | 4 ++-- .../org/hl7/fhir/{r5 => }/validation/Validator.java | 10 ++-------- .../org/hl7/fhir/{r5 => }/validation/VersionUtil.java | 2 +- .../{r5 => }/validation/XVerExtensionManager.java | 3 +-- .../hl7/fhir/{r5 => }/validation/XmlValidator.java | 2 +- .../codesystem}/CodeSystemValidator.java | 3 ++- .../instance}/EnableWhenEvaluator.java | 4 ++-- .../instance}/InstanceValidator.java | 11 +++++------ .../instance}/InstanceValidatorFactory.java | 2 +- .../instance}/utils/ChildIterator.java | 4 ++-- .../instance}/utils/ElementInfo.java | 2 +- .../instance}/utils/EntrySummary.java | 3 +-- .../instance}/utils/IndexedElement.java | 2 +- .../instance}/utils/ResolvedReference.java | 4 ++-- .../instance}/utils/ResourceValidationTracker.java | 2 +- .../instance}/utils/ValidatorHostContext.java | 2 +- .../profile}/ProfileValidator.java | 3 ++- .../fhir/validation/tests/CDAValidationTestCase.java | 3 +-- .../validation/tests/NativeHostServiceTester.java | 4 +--- .../fhir/validation/tests/ProfileComparisonTests.java | 6 +----- .../fhir/validation/tests/TransformationTests.java | 2 +- .../fhir/validation/tests/ValidationEngineTests.java | 4 +--- .../fhir/validation/tests/ValidationTestSuite.java | 4 ++-- 26 files changed, 38 insertions(+), 54 deletions(-) rename org.hl7.fhir.validation/src/main/java/org/hl7/fhir/{r5 => }/validation/BaseValidator.java (99%) rename org.hl7.fhir.validation/src/main/java/org/hl7/fhir/{r5 => }/validation/NativeHostServices.java (99%) rename org.hl7.fhir.validation/src/main/java/org/hl7/fhir/{r5 => }/validation/ValidationEngine.java (99%) rename org.hl7.fhir.validation/src/main/java/org/hl7/fhir/{r5 => }/validation/Validator.java (99%) rename org.hl7.fhir.validation/src/main/java/org/hl7/fhir/{r5 => }/validation/VersionUtil.java (98%) rename org.hl7.fhir.validation/src/main/java/org/hl7/fhir/{r5 => }/validation/XVerExtensionManager.java (98%) rename org.hl7.fhir.validation/src/main/java/org/hl7/fhir/{r5 => }/validation/XmlValidator.java (99%) rename org.hl7.fhir.validation/src/main/java/org/hl7/fhir/{r5/validation => validation/codesystem}/CodeSystemValidator.java (95%) rename org.hl7.fhir.validation/src/main/java/org/hl7/fhir/{r5/validation => validation/instance}/EnableWhenEvaluator.java (99%) rename org.hl7.fhir.validation/src/main/java/org/hl7/fhir/{r5/validation/instancevalidator => validation/instance}/InstanceValidator.java (99%) rename org.hl7.fhir.validation/src/main/java/org/hl7/fhir/{r5/validation/instancevalidator => validation/instance}/InstanceValidatorFactory.java (95%) rename org.hl7.fhir.validation/src/main/java/org/hl7/fhir/{r5/validation/instancevalidator => validation/instance}/utils/ChildIterator.java (95%) rename org.hl7.fhir.validation/src/main/java/org/hl7/fhir/{r5/validation/instancevalidator => validation/instance}/utils/ElementInfo.java (97%) rename org.hl7.fhir.validation/src/main/java/org/hl7/fhir/{r5/validation/instancevalidator => validation/instance}/utils/EntrySummary.java (87%) rename org.hl7.fhir.validation/src/main/java/org/hl7/fhir/{r5/validation/instancevalidator => validation/instance}/utils/IndexedElement.java (93%) rename org.hl7.fhir.validation/src/main/java/org/hl7/fhir/{r5/validation/instancevalidator => validation/instance}/utils/ResolvedReference.java (91%) rename org.hl7.fhir.validation/src/main/java/org/hl7/fhir/{r5/validation/instancevalidator => validation/instance}/utils/ResourceValidationTracker.java (96%) rename org.hl7.fhir.validation/src/main/java/org/hl7/fhir/{r5/validation/instancevalidator => validation/instance}/utils/ValidatorHostContext.java (98%) rename org.hl7.fhir.validation/src/main/java/org/hl7/fhir/{r5/validation => validation/profile}/ProfileValidator.java (98%) diff --git a/org.hl7.fhir.validation.cli/pom.xml b/org.hl7.fhir.validation.cli/pom.xml index c1d18a95e..9846469f8 100644 --- a/org.hl7.fhir.validation.cli/pom.xml +++ b/org.hl7.fhir.validation.cli/pom.xml @@ -88,7 +88,7 @@ true - org.hl7.fhir.r5.validation.Validator + org.hl7.fhir.validation.Validator diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/BaseValidator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/BaseValidator.java similarity index 99% rename from org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/BaseValidator.java rename to org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/BaseValidator.java index 81735d662..6327a9e4f 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/BaseValidator.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/BaseValidator.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.r5.validation; +package org.hl7.fhir.validation; /*- * #%L diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/NativeHostServices.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/NativeHostServices.java similarity index 99% rename from org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/NativeHostServices.java rename to org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/NativeHostServices.java index 1570889b3..9cfecbbf3 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/NativeHostServices.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/NativeHostServices.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.r5.validation; +package org.hl7.fhir.validation; /*- * #%L diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/ValidationEngine.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidationEngine.java similarity index 99% rename from org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/ValidationEngine.java rename to org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidationEngine.java index 411244049..7c38815a1 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/ValidationEngine.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidationEngine.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.r5.validation; +package org.hl7.fhir.validation; import org.apache.commons.io.IOUtils; import org.hl7.fhir.convertors.*; @@ -22,7 +22,7 @@ import org.hl7.fhir.r5.terminologies.ConceptMapEngine; import org.hl7.fhir.r5.utils.*; import org.hl7.fhir.r5.utils.IResourceValidator.*; import org.hl7.fhir.r5.utils.StructureMapUtilities.ITransformerServices; -import org.hl7.fhir.r5.validation.instancevalidator.InstanceValidator; +import org.hl7.fhir.validation.instance.InstanceValidator; import org.hl7.fhir.utilities.IniFile; import org.hl7.fhir.utilities.TextFile; import org.hl7.fhir.utilities.Utilities; diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/Validator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/Validator.java similarity index 99% rename from org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/Validator.java rename to org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/Validator.java index 9b7bce8d2..3b0913127 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/Validator.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/Validator.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.r5.validation; +package org.hl7.fhir.validation; /*- * #%L @@ -49,13 +49,8 @@ POSSIBILITY OF SUCH DAMAGE. */ import java.awt.Desktop; -import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.net.HttpURLConnection; -import java.net.URL; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -85,14 +80,13 @@ import org.hl7.fhir.r5.model.Resource; import org.hl7.fhir.r5.model.StructureDefinition; import org.hl7.fhir.r5.utils.KeyGenerator; import org.hl7.fhir.r5.utils.ToolingExtensions; -import org.hl7.fhir.r5.validation.ValidationEngine.ScanOutputItem; +import org.hl7.fhir.validation.ValidationEngine.ScanOutputItem; import org.hl7.fhir.utilities.TextFile; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.utilities.VersionUtilities; import org.hl7.fhir.utilities.cache.PackageCacheManager; import org.hl7.fhir.utilities.cache.ToolsVersion; import org.hl7.fhir.utilities.validation.ValidationMessage; -import org.hl7.fhir.utilities.xhtml.XhtmlComposer; /** * A executable class that will validate one or more FHIR resources against diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/VersionUtil.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/VersionUtil.java similarity index 98% rename from org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/VersionUtil.java rename to org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/VersionUtil.java index b4ad10a4c..ea94e1f8e 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/VersionUtil.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/VersionUtil.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.r5.validation; +package org.hl7.fhir.validation; /* * #%L diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/XVerExtensionManager.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/XVerExtensionManager.java similarity index 98% rename from org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/XVerExtensionManager.java rename to org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/XVerExtensionManager.java index 10f67a116..ef658c4de 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/XVerExtensionManager.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/XVerExtensionManager.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.r5.validation; +package org.hl7.fhir.validation; import java.io.IOException; import java.util.Date; @@ -16,7 +16,6 @@ import org.hl7.fhir.r5.model.StructureDefinition.ExtensionContextType; import org.hl7.fhir.r5.model.StructureDefinition.StructureDefinitionKind; import org.hl7.fhir.r5.model.StructureDefinition.TypeDerivationRule; import org.hl7.fhir.r5.model.UriType; -import org.hl7.fhir.r5.validation.XVerExtensionManager.XVerExtensionStatus; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.utilities.VersionUtilities; import org.hl7.fhir.utilities.json.JsonTrackingParser; diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/XmlValidator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/XmlValidator.java similarity index 99% rename from org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/XmlValidator.java rename to org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/XmlValidator.java index 5f87599b1..bd5619e2b 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/XmlValidator.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/XmlValidator.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.r5.validation; +package org.hl7.fhir.validation; /*- * #%L diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/CodeSystemValidator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/codesystem/CodeSystemValidator.java similarity index 95% rename from org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/CodeSystemValidator.java rename to org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/codesystem/CodeSystemValidator.java index 28adbb0be..492a113a7 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/CodeSystemValidator.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/codesystem/CodeSystemValidator.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.r5.validation; +package org.hl7.fhir.validation.codesystem; /*- * #%L @@ -30,6 +30,7 @@ import org.hl7.fhir.r5.model.CodeSystem; import org.hl7.fhir.r5.model.CodeSystem.ConceptDefinitionComponent; import org.hl7.fhir.utilities.validation.ValidationMessage; import org.hl7.fhir.utilities.validation.ValidationMessage.IssueType; +import org.hl7.fhir.validation.BaseValidator; public class CodeSystemValidator extends BaseValidator { diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/EnableWhenEvaluator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/EnableWhenEvaluator.java similarity index 99% rename from org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/EnableWhenEvaluator.java rename to org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/EnableWhenEvaluator.java index 468b09647..03ec83379 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/EnableWhenEvaluator.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/EnableWhenEvaluator.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.r5.validation; +package org.hl7.fhir.validation.instance; /*- * #%L @@ -28,7 +28,7 @@ import org.hl7.fhir.r5.elementmodel.Element; import org.hl7.fhir.r5.model.*; import org.hl7.fhir.r5.model.Questionnaire.*; import org.hl7.fhir.r5.utils.FHIRPathEngine; -import org.hl7.fhir.r5.validation.instancevalidator.utils.ValidatorHostContext; +import org.hl7.fhir.validation.instance.utils.ValidatorHostContext; import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException; diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/instancevalidator/InstanceValidator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidator.java similarity index 99% rename from org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/instancevalidator/InstanceValidator.java rename to org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidator.java index 2e5f1e30e..93b597899 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/instancevalidator/InstanceValidator.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidator.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.r5.validation.instancevalidator; +package org.hl7.fhir.validation.instance; /*- * #%L @@ -126,11 +126,9 @@ import org.hl7.fhir.r5.utils.FHIRPathEngine; import org.hl7.fhir.r5.utils.FHIRPathEngine.IEvaluationContext; import org.hl7.fhir.r5.utils.IResourceValidator; import org.hl7.fhir.r5.utils.ToolingExtensions; -import org.hl7.fhir.r5.validation.BaseValidator; -import org.hl7.fhir.r5.validation.EnableWhenEvaluator; -import org.hl7.fhir.r5.validation.EnableWhenEvaluator.QStack; -import org.hl7.fhir.r5.validation.XVerExtensionManager; -import org.hl7.fhir.r5.validation.instancevalidator.utils.*; +import org.hl7.fhir.validation.BaseValidator; +import org.hl7.fhir.validation.instance.EnableWhenEvaluator.QStack; +import org.hl7.fhir.validation.XVerExtensionManager; import org.hl7.fhir.utilities.CommaSeparatedStringBuilder; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.utilities.Utilities.DecimalStatus; @@ -142,6 +140,7 @@ import org.hl7.fhir.utilities.validation.ValidationMessage.IssueType; import org.hl7.fhir.utilities.validation.ValidationMessage.Source; import org.hl7.fhir.utilities.xhtml.NodeType; import org.hl7.fhir.utilities.xhtml.XhtmlNode; +import org.hl7.fhir.validation.instance.utils.*; import org.w3c.dom.Document; import com.google.gson.Gson; diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/instancevalidator/InstanceValidatorFactory.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidatorFactory.java similarity index 95% rename from org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/instancevalidator/InstanceValidatorFactory.java rename to org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidatorFactory.java index 90ef501a3..547bf02af 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/instancevalidator/InstanceValidatorFactory.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidatorFactory.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.r5.validation.instancevalidator; +package org.hl7.fhir.validation.instance; import org.hl7.fhir.exceptions.FHIRException; diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/instancevalidator/utils/ChildIterator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/utils/ChildIterator.java similarity index 95% rename from org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/instancevalidator/utils/ChildIterator.java rename to org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/utils/ChildIterator.java index 09e35d78c..5dd0f832f 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/instancevalidator/utils/ChildIterator.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/utils/ChildIterator.java @@ -1,7 +1,7 @@ -package org.hl7.fhir.r5.validation.instancevalidator.utils; +package org.hl7.fhir.validation.instance.utils; import org.hl7.fhir.r5.elementmodel.Element; -import org.hl7.fhir.r5.validation.instancevalidator.InstanceValidator; +import org.hl7.fhir.validation.instance.InstanceValidator; import org.hl7.fhir.utilities.Utilities; public class ChildIterator { diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/instancevalidator/utils/ElementInfo.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/utils/ElementInfo.java similarity index 97% rename from org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/instancevalidator/utils/ElementInfo.java rename to org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/utils/ElementInfo.java index b3f7b69b6..15a5f2ce0 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/instancevalidator/utils/ElementInfo.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/utils/ElementInfo.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.r5.validation.instancevalidator.utils; +package org.hl7.fhir.validation.instance.utils; import org.hl7.fhir.r5.elementmodel.Element; import org.hl7.fhir.r5.model.ElementDefinition; diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/instancevalidator/utils/EntrySummary.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/utils/EntrySummary.java similarity index 87% rename from org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/instancevalidator/utils/EntrySummary.java rename to org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/utils/EntrySummary.java index 8457ead30..05bb76098 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/instancevalidator/utils/EntrySummary.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/utils/EntrySummary.java @@ -1,7 +1,6 @@ -package org.hl7.fhir.r5.validation.instancevalidator.utils; +package org.hl7.fhir.validation.instance.utils; import org.hl7.fhir.r5.elementmodel.Element; -import org.hl7.fhir.r5.validation.instancevalidator.InstanceValidator; import java.util.ArrayList; import java.util.List; diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/instancevalidator/utils/IndexedElement.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/utils/IndexedElement.java similarity index 93% rename from org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/instancevalidator/utils/IndexedElement.java rename to org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/utils/IndexedElement.java index feeb9d505..d103c3ce7 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/instancevalidator/utils/IndexedElement.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/utils/IndexedElement.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.r5.validation.instancevalidator.utils; +package org.hl7.fhir.validation.instance.utils; import org.hl7.fhir.r5.elementmodel.Element; diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/instancevalidator/utils/ResolvedReference.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/utils/ResolvedReference.java similarity index 91% rename from org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/instancevalidator/utils/ResolvedReference.java rename to org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/utils/ResolvedReference.java index 7c619cd09..4066e1d2a 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/instancevalidator/utils/ResolvedReference.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/utils/ResolvedReference.java @@ -1,8 +1,8 @@ -package org.hl7.fhir.r5.validation.instancevalidator.utils; +package org.hl7.fhir.validation.instance.utils; import org.hl7.fhir.r5.elementmodel.Element; import org.hl7.fhir.r5.model.StructureDefinition; -import org.hl7.fhir.r5.validation.instancevalidator.InstanceValidator; +import org.hl7.fhir.validation.instance.InstanceValidator; public class ResolvedReference { diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/instancevalidator/utils/ResourceValidationTracker.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/utils/ResourceValidationTracker.java similarity index 96% rename from org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/instancevalidator/utils/ResourceValidationTracker.java rename to org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/utils/ResourceValidationTracker.java index 92962c578..7d48a1c9b 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/instancevalidator/utils/ResourceValidationTracker.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/utils/ResourceValidationTracker.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.r5.validation.instancevalidator.utils; +package org.hl7.fhir.validation.instance.utils; import org.hl7.fhir.r5.model.StructureDefinition; import org.hl7.fhir.utilities.validation.ValidationMessage; diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/instancevalidator/utils/ValidatorHostContext.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/utils/ValidatorHostContext.java similarity index 98% rename from org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/instancevalidator/utils/ValidatorHostContext.java rename to org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/utils/ValidatorHostContext.java index 5eb22397c..c823fd570 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/instancevalidator/utils/ValidatorHostContext.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/utils/ValidatorHostContext.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.r5.validation.instancevalidator.utils; +package org.hl7.fhir.validation.instance.utils; import org.hl7.fhir.r5.elementmodel.Element; import org.hl7.fhir.r5.model.StructureDefinition; diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/ProfileValidator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/profile/ProfileValidator.java similarity index 98% rename from org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/ProfileValidator.java rename to org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/profile/ProfileValidator.java index 53ae98d3d..e1fb8a787 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/ProfileValidator.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/profile/ProfileValidator.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.r5.validation; +package org.hl7.fhir.validation.profile; /*- * #%L @@ -34,6 +34,7 @@ import org.hl7.fhir.r5.utils.FHIRPathEngine; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.utilities.validation.ValidationMessage; import org.hl7.fhir.utilities.validation.ValidationMessage.IssueType; +import org.hl7.fhir.validation.BaseValidator; public class ProfileValidator extends BaseValidator { diff --git a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/CDAValidationTestCase.java b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/CDAValidationTestCase.java index eabbe5e92..c1735254a 100644 --- a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/CDAValidationTestCase.java +++ b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/CDAValidationTestCase.java @@ -2,8 +2,7 @@ package org.hl7.fhir.validation.tests; import org.hl7.fhir.r4.context.SimpleWorkerContext; import org.hl7.fhir.r5.test.utils.TestingUtilities; -import org.hl7.fhir.r5.validation.Validator; -import org.hl7.fhir.validation.tests.utilities.TestUtilities; +import org.hl7.fhir.validation.Validator; import org.junit.Test; public class CDAValidationTestCase { diff --git a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/NativeHostServiceTester.java b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/NativeHostServiceTester.java index ba3403355..539e1d7ce 100644 --- a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/NativeHostServiceTester.java +++ b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/NativeHostServiceTester.java @@ -2,9 +2,7 @@ package org.hl7.fhir.validation.tests; import org.hl7.fhir.r5.elementmodel.Manager.FhirFormat; import org.hl7.fhir.r5.test.utils.TestingUtilities; -import org.hl7.fhir.r5.validation.NativeHostServices; -import org.hl7.fhir.utilities.TextFile; -import org.hl7.fhir.validation.tests.utilities.TestUtilities; +import org.hl7.fhir.validation.NativeHostServices; import org.junit.Test; public class NativeHostServiceTester { diff --git a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ProfileComparisonTests.java b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ProfileComparisonTests.java index 3b4f475e3..c2607a462 100644 --- a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ProfileComparisonTests.java +++ b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ProfileComparisonTests.java @@ -1,19 +1,15 @@ package org.hl7.fhir.validation.tests; -import java.awt.Desktop; import java.io.File; import java.util.UUID; import org.hl7.fhir.r5.conformance.ProfileComparer; import org.hl7.fhir.r5.model.FhirPublication; -import org.hl7.fhir.r5.model.OperationOutcome; import org.hl7.fhir.r5.model.StructureDefinition; import org.hl7.fhir.r5.utils.KeyGenerator; -import org.hl7.fhir.r5.model.OperationOutcome.OperationOutcomeIssueComponent; import org.hl7.fhir.r5.test.utils.TestingUtilities; -import org.hl7.fhir.r5.validation.ValidationEngine; +import org.hl7.fhir.validation.ValidationEngine; import org.hl7.fhir.validation.tests.utilities.TestUtilities; -import org.junit.Assert; import org.junit.Test; public class ProfileComparisonTests { diff --git a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/TransformationTests.java b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/TransformationTests.java index 0b36ed297..e695dd8b5 100644 --- a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/TransformationTests.java +++ b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/TransformationTests.java @@ -3,7 +3,7 @@ package org.hl7.fhir.validation.tests; import java.io.File; import org.hl7.fhir.r4.test.utils.TestingUtilities; -import org.hl7.fhir.r5.validation.Validator; +import org.hl7.fhir.validation.Validator; import org.hl7.fhir.utilities.Utilities; import org.junit.Test; diff --git a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ValidationEngineTests.java b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ValidationEngineTests.java index 54b270906..4c662240b 100644 --- a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ValidationEngineTests.java +++ b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ValidationEngineTests.java @@ -1,6 +1,5 @@ package org.hl7.fhir.validation.tests; -import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -10,8 +9,7 @@ import org.hl7.fhir.r5.model.OperationOutcome; import org.hl7.fhir.r5.model.OperationOutcome.IssueSeverity; import org.hl7.fhir.r5.model.OperationOutcome.OperationOutcomeIssueComponent; import org.hl7.fhir.r5.test.utils.TestingUtilities; -import org.hl7.fhir.r5.validation.ValidationEngine; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.validation.ValidationEngine; import org.hl7.fhir.validation.tests.utilities.TestUtilities; import org.junit.Assert; import org.junit.Test; diff --git a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ValidationTestSuite.java b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ValidationTestSuite.java index 7b694f755..331a37715 100644 --- a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ValidationTestSuite.java +++ b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ValidationTestSuite.java @@ -26,8 +26,8 @@ import org.hl7.fhir.r5.utils.FHIRPathEngine.IEvaluationContext; import org.hl7.fhir.r5.utils.IResourceValidator; import org.hl7.fhir.r5.utils.IResourceValidator.IValidatorResourceFetcher; import org.hl7.fhir.r5.utils.IResourceValidator.ReferenceValidationPolicy; -import org.hl7.fhir.r5.validation.instancevalidator.InstanceValidator; -import org.hl7.fhir.r5.validation.ValidationEngine; +import org.hl7.fhir.validation.instance.InstanceValidator; +import org.hl7.fhir.validation.ValidationEngine; import org.hl7.fhir.utilities.TextFile; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.utilities.VersionUtilities;