From 4bd7405b5bd3a1c87905cd2de38c74709590fc7e Mon Sep 17 00:00:00 2001 From: Sean Muir Date: Fri, 24 Apr 2020 17:14:32 -0400 Subject: [PATCH] Updates to DS4P added validation tracking --- .../contentprofile/CONTENTPROFILEPlugin.java | 1 - .../ConfidentialitySecurityObservation.java | 3 - .../MandatoryDocumentAssignedAuthor.java | 14 +- .../MandatoryDocumentProvenance.java | 8 +- .../MandatoryEntryAssignedAuthor.java | 6 +- .../MandatoryEntryProvenance.java | 8 +- .../ObligationPolicySecurityObservation.java | 3 - .../contentprofile/PrivacyAnnotation.java | 22 ++- .../PrivacyAnnotationEntryRelationship.java | 8 +- .../contentprofile/PrivacyMarkingsEntry.java | 8 +- .../PrivacyMarkingsSection.java | 8 +- .../PrivacySegmentedDocument.java | 16 +-- .../PrivacySegmentedSection.java | 8 +- .../ds4p/contentprofile/ProtectedProblem.java | 8 +- .../PurposeOfUseSecurityObservation.java | 3 - .../RefrainPolicySecurityObservation.java | 3 - .../contentprofile/SecurityObservation.java | 10 +- .../impl/CONTENTPROFILEFactoryImpl.java | 21 ++- .../impl/CONTENTPROFILEPackageImpl.java | 66 ++++++--- ...onfidentialitySecurityObservationImpl.java | 6 - .../MandatoryDocumentAssignedAuthorImpl.java | 6 - .../impl/MandatoryDocumentProvenanceImpl.java | 6 - .../MandatoryEntryAssignedAuthorImpl.java | 6 - .../impl/MandatoryEntryProvenanceImpl.java | 6 - ...ligationPolicySecurityObservationImpl.java | 6 - ...rivacyAnnotationEntryRelationshipImpl.java | 6 - .../impl/PrivacyAnnotationImpl.java | 6 - .../impl/PrivacyMarkingsEntryImpl.java | 6 - .../impl/PrivacyMarkingsSectionImpl.java | 6 - .../impl/PrivacySegmentedDocumentImpl.java | 6 - .../impl/PrivacySegmentedSectionImpl.java | 6 - .../impl/ProtectedProblemImpl.java | 6 - .../PurposeOfUseSecurityObservationImpl.java | 6 - .../RefrainPolicySecurityObservationImpl.java | 6 - .../impl/SecurityObservationImpl.java | 6 - ...ntialitySecurityObservationOperations.java | 13 +- ...atoryDocumentAssignedAuthorOperations.java | 23 +++- ...MandatoryDocumentProvenanceOperations.java | 13 +- ...andatoryEntryAssignedAuthorOperations.java | 17 ++- .../MandatoryEntryProvenanceOperations.java | 12 +- ...onPolicySecurityObservationOperations.java | 15 ++- ...AnnotationEntryRelationshipOperations.java | 12 +- .../PrivacyAnnotationOperations.java | 28 +++- .../PrivacyMarkingsEntryOperations.java | 10 +- .../PrivacyMarkingsSectionOperations.java | 16 ++- .../PrivacySegmentedDocumentOperations.java | 20 +-- .../PrivacySegmentedSectionOperations.java | 15 ++- .../ProtectedProblemOperations.java | 11 +- ...oseOfUseSecurityObservationOperations.java | 15 ++- ...inPolicySecurityObservationOperations.java | 15 ++- .../SecurityObservationOperations.java | 18 ++- .../util/CONTENTPROFILEAdapterFactory.java | 21 ++- .../util/CONTENTPROFILESwitch.java | 20 ++- .../util/CONTENTPROFILEValidator.java | 126 +++++++++++++++--- .../ds4p/contentprofile/util/DS4PUtil.java | 19 +++ .../src/test/DS4PValidationExample.java | 19 +++ .../src/test/TestValidation.java | 19 +++ 57 files changed, 475 insertions(+), 322 deletions(-) diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/CONTENTPROFILEPlugin.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/CONTENTPROFILEPlugin.java index beda8f9ab5..732d84dd54 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/CONTENTPROFILEPlugin.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/CONTENTPROFILEPlugin.java @@ -3,7 +3,6 @@ package org.hl7.security.ds4p.contentprofile; import org.eclipse.emf.common.EMFPlugin; - import org.eclipse.emf.common.util.ResourceLocator; /** diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/ConfidentialitySecurityObservation.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/ConfidentialitySecurityObservation.java index ff47e2fec4..921a4db861 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/ConfidentialitySecurityObservation.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/ConfidentialitySecurityObservation.java @@ -2,10 +2,7 @@ */ package org.hl7.security.ds4p.contentprofile; -import java.lang.Iterable; - import org.eclipse.emf.ecore.EObject; - import org.eclipse.mdht.emf.runtime.util.Initializer; /** diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/MandatoryDocumentAssignedAuthor.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/MandatoryDocumentAssignedAuthor.java index 815108103b..b20697b732 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/MandatoryDocumentAssignedAuthor.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/MandatoryDocumentAssignedAuthor.java @@ -2,14 +2,10 @@ */ package org.hl7.security.ds4p.contentprofile; -import java.lang.Iterable; - import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.emf.ecore.EObject; - import org.eclipse.mdht.emf.runtime.util.Initializer; import org.eclipse.mdht.uml.cda.AssignedAuthor; @@ -31,7 +27,7 @@ public interface MandatoryDocumentAssignedAuthor extends AssignedAuthor { * @param diagnostics The chain of diagnostics to which problems are to be appended. * @param context The cache of context-specific information. * - * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.templateId->exists(id : datatypes::II | id.root = \'2.16.840.1.113883.3.3251.1.3\')'" + * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.templateId->exists(id : datatypes::II | id.root = \'2.16.840.1.113883.3.3251.1.3\')'" * @generated */ boolean validateMandatoryDocumentAssignedAuthorTemplateId(DiagnosticChain diagnostics, Map context); @@ -43,7 +39,7 @@ public interface MandatoryDocumentAssignedAuthor extends AssignedAuthor { * @param diagnostics The chain of diagnostics to which problems are to be appended. * @param context The cache of context-specific information. * - * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='(self.telecom->isEmpty() or self.telecom->exists(element | element.isNullFlavorUndefined())) implies (( not self.telecom->isEmpty()) )'" + * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='(self.telecom->isEmpty() or self.telecom->exists(element | element.isNullFlavorUndefined())) implies (( not self.telecom->isEmpty()) )'" * @generated */ boolean validateMandatoryDocumentAssignedAuthorTelecomEmail(DiagnosticChain diagnostics, @@ -56,7 +52,7 @@ boolean validateMandatoryDocumentAssignedAuthorTelecomEmail(DiagnosticChain diag * @param diagnostics The chain of diagnostics to which problems are to be appended. * @param context The cache of context-specific information. * - * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.assignedAuthoringDevice->one(assignedAuthoringDevice : cda::AuthoringDevice | not assignedAuthoringDevice.oclIsUndefined() and assignedAuthoringDevice.oclIsKindOf(cda::AuthoringDevice))'" + * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.assignedAuthoringDevice->one(assignedAuthoringDevice : cda::AuthoringDevice | not assignedAuthoringDevice.oclIsUndefined() and assignedAuthoringDevice.oclIsKindOf(cda::AuthoringDevice))'" * @generated */ boolean validateMandatoryDocumentAssignedAuthorAssignedAuthoringDevice(DiagnosticChain diagnostics, @@ -69,7 +65,7 @@ boolean validateMandatoryDocumentAssignedAuthorAssignedAuthoringDevice(Diagnosti * @param diagnostics The chain of diagnostics to which problems are to be appended. * @param context The cache of context-specific information. * - * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.assignedPerson->one(assignedPerson : cda::Person | not assignedPerson.oclIsUndefined() and assignedPerson.oclIsKindOf(cda::Person))'" + * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.assignedPerson->one(assignedPerson : cda::Person | not assignedPerson.oclIsUndefined() and assignedPerson.oclIsKindOf(cda::Person))'" * @generated */ boolean validateMandatoryDocumentAssignedAuthorAssignedPerson(DiagnosticChain diagnostics, @@ -82,7 +78,7 @@ boolean validateMandatoryDocumentAssignedAuthorAssignedPerson(DiagnosticChain di * @param diagnostics The chain of diagnostics to which problems are to be appended. * @param context The cache of context-specific information. * - * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.representedOrganization->one(representedOrganization : cda::Organization | not representedOrganization.oclIsUndefined() and representedOrganization.oclIsKindOf(rim::Entity))'" + * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.representedOrganization->one(representedOrganization : cda::Organization | not representedOrganization.oclIsUndefined() and representedOrganization.oclIsKindOf(rim::Entity))'" * @generated */ boolean validateMandatoryDocumentAssignedAuthorRepresentedOrganization(DiagnosticChain diagnostics, diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/MandatoryDocumentProvenance.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/MandatoryDocumentProvenance.java index 53473593e7..15bdf1e86f 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/MandatoryDocumentProvenance.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/MandatoryDocumentProvenance.java @@ -2,14 +2,10 @@ */ package org.hl7.security.ds4p.contentprofile; -import java.lang.Iterable; - import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.emf.ecore.EObject; - import org.eclipse.mdht.emf.runtime.util.Initializer; import org.eclipse.mdht.uml.cda.Author; @@ -31,7 +27,7 @@ public interface MandatoryDocumentProvenance extends Author { * @param diagnostics The chain of diagnostics to which problems are to be appended. * @param context The cache of context-specific information. * - * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.templateId->exists(id : datatypes::II | id.root = \'2.16.840.1.113883.3.3251.1.2\')'" + * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.templateId->exists(id : datatypes::II | id.root = \'2.16.840.1.113883.3.3251.1.2\')'" * @generated */ boolean validateMandatoryDocumentProvenanceTemplateId(DiagnosticChain diagnostics, Map context); @@ -55,7 +51,7 @@ public interface MandatoryDocumentProvenance extends Author { * @param diagnostics The chain of diagnostics to which problems are to be appended. * @param context The cache of context-specific information. * - * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.assignedAuthor->one(assignedAuthor : cda::AssignedAuthor | not assignedAuthor.oclIsUndefined() and assignedAuthor.oclIsKindOf(contentprofile::MandatoryDocumentAssignedAuthor))'" + * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.assignedAuthor->one(assignedAuthor : cda::AssignedAuthor | not assignedAuthor.oclIsUndefined() and assignedAuthor.oclIsKindOf(contentprofile::MandatoryDocumentAssignedAuthor))'" * @generated */ boolean validateMandatoryDocumentProvenanceAssignedAuthor(DiagnosticChain diagnostics, Map context); diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/MandatoryEntryAssignedAuthor.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/MandatoryEntryAssignedAuthor.java index a9b6f10c82..4f51fd79b8 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/MandatoryEntryAssignedAuthor.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/MandatoryEntryAssignedAuthor.java @@ -2,14 +2,10 @@ */ package org.hl7.security.ds4p.contentprofile; -import java.lang.Iterable; - import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.emf.ecore.EObject; - import org.eclipse.mdht.emf.runtime.util.Initializer; import org.eclipse.mdht.uml.cda.AssignedAuthor; @@ -31,7 +27,7 @@ public interface MandatoryEntryAssignedAuthor extends AssignedAuthor { * @param diagnostics The chain of diagnostics to which problems are to be appended. * @param context The cache of context-specific information. * - * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.templateId->exists(id : datatypes::II | id.root = \'2.16.840.1.113883.3.3251.1.7\')'" + * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.templateId->exists(id : datatypes::II | id.root = \'2.16.840.1.113883.3.3251.1.7\')'" * @generated */ boolean validateMandatoryEntryAssignedAuthorTemplateId(DiagnosticChain diagnostics, Map context); diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/MandatoryEntryProvenance.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/MandatoryEntryProvenance.java index 9dea2e1d3c..20af15e35c 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/MandatoryEntryProvenance.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/MandatoryEntryProvenance.java @@ -2,14 +2,10 @@ */ package org.hl7.security.ds4p.contentprofile; -import java.lang.Iterable; - import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.emf.ecore.EObject; - import org.eclipse.mdht.emf.runtime.util.Initializer; import org.eclipse.mdht.uml.cda.Author; @@ -31,7 +27,7 @@ public interface MandatoryEntryProvenance extends Author { * @param diagnostics The chain of diagnostics to which problems are to be appended. * @param context The cache of context-specific information. * - * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.templateId->exists(id : datatypes::II | id.root = \'2.16.840.1.113883.3.3251.1.6\')'" + * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.templateId->exists(id : datatypes::II | id.root = \'2.16.840.1.113883.3.3251.1.6\')'" * @generated */ boolean validateMandatoryEntryProvenanceTemplateId(DiagnosticChain diagnostics, Map context); @@ -55,7 +51,7 @@ public interface MandatoryEntryProvenance extends Author { * @param diagnostics The chain of diagnostics to which problems are to be appended. * @param context The cache of context-specific information. * - * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.assignedAuthor->one(assignedAuthor : cda::AssignedAuthor | not assignedAuthor.oclIsUndefined() and assignedAuthor.oclIsKindOf(contentprofile::MandatoryEntryAssignedAuthor))'" + * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.assignedAuthor->one(assignedAuthor : cda::AssignedAuthor | not assignedAuthor.oclIsUndefined() and assignedAuthor.oclIsKindOf(contentprofile::MandatoryEntryAssignedAuthor))'" * @generated */ boolean validateMandatoryEntryProvenanceAssignedAuthor(DiagnosticChain diagnostics, Map context); diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/ObligationPolicySecurityObservation.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/ObligationPolicySecurityObservation.java index 216a8f7025..16f230c18b 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/ObligationPolicySecurityObservation.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/ObligationPolicySecurityObservation.java @@ -2,10 +2,7 @@ */ package org.hl7.security.ds4p.contentprofile; -import java.lang.Iterable; - import org.eclipse.emf.ecore.EObject; - import org.eclipse.mdht.emf.runtime.util.Initializer; /** diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/PrivacyAnnotation.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/PrivacyAnnotation.java index a053478c85..5808151a63 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/PrivacyAnnotation.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/PrivacyAnnotation.java @@ -2,15 +2,11 @@ */ package org.hl7.security.ds4p.contentprofile; -import java.lang.Iterable; - import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EObject; - import org.eclipse.mdht.emf.runtime.util.Initializer; import org.eclipse.mdht.uml.cda.Organizer; @@ -32,7 +28,7 @@ public interface PrivacyAnnotation extends Organizer { * @param diagnostics The chain of diagnostics to which problems are to be appended. * @param context The cache of context-specific information. * - * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.templateId->exists(id : datatypes::II | id.root = \'2.16.840.1.113883.3.3251.1.4\')'" + * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.templateId->exists(id : datatypes::II | id.root = \'2.16.840.1.113883.3.3251.1.4\')'" * @generated */ boolean validatePrivacyAnnotationTemplateId(DiagnosticChain diagnostics, Map context); @@ -92,7 +88,7 @@ public interface PrivacyAnnotation extends Organizer { * @param diagnostics The chain of diagnostics to which problems are to be appended. * @param context The cache of context-specific information. * - * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.component->exists(component : cda::Component4 | not component.observation.oclIsUndefined() and component.observation.oclIsKindOf(contentprofile::ObligationPolicySecurityObservation))'" + * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.component->exists(component : cda::Component4 | not component.observation.oclIsUndefined() and component.observation.oclIsKindOf(contentprofile::ObligationPolicySecurityObservation))'" * @generated */ boolean validatePrivacyAnnotationObligationPolicySecurityObservation(DiagnosticChain diagnostics, @@ -105,7 +101,7 @@ boolean validatePrivacyAnnotationObligationPolicySecurityObservation(DiagnosticC * @param diagnostics The chain of diagnostics to which problems are to be appended. * @param context The cache of context-specific information. * - * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.component->exists(component : cda::Component4 | not component.observation.oclIsUndefined() and component.observation.oclIsKindOf(contentprofile::RefrainPolicySecurityObservation))'" + * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.component->exists(component : cda::Component4 | not component.observation.oclIsUndefined() and component.observation.oclIsKindOf(contentprofile::RefrainPolicySecurityObservation))'" * @generated */ boolean validatePrivacyAnnotationRefrainPolicySecurityObservation(DiagnosticChain diagnostics, @@ -118,7 +114,7 @@ boolean validatePrivacyAnnotationRefrainPolicySecurityObservation(DiagnosticChai * @param diagnostics The chain of diagnostics to which problems are to be appended. * @param context The cache of context-specific information. * - * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.component->exists(component : cda::Component4 | not component.observation.oclIsUndefined() and component.observation.oclIsKindOf(contentprofile::PurposeOfUseSecurityObservation))'" + * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.component->exists(component : cda::Component4 | not component.observation.oclIsUndefined() and component.observation.oclIsKindOf(contentprofile::PurposeOfUseSecurityObservation))'" * @generated */ boolean validatePrivacyAnnotationPurposeOfUseSecurityObservation(DiagnosticChain diagnostics, @@ -131,7 +127,7 @@ boolean validatePrivacyAnnotationPurposeOfUseSecurityObservation(DiagnosticChain * @param diagnostics The chain of diagnostics to which problems are to be appended. * @param context The cache of context-specific information. * - * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.component->one(component : cda::Component4 | not component.observation.oclIsUndefined() and component.observation.oclIsKindOf(contentprofile::ConfidentialitySecurityObservation))'" + * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.component->one(component : cda::Component4 | not component.observation.oclIsUndefined() and component.observation.oclIsKindOf(contentprofile::ConfidentialitySecurityObservation))'" * @generated */ boolean validatePrivacyAnnotationConfidentialityCodeSecurityObservation(DiagnosticChain diagnostics, @@ -141,7 +137,7 @@ boolean validatePrivacyAnnotationConfidentialityCodeSecurityObservation(Diagnost * * * @model kind="operation" required="true" ordered="false" - * annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(contentprofile::ObligationPolicySecurityObservation)).oclAsType(contentprofile::ObligationPolicySecurityObservation)'" + * annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(contentprofile::ObligationPolicySecurityObservation)).oclAsType(contentprofile::ObligationPolicySecurityObservation)'" * @generated */ EList getObligationPolicySecurityObservations(); @@ -150,7 +146,7 @@ boolean validatePrivacyAnnotationConfidentialityCodeSecurityObservation(Diagnost * * * @model kind="operation" required="true" ordered="false" - * annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(contentprofile::RefrainPolicySecurityObservation)).oclAsType(contentprofile::RefrainPolicySecurityObservation)'" + * annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(contentprofile::RefrainPolicySecurityObservation)).oclAsType(contentprofile::RefrainPolicySecurityObservation)'" * @generated */ EList getRefrainPolicySecurityObservations(); @@ -159,7 +155,7 @@ boolean validatePrivacyAnnotationConfidentialityCodeSecurityObservation(Diagnost * * * @model kind="operation" required="true" ordered="false" - * annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(contentprofile::PurposeOfUseSecurityObservation)).oclAsType(contentprofile::PurposeOfUseSecurityObservation)'" + * annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(contentprofile::PurposeOfUseSecurityObservation)).oclAsType(contentprofile::PurposeOfUseSecurityObservation)'" * @generated */ EList getPurposeOfUseSecurityObservations(); @@ -168,7 +164,7 @@ boolean validatePrivacyAnnotationConfidentialityCodeSecurityObservation(Diagnost * * * @model kind="operation" required="true" ordered="false" - * annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(contentprofile::ConfidentialitySecurityObservation))->asSequence()->any(true).oclAsType(contentprofile::ConfidentialitySecurityObservation)'" + * annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(contentprofile::ConfidentialitySecurityObservation))->asSequence()->any(true).oclAsType(contentprofile::ConfidentialitySecurityObservation)'" * @generated */ ConfidentialitySecurityObservation getConfidentialityCodeSecurityObservation(); diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/PrivacyAnnotationEntryRelationship.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/PrivacyAnnotationEntryRelationship.java index f3f3b6a745..611e46c4bb 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/PrivacyAnnotationEntryRelationship.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/PrivacyAnnotationEntryRelationship.java @@ -2,14 +2,10 @@ */ package org.hl7.security.ds4p.contentprofile; -import java.lang.Iterable; - import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.emf.ecore.EObject; - import org.eclipse.mdht.emf.runtime.util.Initializer; import org.eclipse.mdht.uml.cda.EntryRelationship; @@ -31,7 +27,7 @@ public interface PrivacyAnnotationEntryRelationship extends EntryRelationship { * @param diagnostics The chain of diagnostics to which problems are to be appended. * @param context The cache of context-specific information. * - * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.templateId->exists(id : datatypes::II | id.root = \'2.16.840.1.113883.3.3251.1.11\')'" + * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.templateId->exists(id : datatypes::II | id.root = \'2.16.840.1.113883.3.3251.1.11\')'" * @generated */ boolean validatePrivacyAnnotationEntryRelationshipTemplateId(DiagnosticChain diagnostics, @@ -44,7 +40,7 @@ boolean validatePrivacyAnnotationEntryRelationshipTemplateId(DiagnosticChain dia * @param diagnostics The chain of diagnostics to which problems are to be appended. * @param context The cache of context-specific information. * - * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.organizer->one(organizer : cda::Organizer | not organizer.oclIsUndefined() and organizer.oclIsKindOf(contentprofile::PrivacyAnnotation))'" + * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.organizer->one(organizer : cda::Organizer | not organizer.oclIsUndefined() and organizer.oclIsKindOf(contentprofile::PrivacyAnnotation))'" * @generated */ boolean validatePrivacyAnnotationEntryRelationshipOrganizer(DiagnosticChain diagnostics, diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/PrivacyMarkingsEntry.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/PrivacyMarkingsEntry.java index 9e70f03742..38de733530 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/PrivacyMarkingsEntry.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/PrivacyMarkingsEntry.java @@ -2,14 +2,10 @@ */ package org.hl7.security.ds4p.contentprofile; -import java.lang.Iterable; - import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.emf.ecore.EObject; - import org.eclipse.mdht.emf.runtime.util.Initializer; import org.eclipse.mdht.uml.cda.Entry; @@ -31,7 +27,7 @@ public interface PrivacyMarkingsEntry extends Entry { * @param diagnostics The chain of diagnostics to which problems are to be appended. * @param context The cache of context-specific information. * - * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.templateId->exists(id : datatypes::II | id.root = \'2.16.840.1.113883.3.3251.1.9\')'" + * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.templateId->exists(id : datatypes::II | id.root = \'2.16.840.1.113883.3.3251.1.9\')'" * @generated */ boolean validatePrivacyMarkingsEntryTemplateId(DiagnosticChain diagnostics, Map context); @@ -43,7 +39,7 @@ public interface PrivacyMarkingsEntry extends Entry { * @param diagnostics The chain of diagnostics to which problems are to be appended. * @param context The cache of context-specific information. * - * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.organizer->one(organizer : cda::Organizer | not organizer.oclIsUndefined() and organizer.oclIsKindOf(contentprofile::PrivacyAnnotation))'" + * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.organizer->one(organizer : cda::Organizer | not organizer.oclIsUndefined() and organizer.oclIsKindOf(contentprofile::PrivacyAnnotation))'" * @generated */ boolean validatePrivacyMarkingsEntryOrganizer(DiagnosticChain diagnostics, Map context); diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/PrivacyMarkingsSection.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/PrivacyMarkingsSection.java index 1df000a839..628636c062 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/PrivacyMarkingsSection.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/PrivacyMarkingsSection.java @@ -2,14 +2,10 @@ */ package org.hl7.security.ds4p.contentprofile; -import java.lang.Iterable; - import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.emf.ecore.EObject; - import org.eclipse.mdht.emf.runtime.util.Initializer; import org.eclipse.mdht.uml.cda.Section; @@ -31,7 +27,7 @@ public interface PrivacyMarkingsSection extends Section { * @param diagnostics The chain of diagnostics to which problems are to be appended. * @param context The cache of context-specific information. * - * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.templateId->exists(id : datatypes::II | id.root = \'2.16.840.1.113883.3.3251.1.5\')'" + * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.templateId->exists(id : datatypes::II | id.root = \'2.16.840.1.113883.3.3251.1.5\')'" * @generated */ boolean validatePrivacyMarkingsSectionTemplateId(DiagnosticChain diagnostics, Map context); @@ -79,7 +75,7 @@ public interface PrivacyMarkingsSection extends Section { * @param diagnostics The chain of diagnostics to which problems are to be appended. * @param context The cache of context-specific information. * - * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.nullFlavor <> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.oclIsUndefined() and entry.oclIsKindOf(contentprofile::PrivacyMarkingsEntry) and entry.typeCode = vocab::x_ActRelationshipEntry::COMP)'" + * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.nullFlavor <> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.oclIsUndefined() and entry.oclIsKindOf(contentprofile::PrivacyMarkingsEntry) and entry.typeCode = vocab::x_ActRelationshipEntry::COMP)'" * @generated */ boolean validatePrivacyMarkingsSectionEntry1(DiagnosticChain diagnostics, Map context); diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/PrivacySegmentedDocument.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/PrivacySegmentedDocument.java index 3af8db97f4..5ceb63848b 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/PrivacySegmentedDocument.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/PrivacySegmentedDocument.java @@ -2,15 +2,11 @@ */ package org.hl7.security.ds4p.contentprofile; -import java.lang.Iterable; - import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EObject; - import org.eclipse.mdht.emf.runtime.util.Initializer; import org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraints; @@ -32,7 +28,7 @@ public interface PrivacySegmentedDocument extends GeneralHeaderConstraints { * @param diagnostics The chain of diagnostics to which problems are to be appended. * @param context The cache of context-specific information. * - * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.templateId->exists(id : datatypes::II | id.root = \'2.16.840.1.113883.3.3251.1.1\')'" + * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.templateId->exists(id : datatypes::II | id.root = \'2.16.840.1.113883.3.3251.1.1\')'" * @generated */ boolean validatePrivacySegmentedDocumentTemplateId(DiagnosticChain diagnostics, Map context); @@ -44,7 +40,7 @@ public interface PrivacySegmentedDocument extends GeneralHeaderConstraints { * @param diagnostics The chain of diagnostics to which problems are to be appended. * @param context The cache of context-specific information. * - * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(contentprofile::MandatoryDocumentProvenance))'" + * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(contentprofile::MandatoryDocumentProvenance))'" * @generated */ boolean validatePrivacySegmentedDocumentAuthor1(DiagnosticChain diagnostics, Map context); @@ -56,7 +52,7 @@ public interface PrivacySegmentedDocument extends GeneralHeaderConstraints { * @param diagnostics The chain of diagnostics to which problems are to be appended. * @param context The cache of context-specific information. * - * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(contentprofile::PrivacySegmentedSection))->size() >= 1'" + * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(contentprofile::PrivacySegmentedSection))->size() >= 1'" * @generated */ boolean validatePrivacySegmentedDocumentSegmentedSection(DiagnosticChain diagnostics, Map context); @@ -68,7 +64,7 @@ public interface PrivacySegmentedDocument extends GeneralHeaderConstraints { * @param diagnostics The chain of diagnostics to which problems are to be appended. * @param context The cache of context-specific information. * - * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(contentprofile::PrivacyMarkingsSection))->size() >= 1'" + * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(contentprofile::PrivacyMarkingsSection))->size() >= 1'" * @generated */ boolean validatePrivacySegmentedDocumentPrivacyAndSecurityMarkingsSection(DiagnosticChain diagnostics, @@ -78,7 +74,7 @@ boolean validatePrivacySegmentedDocumentPrivacyAndSecurityMarkingsSection(Diagno * * * @model kind="operation" required="true" ordered="false" - * annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(contentprofile::PrivacySegmentedSection)).oclAsType(contentprofile::PrivacySegmentedSection)'" + * annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(contentprofile::PrivacySegmentedSection)).oclAsType(contentprofile::PrivacySegmentedSection)'" * @generated */ EList getSegmentedSections(); @@ -87,7 +83,7 @@ boolean validatePrivacySegmentedDocumentPrivacyAndSecurityMarkingsSection(Diagno * * * @model kind="operation" required="true" ordered="false" - * annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(contentprofile::PrivacyMarkingsSection)).oclAsType(contentprofile::PrivacyMarkingsSection)'" + * annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(contentprofile::PrivacyMarkingsSection)).oclAsType(contentprofile::PrivacyMarkingsSection)'" * @generated */ EList getPrivacyAndSecurityMarkingsSections(); diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/PrivacySegmentedSection.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/PrivacySegmentedSection.java index 1be05d7d60..7d11c8701a 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/PrivacySegmentedSection.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/PrivacySegmentedSection.java @@ -2,14 +2,10 @@ */ package org.hl7.security.ds4p.contentprofile; -import java.lang.Iterable; - import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.emf.ecore.EObject; - import org.eclipse.mdht.emf.runtime.util.Initializer; import org.eclipse.mdht.uml.cda.Section; @@ -31,7 +27,7 @@ public interface PrivacySegmentedSection extends Section { * @param diagnostics The chain of diagnostics to which problems are to be appended. * @param context The cache of context-specific information. * - * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.templateId->exists(id : datatypes::II | id.root = \'2.16.840.1.113883.3.3251.1.10\')'" + * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.templateId->exists(id : datatypes::II | id.root = \'2.16.840.1.113883.3.3251.1.10\')'" * @generated */ boolean validatePrivacySegmentedSectionTemplateId(DiagnosticChain diagnostics, Map context); @@ -69,7 +65,7 @@ boolean validatePrivacySegmentedSectionConfidentialityCodeP(DiagnosticChain diag * @param diagnostics The chain of diagnostics to which problems are to be appended. * @param context The cache of context-specific information. * - * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.nullFlavor <> vocab::NullFlavor::NI implies author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(contentprofile::MandatoryEntryProvenance))'" + * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.nullFlavor <> vocab::NullFlavor::NI implies author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(contentprofile::MandatoryEntryProvenance))'" * @generated */ boolean validatePrivacySegmentedSectionAuthor(DiagnosticChain diagnostics, Map context); diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/ProtectedProblem.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/ProtectedProblem.java index de1901ba6c..ae476f7ef2 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/ProtectedProblem.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/ProtectedProblem.java @@ -2,14 +2,10 @@ */ package org.hl7.security.ds4p.contentprofile; -import java.lang.Iterable; - import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.emf.ecore.EObject; - import org.eclipse.mdht.emf.runtime.util.Initializer; import org.openhealthtools.mdht.uml.cda.consol.ProblemObservation; @@ -31,7 +27,7 @@ public interface ProtectedProblem extends ProblemObservation { * @param diagnostics The chain of diagnostics to which problems are to be appended. * @param context The cache of context-specific information. * - * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.author->one(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(contentprofile::MandatoryEntryProvenance))'" + * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.author->one(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(contentprofile::MandatoryEntryProvenance))'" * @generated */ boolean validateProtectedProblemProblemProvenance(DiagnosticChain diagnostics, Map context); @@ -43,7 +39,7 @@ public interface ProtectedProblem extends ProblemObservation { * @param diagnostics The chain of diagnostics to which problems are to be appended. * @param context The cache of context-specific information. * - * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.oclIsUndefined() and entryRelationship.oclIsKindOf(contentprofile::PrivacyAnnotationEntryRelationship))'" + * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.oclIsUndefined() and entryRelationship.oclIsKindOf(contentprofile::PrivacyAnnotationEntryRelationship))'" * @generated */ boolean validateProtectedProblemPrivacyAnnotations(DiagnosticChain diagnostics, Map context); diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/PurposeOfUseSecurityObservation.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/PurposeOfUseSecurityObservation.java index 587abf144a..2ba4b552ee 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/PurposeOfUseSecurityObservation.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/PurposeOfUseSecurityObservation.java @@ -2,10 +2,7 @@ */ package org.hl7.security.ds4p.contentprofile; -import java.lang.Iterable; - import org.eclipse.emf.ecore.EObject; - import org.eclipse.mdht.emf.runtime.util.Initializer; /** diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/RefrainPolicySecurityObservation.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/RefrainPolicySecurityObservation.java index a6b4b262d5..6ba2a6ff18 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/RefrainPolicySecurityObservation.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/RefrainPolicySecurityObservation.java @@ -2,10 +2,7 @@ */ package org.hl7.security.ds4p.contentprofile; -import java.lang.Iterable; - import org.eclipse.emf.ecore.EObject; - import org.eclipse.mdht.emf.runtime.util.Initializer; /** diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/SecurityObservation.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/SecurityObservation.java index fe0d1a9f2c..d19b6b46a0 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/SecurityObservation.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/SecurityObservation.java @@ -2,14 +2,10 @@ */ package org.hl7.security.ds4p.contentprofile; -import java.lang.Iterable; - import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.emf.ecore.EObject; - import org.eclipse.mdht.emf.runtime.util.Initializer; import org.eclipse.mdht.uml.cda.Observation; @@ -32,7 +28,7 @@ public interface SecurityObservation extends Observation { * @param diagnostics The chain of diagnostics to which problems are to be appended. * @param context The cache of context-specific information. * - * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.templateId->exists(id : datatypes::II | id.root = \'2.16.840.1.113883.3.445.21\')'" + * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.templateId->exists(id : datatypes::II | id.root = \'2.16.840.1.113883.3.445.21\')'" * @generated */ boolean validateSecurityObservationTemplateId(DiagnosticChain diagnostics, Map context); @@ -68,7 +64,7 @@ public interface SecurityObservation extends Observation { * @param diagnostics The chain of diagnostics to which problems are to be appended. * @param context The cache of context-specific information. * - * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CE) and \r\nlet value : datatypes::CE = element.oclAsType(datatypes::CE) in \r\nvalue.codeSystem = \'2.16.840.1.113883.5.1063\')'" + * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CE) and \r\nlet value : datatypes::CE = element.oclAsType(datatypes::CE) in \r\nvalue.codeSystem = \'2.16.840.1.113883.5.1063\')'" * @generated */ boolean validateSecurityObservationValue(DiagnosticChain diagnostics, Map context); @@ -80,7 +76,7 @@ public interface SecurityObservation extends Observation { * @param diagnostics The chain of diagnostics to which problems are to be appended. * @param context The cache of context-specific information. * - * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.value->size() = 1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::CE))'" + * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='self.value->size() = 1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::CE))'" * @generated */ boolean validateSecurityObservationValueP(DiagnosticChain diagnostics, Map context); diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/CONTENTPROFILEFactoryImpl.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/CONTENTPROFILEFactoryImpl.java index f24e44149c..a535a6cf62 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/CONTENTPROFILEFactoryImpl.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/CONTENTPROFILEFactoryImpl.java @@ -5,12 +5,25 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; - import org.eclipse.emf.ecore.impl.EFactoryImpl; - import org.eclipse.emf.ecore.plugin.EcorePlugin; - -import org.hl7.security.ds4p.contentprofile.*; +import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEFactory; +import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; +import org.hl7.security.ds4p.contentprofile.ConfidentialitySecurityObservation; +import org.hl7.security.ds4p.contentprofile.MandatoryDocumentAssignedAuthor; +import org.hl7.security.ds4p.contentprofile.MandatoryDocumentProvenance; +import org.hl7.security.ds4p.contentprofile.MandatoryEntryAssignedAuthor; +import org.hl7.security.ds4p.contentprofile.MandatoryEntryProvenance; +import org.hl7.security.ds4p.contentprofile.ObligationPolicySecurityObservation; +import org.hl7.security.ds4p.contentprofile.PrivacyAnnotation; +import org.hl7.security.ds4p.contentprofile.PrivacyAnnotationEntryRelationship; +import org.hl7.security.ds4p.contentprofile.PrivacyMarkingsEntry; +import org.hl7.security.ds4p.contentprofile.PrivacyMarkingsSection; +import org.hl7.security.ds4p.contentprofile.PrivacySegmentedDocument; +import org.hl7.security.ds4p.contentprofile.PrivacySegmentedSection; +import org.hl7.security.ds4p.contentprofile.ProtectedProblem; +import org.hl7.security.ds4p.contentprofile.PurposeOfUseSecurityObservation; +import org.hl7.security.ds4p.contentprofile.RefrainPolicySecurityObservation; /** * diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/CONTENTPROFILEPackageImpl.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/CONTENTPROFILEPackageImpl.java index eccc6c177d..b720d1f4e2 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/CONTENTPROFILEPackageImpl.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/CONTENTPROFILEPackageImpl.java @@ -13,10 +13,15 @@ import org.eclipse.emf.ecore.EOperation; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EValidator; +import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.ecore.impl.EPackageImpl; import org.eclipse.mdht.emf.runtime.util.Initializer; import org.eclipse.mdht.uml.cda.CDAPackage; import org.eclipse.mdht.uml.cda.util.AnnotationBasedInitializer; +import org.eclipse.mdht.uml.hl7.datatypes.DatatypesPackage; +import org.eclipse.mdht.uml.hl7.rim.RIMPackage; +import org.eclipse.mdht.uml.hl7.vocab.VocabPackage; +import org.eclipse.uml2.types.TypesPackage; import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEFactory; import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; import org.hl7.security.ds4p.contentprofile.ConfidentialitySecurityObservation; @@ -209,7 +214,13 @@ public static CONTENTPROFILEPackage init() { isInited = true; // Initialize simple dependencies + CDAPackage.eINSTANCE.eClass(); ConsolPackage.eINSTANCE.eClass(); + DatatypesPackage.eINSTANCE.eClass(); + EcorePackage.eINSTANCE.eClass(); + RIMPackage.eINSTANCE.eClass(); + TypesPackage.eINSTANCE.eClass(); + VocabPackage.eINSTANCE.eClass(); // Create package meta-data objects theCONTENTPROFILEPackage.createPackageContents(); @@ -599,8 +610,9 @@ public void initializePackageContents() { g1.getETypeArguments().add(g2); addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); - addEOperation(privacySegmentedDocumentEClass, this.getPrivacySegmentedSection(), "getSegmentedSections", 1, -1, - IS_UNIQUE, !IS_ORDERED); + addEOperation( + privacySegmentedDocumentEClass, this.getPrivacySegmentedSection(), "getSegmentedSections", 1, -1, IS_UNIQUE, + !IS_ORDERED); addEOperation( privacySegmentedDocumentEClass, this.getPrivacyMarkingsSection(), "getPrivacyAndSecurityMarkingsSections", @@ -654,7 +666,8 @@ public void initializePackageContents() { g1.getETypeArguments().add(g2); addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); - initEClass(privacyMarkingsSectionEClass, PrivacyMarkingsSection.class, "PrivacyMarkingsSection", !IS_ABSTRACT, + initEClass( + privacyMarkingsSectionEClass, PrivacyMarkingsSection.class, "PrivacyMarkingsSection", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); op = addEOperation( @@ -712,11 +725,13 @@ public void initializePackageContents() { g1.getETypeArguments().add(g2); addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); - initEClass(obligationPolicySecurityObservationEClass, ObligationPolicySecurityObservation.class, + initEClass( + obligationPolicySecurityObservationEClass, ObligationPolicySecurityObservation.class, "ObligationPolicySecurityObservation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(securityObservationEClass, SecurityObservation.class, "SecurityObservation", IS_ABSTRACT, - !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass( + securityObservationEClass, SecurityObservation.class, "SecurityObservation", IS_ABSTRACT, !IS_INTERFACE, + IS_GENERATED_INSTANCE_CLASS); op = addEOperation( securityObservationEClass, ecorePackage.getEBoolean(), "validateSecurityObservationTemplateId", 0, 1, @@ -784,7 +799,8 @@ public void initializePackageContents() { g1.getETypeArguments().add(g2); addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); - initEClass(mandatoryDocumentProvenanceEClass, MandatoryDocumentProvenance.class, "MandatoryDocumentProvenance", + initEClass( + mandatoryDocumentProvenanceEClass, MandatoryDocumentProvenance.class, "MandatoryDocumentProvenance", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); op = addEOperation( @@ -820,7 +836,8 @@ public void initializePackageContents() { g1.getETypeArguments().add(g2); addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); - initEClass(mandatoryDocumentAssignedAuthorEClass, MandatoryDocumentAssignedAuthor.class, + initEClass( + mandatoryDocumentAssignedAuthorEClass, MandatoryDocumentAssignedAuthor.class, "MandatoryDocumentAssignedAuthor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); op = addEOperation( @@ -878,7 +895,8 @@ public void initializePackageContents() { g1.getETypeArguments().add(g2); addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); - initEClass(privacyAnnotationEClass, PrivacyAnnotation.class, "PrivacyAnnotation", !IS_ABSTRACT, !IS_INTERFACE, + initEClass( + privacyAnnotationEClass, PrivacyAnnotation.class, "PrivacyAnnotation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); op = addEOperation( @@ -980,7 +998,8 @@ public void initializePackageContents() { g1.getETypeArguments().add(g2); addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); - addEOperation(privacyAnnotationEClass, this.getObligationPolicySecurityObservation(), + addEOperation( + privacyAnnotationEClass, this.getObligationPolicySecurityObservation(), "getObligationPolicySecurityObservations", 1, -1, IS_UNIQUE, !IS_ORDERED); addEOperation( @@ -999,13 +1018,16 @@ public void initializePackageContents() { refrainPolicySecurityObservationEClass, RefrainPolicySecurityObservation.class, "RefrainPolicySecurityObservation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(purposeOfUseSecurityObservationEClass, PurposeOfUseSecurityObservation.class, + initEClass( + purposeOfUseSecurityObservationEClass, PurposeOfUseSecurityObservation.class, "PurposeOfUseSecurityObservation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(confidentialitySecurityObservationEClass, ConfidentialitySecurityObservation.class, + initEClass( + confidentialitySecurityObservationEClass, ConfidentialitySecurityObservation.class, "ConfidentialitySecurityObservation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(protectedProblemEClass, ProtectedProblem.class, "ProtectedProblem", !IS_ABSTRACT, !IS_INTERFACE, + initEClass( + protectedProblemEClass, ProtectedProblem.class, "ProtectedProblem", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); op = addEOperation( @@ -1030,8 +1052,9 @@ public void initializePackageContents() { g1.getETypeArguments().add(g2); addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); - initEClass(mandatoryEntryProvenanceEClass, MandatoryEntryProvenance.class, "MandatoryEntryProvenance", - !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass( + mandatoryEntryProvenanceEClass, MandatoryEntryProvenance.class, "MandatoryEntryProvenance", !IS_ABSTRACT, + !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); op = addEOperation( mandatoryEntryProvenanceEClass, ecorePackage.getEBoolean(), "validateMandatoryEntryProvenanceTemplateId", 0, @@ -1066,8 +1089,9 @@ public void initializePackageContents() { g1.getETypeArguments().add(g2); addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); - initEClass(mandatoryEntryAssignedAuthorEClass, MandatoryEntryAssignedAuthor.class, - "MandatoryEntryAssignedAuthor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass( + mandatoryEntryAssignedAuthorEClass, MandatoryEntryAssignedAuthor.class, "MandatoryEntryAssignedAuthor", + !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); op = addEOperation( mandatoryEntryAssignedAuthorEClass, ecorePackage.getEBoolean(), @@ -1113,7 +1137,8 @@ public void initializePackageContents() { g1.getETypeArguments().add(g2); addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); - initEClass(privacyAnnotationEntryRelationshipEClass, PrivacyAnnotationEntryRelationship.class, + initEClass( + privacyAnnotationEntryRelationshipEClass, PrivacyAnnotationEntryRelationship.class, "PrivacyAnnotationEntryRelationship", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); op = addEOperation( @@ -1138,8 +1163,9 @@ public void initializePackageContents() { g1.getETypeArguments().add(g2); addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); - initEClass(privacyMarkingsEntryEClass, PrivacyMarkingsEntry.class, "PrivacyMarkingsEntry", !IS_ABSTRACT, - !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass( + privacyMarkingsEntryEClass, PrivacyMarkingsEntry.class, "PrivacyMarkingsEntry", !IS_ABSTRACT, !IS_INTERFACE, + IS_GENERATED_INSTANCE_CLASS); op = addEOperation( privacyMarkingsEntryEClass, ecorePackage.getEBoolean(), "validatePrivacyMarkingsEntryTemplateId", 0, 1, diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/ConfidentialitySecurityObservationImpl.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/ConfidentialitySecurityObservationImpl.java index ce86e55b31..a4fc593043 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/ConfidentialitySecurityObservationImpl.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/ConfidentialitySecurityObservationImpl.java @@ -2,20 +2,14 @@ */ package org.hl7.security.ds4p.contentprofile.impl; -import java.lang.Iterable; - import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; - import org.eclipse.mdht.emf.runtime.util.Initializer; - import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; import org.hl7.security.ds4p.contentprofile.ConfidentialitySecurityObservation; - import org.hl7.security.ds4p.contentprofile.operations.ConfidentialitySecurityObservationOperations; /** diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/MandatoryDocumentAssignedAuthorImpl.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/MandatoryDocumentAssignedAuthorImpl.java index e9b127a707..382331c475 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/MandatoryDocumentAssignedAuthorImpl.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/MandatoryDocumentAssignedAuthorImpl.java @@ -2,21 +2,15 @@ */ package org.hl7.security.ds4p.contentprofile.impl; -import java.lang.Iterable; - import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; - import org.eclipse.mdht.emf.runtime.util.Initializer; - import org.eclipse.mdht.uml.cda.impl.AssignedAuthorImpl; import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; import org.hl7.security.ds4p.contentprofile.MandatoryDocumentAssignedAuthor; - import org.hl7.security.ds4p.contentprofile.operations.MandatoryDocumentAssignedAuthorOperations; /** diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/MandatoryDocumentProvenanceImpl.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/MandatoryDocumentProvenanceImpl.java index 94f4c8f2db..0a39e33edd 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/MandatoryDocumentProvenanceImpl.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/MandatoryDocumentProvenanceImpl.java @@ -2,21 +2,15 @@ */ package org.hl7.security.ds4p.contentprofile.impl; -import java.lang.Iterable; - import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; - import org.eclipse.mdht.emf.runtime.util.Initializer; - import org.eclipse.mdht.uml.cda.impl.AuthorImpl; import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; import org.hl7.security.ds4p.contentprofile.MandatoryDocumentProvenance; - import org.hl7.security.ds4p.contentprofile.operations.MandatoryDocumentProvenanceOperations; /** diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/MandatoryEntryAssignedAuthorImpl.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/MandatoryEntryAssignedAuthorImpl.java index 6acc35ee42..2752ab348c 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/MandatoryEntryAssignedAuthorImpl.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/MandatoryEntryAssignedAuthorImpl.java @@ -2,21 +2,15 @@ */ package org.hl7.security.ds4p.contentprofile.impl; -import java.lang.Iterable; - import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; - import org.eclipse.mdht.emf.runtime.util.Initializer; - import org.eclipse.mdht.uml.cda.impl.AssignedAuthorImpl; import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; import org.hl7.security.ds4p.contentprofile.MandatoryEntryAssignedAuthor; - import org.hl7.security.ds4p.contentprofile.operations.MandatoryEntryAssignedAuthorOperations; /** diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/MandatoryEntryProvenanceImpl.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/MandatoryEntryProvenanceImpl.java index 8f0a27cdc9..320c15ba3a 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/MandatoryEntryProvenanceImpl.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/MandatoryEntryProvenanceImpl.java @@ -2,21 +2,15 @@ */ package org.hl7.security.ds4p.contentprofile.impl; -import java.lang.Iterable; - import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; - import org.eclipse.mdht.emf.runtime.util.Initializer; - import org.eclipse.mdht.uml.cda.impl.AuthorImpl; import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; import org.hl7.security.ds4p.contentprofile.MandatoryEntryProvenance; - import org.hl7.security.ds4p.contentprofile.operations.MandatoryEntryProvenanceOperations; /** diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/ObligationPolicySecurityObservationImpl.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/ObligationPolicySecurityObservationImpl.java index a8d9c69202..6d2001476f 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/ObligationPolicySecurityObservationImpl.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/ObligationPolicySecurityObservationImpl.java @@ -2,20 +2,14 @@ */ package org.hl7.security.ds4p.contentprofile.impl; -import java.lang.Iterable; - import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; - import org.eclipse.mdht.emf.runtime.util.Initializer; - import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; import org.hl7.security.ds4p.contentprofile.ObligationPolicySecurityObservation; - import org.hl7.security.ds4p.contentprofile.operations.ObligationPolicySecurityObservationOperations; /** diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/PrivacyAnnotationEntryRelationshipImpl.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/PrivacyAnnotationEntryRelationshipImpl.java index 776bc83095..3582402be1 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/PrivacyAnnotationEntryRelationshipImpl.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/PrivacyAnnotationEntryRelationshipImpl.java @@ -2,21 +2,15 @@ */ package org.hl7.security.ds4p.contentprofile.impl; -import java.lang.Iterable; - import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; - import org.eclipse.mdht.emf.runtime.util.Initializer; - import org.eclipse.mdht.uml.cda.impl.EntryRelationshipImpl; import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; import org.hl7.security.ds4p.contentprofile.PrivacyAnnotationEntryRelationship; - import org.hl7.security.ds4p.contentprofile.operations.PrivacyAnnotationEntryRelationshipOperations; /** diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/PrivacyAnnotationImpl.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/PrivacyAnnotationImpl.java index d60e8e7cb6..ddf7cfea06 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/PrivacyAnnotationImpl.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/PrivacyAnnotationImpl.java @@ -2,18 +2,13 @@ */ package org.hl7.security.ds4p.contentprofile.impl; -import java.lang.Iterable; - import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; - import org.eclipse.mdht.emf.runtime.util.Initializer; - import org.eclipse.mdht.uml.cda.impl.OrganizerImpl; import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; import org.hl7.security.ds4p.contentprofile.ConfidentialitySecurityObservation; @@ -21,7 +16,6 @@ import org.hl7.security.ds4p.contentprofile.PrivacyAnnotation; import org.hl7.security.ds4p.contentprofile.PurposeOfUseSecurityObservation; import org.hl7.security.ds4p.contentprofile.RefrainPolicySecurityObservation; - import org.hl7.security.ds4p.contentprofile.operations.PrivacyAnnotationOperations; /** diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/PrivacyMarkingsEntryImpl.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/PrivacyMarkingsEntryImpl.java index 6c894fa1ba..22ba148a8f 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/PrivacyMarkingsEntryImpl.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/PrivacyMarkingsEntryImpl.java @@ -2,21 +2,15 @@ */ package org.hl7.security.ds4p.contentprofile.impl; -import java.lang.Iterable; - import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; - import org.eclipse.mdht.emf.runtime.util.Initializer; - import org.eclipse.mdht.uml.cda.impl.EntryImpl; import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; import org.hl7.security.ds4p.contentprofile.PrivacyMarkingsEntry; - import org.hl7.security.ds4p.contentprofile.operations.PrivacyMarkingsEntryOperations; /** diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/PrivacyMarkingsSectionImpl.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/PrivacyMarkingsSectionImpl.java index 1dcdd8060d..f872edd469 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/PrivacyMarkingsSectionImpl.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/PrivacyMarkingsSectionImpl.java @@ -2,21 +2,15 @@ */ package org.hl7.security.ds4p.contentprofile.impl; -import java.lang.Iterable; - import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; - import org.eclipse.mdht.emf.runtime.util.Initializer; - import org.eclipse.mdht.uml.cda.impl.SectionImpl; import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; import org.hl7.security.ds4p.contentprofile.PrivacyMarkingsSection; - import org.hl7.security.ds4p.contentprofile.operations.PrivacyMarkingsSectionOperations; /** diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/PrivacySegmentedDocumentImpl.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/PrivacySegmentedDocumentImpl.java index c7a9008e74..0a7962b015 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/PrivacySegmentedDocumentImpl.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/PrivacySegmentedDocumentImpl.java @@ -2,23 +2,17 @@ */ package org.hl7.security.ds4p.contentprofile.impl; -import java.lang.Iterable; - import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; - import org.eclipse.mdht.emf.runtime.util.Initializer; - import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; import org.hl7.security.ds4p.contentprofile.PrivacyMarkingsSection; import org.hl7.security.ds4p.contentprofile.PrivacySegmentedDocument; import org.hl7.security.ds4p.contentprofile.PrivacySegmentedSection; - import org.hl7.security.ds4p.contentprofile.operations.PrivacySegmentedDocumentOperations; import org.openhealthtools.mdht.uml.cda.consol.impl.GeneralHeaderConstraintsImpl; diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/PrivacySegmentedSectionImpl.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/PrivacySegmentedSectionImpl.java index f531ce2586..fc327ef78d 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/PrivacySegmentedSectionImpl.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/PrivacySegmentedSectionImpl.java @@ -2,21 +2,15 @@ */ package org.hl7.security.ds4p.contentprofile.impl; -import java.lang.Iterable; - import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; - import org.eclipse.mdht.emf.runtime.util.Initializer; - import org.eclipse.mdht.uml.cda.impl.SectionImpl; import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; import org.hl7.security.ds4p.contentprofile.PrivacySegmentedSection; - import org.hl7.security.ds4p.contentprofile.operations.PrivacySegmentedSectionOperations; /** diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/ProtectedProblemImpl.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/ProtectedProblemImpl.java index 63ca82b503..99b08b7fa8 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/ProtectedProblemImpl.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/ProtectedProblemImpl.java @@ -2,20 +2,14 @@ */ package org.hl7.security.ds4p.contentprofile.impl; -import java.lang.Iterable; - import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; - import org.eclipse.mdht.emf.runtime.util.Initializer; - import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; import org.hl7.security.ds4p.contentprofile.ProtectedProblem; - import org.hl7.security.ds4p.contentprofile.operations.ProtectedProblemOperations; import org.openhealthtools.mdht.uml.cda.consol.impl.ProblemObservationImpl; diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/PurposeOfUseSecurityObservationImpl.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/PurposeOfUseSecurityObservationImpl.java index a85c163d32..c2266470b5 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/PurposeOfUseSecurityObservationImpl.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/PurposeOfUseSecurityObservationImpl.java @@ -2,20 +2,14 @@ */ package org.hl7.security.ds4p.contentprofile.impl; -import java.lang.Iterable; - import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; - import org.eclipse.mdht.emf.runtime.util.Initializer; - import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; import org.hl7.security.ds4p.contentprofile.PurposeOfUseSecurityObservation; - import org.hl7.security.ds4p.contentprofile.operations.PurposeOfUseSecurityObservationOperations; /** diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/RefrainPolicySecurityObservationImpl.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/RefrainPolicySecurityObservationImpl.java index 2024cc84e1..3996efb711 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/RefrainPolicySecurityObservationImpl.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/RefrainPolicySecurityObservationImpl.java @@ -2,20 +2,14 @@ */ package org.hl7.security.ds4p.contentprofile.impl; -import java.lang.Iterable; - import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; - import org.eclipse.mdht.emf.runtime.util.Initializer; - import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; import org.hl7.security.ds4p.contentprofile.RefrainPolicySecurityObservation; - import org.hl7.security.ds4p.contentprofile.operations.RefrainPolicySecurityObservationOperations; /** diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/SecurityObservationImpl.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/SecurityObservationImpl.java index 0d11a320b7..39816ec7e8 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/SecurityObservationImpl.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/impl/SecurityObservationImpl.java @@ -2,21 +2,15 @@ */ package org.hl7.security.ds4p.contentprofile.impl; -import java.lang.Iterable; - import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; - import org.eclipse.mdht.emf.runtime.util.Initializer; - import org.eclipse.mdht.uml.cda.impl.ObservationImpl; import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; import org.hl7.security.ds4p.contentprofile.SecurityObservation; - import org.hl7.security.ds4p.contentprofile.operations.SecurityObservationOperations; /** diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/ConfidentialitySecurityObservationOperations.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/ConfidentialitySecurityObservationOperations.java index 05f646a289..ac4ab49e4e 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/ConfidentialitySecurityObservationOperations.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/ConfidentialitySecurityObservationOperations.java @@ -8,16 +8,13 @@ import org.eclipse.emf.common.util.BasicDiagnostic; import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.DiagnosticChain; - +import org.eclipse.mdht.uml.hl7.datatypes.util.DatatypesUtil; import org.eclipse.ocl.ParserException; - import org.eclipse.ocl.ecore.Constraint; import org.eclipse.ocl.ecore.OCL; - import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPlugin; import org.hl7.security.ds4p.contentprofile.ConfidentialitySecurityObservation; - import org.hl7.security.ds4p.contentprofile.util.CONTENTPROFILEValidator; /** @@ -91,6 +88,8 @@ public static boolean validateSecurityObservationTemplateId( ConfidentialitySecurityObservation confidentialitySecurityObservation, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "ConfidentialitySecurityObservationSecurityObservationTemplateId", "ERROR"); + if (VALIDATE_SECURITY_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -157,6 +156,8 @@ public static boolean validateSecurityObservationCodeP( ConfidentialitySecurityObservation confidentialitySecurityObservation, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "ConfidentialitySecurityObservationSecurityObservationCodeP", "ERROR"); + if (VALIDATE_SECURITY_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -247,6 +248,8 @@ public static boolean validateSecurityObservationCode( return true; } + DatatypesUtil.increment(context, "ConfidentialitySecurityObservationSecurityObservationCode", "ERROR"); + if (VALIDATE_SECURITY_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -312,6 +315,8 @@ public static boolean validateSecurityObservationValue( ConfidentialitySecurityObservation confidentialitySecurityObservation, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "ConfidentialitySecurityObservationSecurityObservationValue", "ERROR"); + if (VALIDATE_SECURITY_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/MandatoryDocumentAssignedAuthorOperations.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/MandatoryDocumentAssignedAuthorOperations.java index 8a76b27ad4..f3b72d2db8 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/MandatoryDocumentAssignedAuthorOperations.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/MandatoryDocumentAssignedAuthorOperations.java @@ -7,18 +7,14 @@ import org.eclipse.emf.common.util.BasicDiagnostic; import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.mdht.uml.cda.operations.AssignedAuthorOperations; - +import org.eclipse.mdht.uml.hl7.datatypes.util.DatatypesUtil; import org.eclipse.ocl.ParserException; - import org.eclipse.ocl.ecore.Constraint; import org.eclipse.ocl.ecore.OCL; - import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPlugin; import org.hl7.security.ds4p.contentprofile.MandatoryDocumentAssignedAuthor; - import org.hl7.security.ds4p.contentprofile.util.CONTENTPROFILEValidator; /** @@ -93,6 +89,9 @@ public static boolean validateMandatoryDocumentAssignedAuthorTemplateId( MandatoryDocumentAssignedAuthor mandatoryDocumentAssignedAuthor, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment( + context, "MandatoryDocumentAssignedAuthorMandatoryDocumentAssignedAuthorTemplateId", "ERROR"); + if (VALIDATE_MANDATORY_DOCUMENT_ASSIGNED_AUTHOR_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -160,6 +159,9 @@ public static boolean validateMandatoryDocumentAssignedAuthorTelecomEmail( MandatoryDocumentAssignedAuthor mandatoryDocumentAssignedAuthor, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment( + context, "MandatoryDocumentAssignedAuthorMandatoryDocumentAssignedAuthorTelecomEmail", "ERROR"); + if (VALIDATE_MANDATORY_DOCUMENT_ASSIGNED_AUTHOR_TELECOM_EMAIL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -227,6 +229,10 @@ public static boolean validateMandatoryDocumentAssignedAuthorAssignedAuthoringDe MandatoryDocumentAssignedAuthor mandatoryDocumentAssignedAuthor, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment( + context, "MandatoryDocumentAssignedAuthorMandatoryDocumentAssignedAuthorAssignedAuthoringDevice", + "WARNING"); + if (VALIDATE_MANDATORY_DOCUMENT_ASSIGNED_AUTHOR_ASSIGNED_AUTHORING_DEVICE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -294,6 +300,9 @@ public static boolean validateMandatoryDocumentAssignedAuthorAssignedPerson( MandatoryDocumentAssignedAuthor mandatoryDocumentAssignedAuthor, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment( + context, "MandatoryDocumentAssignedAuthorMandatoryDocumentAssignedAuthorAssignedPerson", "WARNING"); + if (VALIDATE_MANDATORY_DOCUMENT_ASSIGNED_AUTHOR_ASSIGNED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -361,6 +370,10 @@ public static boolean validateMandatoryDocumentAssignedAuthorRepresentedOrganiza MandatoryDocumentAssignedAuthor mandatoryDocumentAssignedAuthor, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment( + context, "MandatoryDocumentAssignedAuthorMandatoryDocumentAssignedAuthorRepresentedOrganization", + "WARNING"); + if (VALIDATE_MANDATORY_DOCUMENT_ASSIGNED_AUTHOR_REPRESENTED_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/MandatoryDocumentProvenanceOperations.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/MandatoryDocumentProvenanceOperations.java index 41fede3b90..5915683d56 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/MandatoryDocumentProvenanceOperations.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/MandatoryDocumentProvenanceOperations.java @@ -7,18 +7,14 @@ import org.eclipse.emf.common.util.BasicDiagnostic; import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.mdht.uml.cda.operations.AuthorOperations; - +import org.eclipse.mdht.uml.hl7.datatypes.util.DatatypesUtil; import org.eclipse.ocl.ParserException; - import org.eclipse.ocl.ecore.Constraint; import org.eclipse.ocl.ecore.OCL; - import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPlugin; import org.hl7.security.ds4p.contentprofile.MandatoryDocumentProvenance; - import org.hl7.security.ds4p.contentprofile.util.CONTENTPROFILEValidator; /** @@ -91,6 +87,8 @@ public static boolean validateMandatoryDocumentProvenanceTemplateId( MandatoryDocumentProvenance mandatoryDocumentProvenance, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "MandatoryDocumentProvenanceMandatoryDocumentProvenanceTemplateId", "ERROR"); + if (VALIDATE_MANDATORY_DOCUMENT_PROVENANCE_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -158,6 +156,8 @@ public static boolean validateMandatoryDocumentProvenanceTime( MandatoryDocumentProvenance mandatoryDocumentProvenance, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "MandatoryDocumentProvenanceMandatoryDocumentProvenanceTime", "ERROR"); + if (VALIDATE_MANDATORY_DOCUMENT_PROVENANCE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -225,6 +225,9 @@ public static boolean validateMandatoryDocumentProvenanceAssignedAuthor( MandatoryDocumentProvenance mandatoryDocumentProvenance, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment( + context, "MandatoryDocumentProvenanceMandatoryDocumentProvenanceAssignedAuthor", "ERROR"); + if (VALIDATE_MANDATORY_DOCUMENT_PROVENANCE_ASSIGNED_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/MandatoryEntryAssignedAuthorOperations.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/MandatoryEntryAssignedAuthorOperations.java index 0ac9c92689..0e46aa5562 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/MandatoryEntryAssignedAuthorOperations.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/MandatoryEntryAssignedAuthorOperations.java @@ -7,18 +7,14 @@ import org.eclipse.emf.common.util.BasicDiagnostic; import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.mdht.uml.cda.operations.AssignedAuthorOperations; - +import org.eclipse.mdht.uml.hl7.datatypes.util.DatatypesUtil; import org.eclipse.ocl.ParserException; - import org.eclipse.ocl.ecore.Constraint; import org.eclipse.ocl.ecore.OCL; - import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPlugin; import org.hl7.security.ds4p.contentprofile.MandatoryEntryAssignedAuthor; - import org.hl7.security.ds4p.contentprofile.util.CONTENTPROFILEValidator; /** @@ -92,6 +88,8 @@ public static boolean validateMandatoryEntryAssignedAuthorTemplateId( MandatoryEntryAssignedAuthor mandatoryEntryAssignedAuthor, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "MandatoryEntryAssignedAuthorMandatoryEntryAssignedAuthorTemplateId", "ERROR"); + if (VALIDATE_MANDATORY_ENTRY_ASSIGNED_AUTHOR_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -159,6 +157,9 @@ public static boolean validateMandatoryEntryAssignedAuthorAssignedAuthoringDevic MandatoryEntryAssignedAuthor mandatoryEntryAssignedAuthor, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment( + context, "MandatoryEntryAssignedAuthorMandatoryEntryAssignedAuthorAssignedAuthoringDevice", "ERROR"); + if (VALIDATE_MANDATORY_ENTRY_ASSIGNED_AUTHOR_ASSIGNED_AUTHORING_DEVICE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -226,6 +227,9 @@ public static boolean validateMandatoryEntryAssignedAuthorAssignedPerson( MandatoryEntryAssignedAuthor mandatoryEntryAssignedAuthor, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment( + context, "MandatoryEntryAssignedAuthorMandatoryEntryAssignedAuthorAssignedPerson", "ERROR"); + if (VALIDATE_MANDATORY_ENTRY_ASSIGNED_AUTHOR_ASSIGNED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -293,6 +297,9 @@ public static boolean validateMandatoryEntryAssignedAuthorRepresentedOrganizatio MandatoryEntryAssignedAuthor mandatoryEntryAssignedAuthor, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment( + context, "MandatoryEntryAssignedAuthorMandatoryEntryAssignedAuthorRepresentedOrganization", "ERROR"); + if (VALIDATE_MANDATORY_ENTRY_ASSIGNED_AUTHOR_REPRESENTED_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/MandatoryEntryProvenanceOperations.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/MandatoryEntryProvenanceOperations.java index f60ce4081a..ccd8a33ead 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/MandatoryEntryProvenanceOperations.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/MandatoryEntryProvenanceOperations.java @@ -7,18 +7,14 @@ import org.eclipse.emf.common.util.BasicDiagnostic; import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.mdht.uml.cda.operations.AuthorOperations; - +import org.eclipse.mdht.uml.hl7.datatypes.util.DatatypesUtil; import org.eclipse.ocl.ParserException; - import org.eclipse.ocl.ecore.Constraint; import org.eclipse.ocl.ecore.OCL; - import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPlugin; import org.hl7.security.ds4p.contentprofile.MandatoryEntryProvenance; - import org.hl7.security.ds4p.contentprofile.util.CONTENTPROFILEValidator; /** @@ -90,6 +86,8 @@ protected MandatoryEntryProvenanceOperations() { public static boolean validateMandatoryEntryProvenanceTemplateId(MandatoryEntryProvenance mandatoryEntryProvenance, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "MandatoryEntryProvenanceMandatoryEntryProvenanceTemplateId", "ERROR"); + if (VALIDATE_MANDATORY_ENTRY_PROVENANCE_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -156,6 +154,8 @@ public static boolean validateMandatoryEntryProvenanceTemplateId(MandatoryEntryP public static boolean validateMandatoryEntryProvenanceTime(MandatoryEntryProvenance mandatoryEntryProvenance, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "MandatoryEntryProvenanceMandatoryEntryProvenanceTime", "ERROR"); + if (VALIDATE_MANDATORY_ENTRY_PROVENANCE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -221,6 +221,8 @@ public static boolean validateMandatoryEntryProvenanceAssignedAuthor( MandatoryEntryProvenance mandatoryEntryProvenance, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "MandatoryEntryProvenanceMandatoryEntryProvenanceAssignedAuthor", "ERROR"); + if (VALIDATE_MANDATORY_ENTRY_PROVENANCE_ASSIGNED_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/ObligationPolicySecurityObservationOperations.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/ObligationPolicySecurityObservationOperations.java index ba009cc3a9..df91f1124b 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/ObligationPolicySecurityObservationOperations.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/ObligationPolicySecurityObservationOperations.java @@ -8,16 +8,13 @@ import org.eclipse.emf.common.util.BasicDiagnostic; import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.DiagnosticChain; - +import org.eclipse.mdht.uml.hl7.datatypes.util.DatatypesUtil; import org.eclipse.ocl.ParserException; - import org.eclipse.ocl.ecore.Constraint; import org.eclipse.ocl.ecore.OCL; - import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPlugin; import org.hl7.security.ds4p.contentprofile.ObligationPolicySecurityObservation; - import org.hl7.security.ds4p.contentprofile.util.CONTENTPROFILEValidator; /** @@ -92,6 +89,8 @@ public static boolean validateSecurityObservationTemplateId( ObligationPolicySecurityObservation obligationPolicySecurityObservation, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "ObligationPolicySecurityObservationSecurityObservationTemplateId", "ERROR"); + if (VALIDATE_SECURITY_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -158,6 +157,8 @@ public static boolean validateSecurityObservationCodeP( ObligationPolicySecurityObservation obligationPolicySecurityObservation, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "ObligationPolicySecurityObservationSecurityObservationCodeP", "ERROR"); + if (VALIDATE_SECURITY_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -248,6 +249,8 @@ public static boolean validateSecurityObservationCode( return true; } + DatatypesUtil.increment(context, "ObligationPolicySecurityObservationSecurityObservationCode", "ERROR"); + if (VALIDATE_SECURITY_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -313,6 +316,8 @@ public static boolean validateSecurityObservationValueP( ObligationPolicySecurityObservation obligationPolicySecurityObservation, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "ObligationPolicySecurityObservationSecurityObservationValueP", "ERROR"); + if (VALIDATE_SECURITY_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -403,6 +408,8 @@ public static boolean validateSecurityObservationValue( return true; } + DatatypesUtil.increment(context, "ObligationPolicySecurityObservationSecurityObservationValue", "WARNING"); + if (VALIDATE_SECURITY_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/PrivacyAnnotationEntryRelationshipOperations.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/PrivacyAnnotationEntryRelationshipOperations.java index 88b0e87cc7..c0281f302d 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/PrivacyAnnotationEntryRelationshipOperations.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/PrivacyAnnotationEntryRelationshipOperations.java @@ -7,18 +7,14 @@ import org.eclipse.emf.common.util.BasicDiagnostic; import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.mdht.uml.cda.operations.EntryRelationshipOperations; - +import org.eclipse.mdht.uml.hl7.datatypes.util.DatatypesUtil; import org.eclipse.ocl.ParserException; - import org.eclipse.ocl.ecore.Constraint; import org.eclipse.ocl.ecore.OCL; - import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPlugin; import org.hl7.security.ds4p.contentprofile.PrivacyAnnotationEntryRelationship; - import org.hl7.security.ds4p.contentprofile.util.CONTENTPROFILEValidator; /** @@ -90,6 +86,9 @@ public static boolean validatePrivacyAnnotationEntryRelationshipTemplateId( PrivacyAnnotationEntryRelationship privacyAnnotationEntryRelationship, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment( + context, "PrivacyAnnotationEntryRelationshipPrivacyAnnotationEntryRelationshipTemplateId", "ERROR"); + if (VALIDATE_PRIVACY_ANNOTATION_ENTRY_RELATIONSHIP_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -157,6 +156,9 @@ public static boolean validatePrivacyAnnotationEntryRelationshipOrganizer( PrivacyAnnotationEntryRelationship privacyAnnotationEntryRelationship, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment( + context, "PrivacyAnnotationEntryRelationshipPrivacyAnnotationEntryRelationshipOrganizer", "ERROR"); + if (VALIDATE_PRIVACY_ANNOTATION_ENTRY_RELATIONSHIP_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/PrivacyAnnotationOperations.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/PrivacyAnnotationOperations.java index 520c74a799..420cfc4b6c 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/PrivacyAnnotationOperations.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/PrivacyAnnotationOperations.java @@ -10,18 +10,13 @@ import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClassifier; - import org.eclipse.mdht.uml.cda.operations.OrganizerOperations; - +import org.eclipse.mdht.uml.hl7.datatypes.util.DatatypesUtil; import org.eclipse.ocl.ParserException; - import org.eclipse.ocl.ecore.Constraint; import org.eclipse.ocl.ecore.OCL; - import org.eclipse.ocl.expressions.OCLExpression; - import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPlugin; import org.hl7.security.ds4p.contentprofile.ConfidentialitySecurityObservation; @@ -29,7 +24,6 @@ import org.hl7.security.ds4p.contentprofile.PrivacyAnnotation; import org.hl7.security.ds4p.contentprofile.PurposeOfUseSecurityObservation; import org.hl7.security.ds4p.contentprofile.RefrainPolicySecurityObservation; - import org.hl7.security.ds4p.contentprofile.util.CONTENTPROFILEValidator; /** @@ -111,6 +105,8 @@ protected PrivacyAnnotationOperations() { public static boolean validatePrivacyAnnotationTemplateId(PrivacyAnnotation privacyAnnotation, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "PrivacyAnnotationPrivacyAnnotationTemplateId", "ERROR"); + if (VALIDATE_PRIVACY_ANNOTATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -174,6 +170,8 @@ public static boolean validatePrivacyAnnotationTemplateId(PrivacyAnnotation priv public static boolean validatePrivacyAnnotationClassCode(PrivacyAnnotation privacyAnnotation, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "PrivacyAnnotationPrivacyAnnotationClassCode", "ERROR"); + if (VALIDATE_PRIVACY_ANNOTATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -237,6 +235,8 @@ public static boolean validatePrivacyAnnotationClassCode(PrivacyAnnotation priva public static boolean validatePrivacyAnnotationMoodCode(PrivacyAnnotation privacyAnnotation, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "PrivacyAnnotationPrivacyAnnotationMoodCode", "ERROR"); + if (VALIDATE_PRIVACY_ANNOTATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -300,6 +300,8 @@ public static boolean validatePrivacyAnnotationMoodCode(PrivacyAnnotation privac public static boolean validatePrivacyAnnotationStatusCodeP(PrivacyAnnotation privacyAnnotation, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "PrivacyAnnotationPrivacyAnnotationStatusCodeP", "ERROR"); + if (VALIDATE_PRIVACY_ANNOTATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -385,6 +387,8 @@ public static boolean validatePrivacyAnnotationStatusCode(PrivacyAnnotation priv return true; } + DatatypesUtil.increment(context, "PrivacyAnnotationPrivacyAnnotationStatusCode", "ERROR"); + if (VALIDATE_PRIVACY_ANNOTATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -448,6 +452,9 @@ public static boolean validatePrivacyAnnotationStatusCode(PrivacyAnnotation priv public static boolean validatePrivacyAnnotationObligationPolicySecurityObservation( PrivacyAnnotation privacyAnnotation, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment( + context, "PrivacyAnnotationPrivacyAnnotationObligationPolicySecurityObservation", "INFO"); + if (VALIDATE_PRIVACY_ANNOTATION_OBLIGATION_POLICY_SECURITY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -514,6 +521,8 @@ public static boolean validatePrivacyAnnotationObligationPolicySecurityObservati public static boolean validatePrivacyAnnotationRefrainPolicySecurityObservation(PrivacyAnnotation privacyAnnotation, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "PrivacyAnnotationPrivacyAnnotationRefrainPolicySecurityObservation", "INFO"); + if (VALIDATE_PRIVACY_ANNOTATION_REFRAIN_POLICY_SECURITY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -580,6 +589,8 @@ public static boolean validatePrivacyAnnotationRefrainPolicySecurityObservation( public static boolean validatePrivacyAnnotationPurposeOfUseSecurityObservation(PrivacyAnnotation privacyAnnotation, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "PrivacyAnnotationPrivacyAnnotationPurposeOfUseSecurityObservation", "INFO"); + if (VALIDATE_PRIVACY_ANNOTATION_PURPOSE_OF_USE_SECURITY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -646,6 +657,9 @@ public static boolean validatePrivacyAnnotationPurposeOfUseSecurityObservation(P public static boolean validatePrivacyAnnotationConfidentialityCodeSecurityObservation( PrivacyAnnotation privacyAnnotation, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment( + context, "PrivacyAnnotationPrivacyAnnotationConfidentialityCodeSecurityObservation", "ERROR"); + if (VALIDATE_PRIVACY_ANNOTATION_CONFIDENTIALITY_CODE_SECURITY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/PrivacyMarkingsEntryOperations.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/PrivacyMarkingsEntryOperations.java index 0cf734127f..b346d852eb 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/PrivacyMarkingsEntryOperations.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/PrivacyMarkingsEntryOperations.java @@ -7,18 +7,14 @@ import org.eclipse.emf.common.util.BasicDiagnostic; import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.mdht.uml.cda.operations.EntryOperations; - +import org.eclipse.mdht.uml.hl7.datatypes.util.DatatypesUtil; import org.eclipse.ocl.ParserException; - import org.eclipse.ocl.ecore.Constraint; import org.eclipse.ocl.ecore.OCL; - import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPlugin; import org.hl7.security.ds4p.contentprofile.PrivacyMarkingsEntry; - import org.hl7.security.ds4p.contentprofile.util.CONTENTPROFILEValidator; /** @@ -89,6 +85,8 @@ protected PrivacyMarkingsEntryOperations() { public static boolean validatePrivacyMarkingsEntryTemplateId(PrivacyMarkingsEntry privacyMarkingsEntry, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "PrivacyMarkingsEntryPrivacyMarkingsEntryTemplateId", "ERROR"); + if (VALIDATE_PRIVACY_MARKINGS_ENTRY_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -154,6 +152,8 @@ public static boolean validatePrivacyMarkingsEntryTemplateId(PrivacyMarkingsEntr public static boolean validatePrivacyMarkingsEntryOrganizer(PrivacyMarkingsEntry privacyMarkingsEntry, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "PrivacyMarkingsEntryPrivacyMarkingsEntryOrganizer", "ERROR"); + if (VALIDATE_PRIVACY_MARKINGS_ENTRY_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/PrivacyMarkingsSectionOperations.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/PrivacyMarkingsSectionOperations.java index 85a9d638b4..3b9f29d40b 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/PrivacyMarkingsSectionOperations.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/PrivacyMarkingsSectionOperations.java @@ -7,18 +7,14 @@ import org.eclipse.emf.common.util.BasicDiagnostic; import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.mdht.uml.cda.operations.SectionOperations; - +import org.eclipse.mdht.uml.hl7.datatypes.util.DatatypesUtil; import org.eclipse.ocl.ParserException; - import org.eclipse.ocl.ecore.Constraint; import org.eclipse.ocl.ecore.OCL; - import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPlugin; import org.hl7.security.ds4p.contentprofile.PrivacyMarkingsSection; - import org.hl7.security.ds4p.contentprofile.util.CONTENTPROFILEValidator; /** @@ -92,6 +88,8 @@ protected PrivacyMarkingsSectionOperations() { public static boolean validatePrivacyMarkingsSectionTemplateId(PrivacyMarkingsSection privacyMarkingsSection, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "PrivacyMarkingsSectionPrivacyMarkingsSectionTemplateId", "ERROR"); + if (VALIDATE_PRIVACY_MARKINGS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -160,6 +158,8 @@ public static boolean validatePrivacyMarkingsSectionTemplateId(PrivacyMarkingsSe public static boolean validatePrivacyMarkingsSectionCode(PrivacyMarkingsSection privacyMarkingsSection, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "PrivacyMarkingsSectionPrivacyMarkingsSectionCode", "WARNING"); + if (VALIDATE_PRIVACY_MARKINGS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -224,6 +224,8 @@ public static boolean validatePrivacyMarkingsSectionCode(PrivacyMarkingsSection public static boolean validatePrivacyMarkingsSectionCodeP(PrivacyMarkingsSection privacyMarkingsSection, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "PrivacyMarkingsSectionPrivacyMarkingsSectionCodeP", "ERROR"); + if (VALIDATE_PRIVACY_MARKINGS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -288,6 +290,8 @@ public static boolean validatePrivacyMarkingsSectionCodeP(PrivacyMarkingsSection public static boolean validatePrivacyMarkingsSectionText(PrivacyMarkingsSection privacyMarkingsSection, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "PrivacyMarkingsSectionPrivacyMarkingsSectionText", "ERROR"); + if (VALIDATE_PRIVACY_MARKINGS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -352,6 +356,8 @@ public static boolean validatePrivacyMarkingsSectionText(PrivacyMarkingsSection public static boolean validatePrivacyMarkingsSectionEntry1(PrivacyMarkingsSection privacyMarkingsSection, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "PrivacyMarkingsSectionPrivacyMarkingsSectionEntry1", "INFO"); + if (VALIDATE_PRIVACY_MARKINGS_SECTION_ENTRY1__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/PrivacySegmentedDocumentOperations.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/PrivacySegmentedDocumentOperations.java index aea3e32d8e..563c6e9300 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/PrivacySegmentedDocumentOperations.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/PrivacySegmentedDocumentOperations.java @@ -10,22 +10,17 @@ import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClassifier; - +import org.eclipse.mdht.uml.hl7.datatypes.util.DatatypesUtil; import org.eclipse.ocl.ParserException; - import org.eclipse.ocl.ecore.Constraint; import org.eclipse.ocl.ecore.OCL; - import org.eclipse.ocl.expressions.OCLExpression; - import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPlugin; import org.hl7.security.ds4p.contentprofile.PrivacyMarkingsSection; import org.hl7.security.ds4p.contentprofile.PrivacySegmentedDocument; import org.hl7.security.ds4p.contentprofile.PrivacySegmentedSection; - import org.hl7.security.ds4p.contentprofile.util.CONTENTPROFILEValidator; import org.openhealthtools.mdht.uml.cda.consol.operations.GeneralHeaderConstraintsOperations; @@ -101,6 +96,8 @@ protected PrivacySegmentedDocumentOperations() { public static boolean validatePrivacySegmentedDocumentTemplateId(PrivacySegmentedDocument privacySegmentedDocument, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "PrivacySegmentedDocumentPrivacySegmentedDocumentTemplateId", "ERROR"); + if (VALIDATE_PRIVACY_SEGMENTED_DOCUMENT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -167,6 +164,8 @@ public static boolean validatePrivacySegmentedDocumentTemplateId(PrivacySegmente public static boolean validatePrivacySegmentedDocumentAuthor1(PrivacySegmentedDocument privacySegmentedDocument, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "PrivacySegmentedDocumentPrivacySegmentedDocumentAuthor1", "ERROR"); + if (VALIDATE_PRIVACY_SEGMENTED_DOCUMENT_AUTHOR1__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -234,6 +233,8 @@ public static boolean validatePrivacySegmentedDocumentSegmentedSection( PrivacySegmentedDocument privacySegmentedDocument, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "PrivacySegmentedDocumentPrivacySegmentedDocumentSegmentedSection", "INFO"); + if (VALIDATE_PRIVACY_SEGMENTED_DOCUMENT_SEGMENTED_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -301,6 +302,9 @@ public static boolean validatePrivacySegmentedDocumentPrivacyAndSecurityMarkings PrivacySegmentedDocument privacySegmentedDocument, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment( + context, "PrivacySegmentedDocumentPrivacySegmentedDocumentPrivacyAndSecurityMarkingsSection", "WARNING"); + if (VALIDATE_PRIVACY_SEGMENTED_DOCUMENT_PRIVACY_AND_SECURITY_MARKINGS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -366,7 +370,7 @@ public static EList getSegmentedSections( OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); helper.setOperationContext( CONTENTPROFILEPackage.Literals.PRIVACY_SEGMENTED_DOCUMENT, - CONTENTPROFILEPackage.Literals.PRIVACY_SEGMENTED_DOCUMENT.getEAllOperations().get(304)); + CONTENTPROFILEPackage.Literals.PRIVACY_SEGMENTED_DOCUMENT.getEAllOperations().get(324)); try { GET_SEGMENTED_SECTIONS__EOCL_QRY = helper.createQuery(GET_SEGMENTED_SECTIONS__EOCL_EXP); } catch (ParserException pe) { @@ -415,7 +419,7 @@ public static EList getPrivacyAndSecurityMarkingsSection OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); helper.setOperationContext( CONTENTPROFILEPackage.Literals.PRIVACY_SEGMENTED_DOCUMENT, - CONTENTPROFILEPackage.Literals.PRIVACY_SEGMENTED_DOCUMENT.getEAllOperations().get(305)); + CONTENTPROFILEPackage.Literals.PRIVACY_SEGMENTED_DOCUMENT.getEAllOperations().get(325)); try { GET_PRIVACY_AND_SECURITY_MARKINGS_SECTIONS__EOCL_QRY = helper.createQuery( GET_PRIVACY_AND_SECURITY_MARKINGS_SECTIONS__EOCL_EXP); diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/PrivacySegmentedSectionOperations.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/PrivacySegmentedSectionOperations.java index ddac7c9d90..93df15ec29 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/PrivacySegmentedSectionOperations.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/PrivacySegmentedSectionOperations.java @@ -7,18 +7,14 @@ import org.eclipse.emf.common.util.BasicDiagnostic; import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.mdht.uml.cda.operations.SectionOperations; - +import org.eclipse.mdht.uml.hl7.datatypes.util.DatatypesUtil; import org.eclipse.ocl.ParserException; - import org.eclipse.ocl.ecore.Constraint; import org.eclipse.ocl.ecore.OCL; - import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPlugin; import org.hl7.security.ds4p.contentprofile.PrivacySegmentedSection; - import org.hl7.security.ds4p.contentprofile.util.CONTENTPROFILEValidator; /** @@ -91,6 +87,8 @@ protected PrivacySegmentedSectionOperations() { public static boolean validatePrivacySegmentedSectionTemplateId(PrivacySegmentedSection privacySegmentedSection, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "PrivacySegmentedSectionPrivacySegmentedSectionTemplateId", "ERROR"); + if (VALIDATE_PRIVACY_SEGMENTED_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -159,6 +157,8 @@ public static boolean validatePrivacySegmentedSectionTemplateId(PrivacySegmented public static boolean validatePrivacySegmentedSectionConfidentialityCode( PrivacySegmentedSection privacySegmentedSection, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "PrivacySegmentedSectionPrivacySegmentedSectionConfidentialityCode", "ERROR"); + if (VALIDATE_PRIVACY_SEGMENTED_SECTION_CONFIDENTIALITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -225,6 +225,9 @@ public static boolean validatePrivacySegmentedSectionConfidentialityCode( public static boolean validatePrivacySegmentedSectionConfidentialityCodeP( PrivacySegmentedSection privacySegmentedSection, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment( + context, "PrivacySegmentedSectionPrivacySegmentedSectionConfidentialityCodeP", "WARNING"); + if (VALIDATE_PRIVACY_SEGMENTED_SECTION_CONFIDENTIALITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -291,6 +294,8 @@ public static boolean validatePrivacySegmentedSectionConfidentialityCodeP( public static boolean validatePrivacySegmentedSectionAuthor(PrivacySegmentedSection privacySegmentedSection, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "PrivacySegmentedSectionPrivacySegmentedSectionAuthor", "WARNING"); + if (VALIDATE_PRIVACY_SEGMENTED_SECTION_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/ProtectedProblemOperations.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/ProtectedProblemOperations.java index 42a8129c42..a5e01b493d 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/ProtectedProblemOperations.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/ProtectedProblemOperations.java @@ -7,16 +7,13 @@ import org.eclipse.emf.common.util.BasicDiagnostic; import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.DiagnosticChain; - +import org.eclipse.mdht.uml.hl7.datatypes.util.DatatypesUtil; import org.eclipse.ocl.ParserException; - import org.eclipse.ocl.ecore.Constraint; import org.eclipse.ocl.ecore.OCL; - import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPlugin; import org.hl7.security.ds4p.contentprofile.ProtectedProblem; - import org.hl7.security.ds4p.contentprofile.util.CONTENTPROFILEValidator; import org.openhealthtools.mdht.uml.cda.consol.operations.ProblemObservationOperations; @@ -68,6 +65,8 @@ protected ProtectedProblemOperations() { public static boolean validateProblemObservationTemplateId(ProtectedProblem protectedProblem, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "ProtectedProblemProblemObservationTemplateId", "ERROR"); + if (VALIDATE_PROBLEM_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -131,6 +130,8 @@ public static boolean validateProblemObservationTemplateId(ProtectedProblem prot public static boolean validateProtectedProblemProblemProvenance(ProtectedProblem protectedProblem, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "ProtectedProblemProtectedProblemProblemProvenance", "ERROR"); + if (VALIDATE_PROTECTED_PROBLEM_PROBLEM_PROVENANCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -217,6 +218,8 @@ public static boolean validateProtectedProblemProblemProvenance(ProtectedProblem public static boolean validateProtectedProblemPrivacyAnnotations(ProtectedProblem protectedProblem, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "ProtectedProblemProtectedProblemPrivacyAnnotations", "ERROR"); + if (VALIDATE_PROTECTED_PROBLEM_PRIVACY_ANNOTATIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/PurposeOfUseSecurityObservationOperations.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/PurposeOfUseSecurityObservationOperations.java index 08a931244f..8316fd0500 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/PurposeOfUseSecurityObservationOperations.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/PurposeOfUseSecurityObservationOperations.java @@ -8,16 +8,13 @@ import org.eclipse.emf.common.util.BasicDiagnostic; import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.DiagnosticChain; - +import org.eclipse.mdht.uml.hl7.datatypes.util.DatatypesUtil; import org.eclipse.ocl.ParserException; - import org.eclipse.ocl.ecore.Constraint; import org.eclipse.ocl.ecore.OCL; - import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPlugin; import org.hl7.security.ds4p.contentprofile.PurposeOfUseSecurityObservation; - import org.hl7.security.ds4p.contentprofile.util.CONTENTPROFILEValidator; /** @@ -92,6 +89,8 @@ public static boolean validateSecurityObservationTemplateId( PurposeOfUseSecurityObservation purposeOfUseSecurityObservation, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "PurposeOfUseSecurityObservationSecurityObservationTemplateId", "ERROR"); + if (VALIDATE_SECURITY_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -158,6 +157,8 @@ public static boolean validateSecurityObservationCodeP( PurposeOfUseSecurityObservation purposeOfUseSecurityObservation, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "PurposeOfUseSecurityObservationSecurityObservationCodeP", "ERROR"); + if (VALIDATE_SECURITY_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -248,6 +249,8 @@ public static boolean validateSecurityObservationCode( return true; } + DatatypesUtil.increment(context, "PurposeOfUseSecurityObservationSecurityObservationCode", "ERROR"); + if (VALIDATE_SECURITY_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -313,6 +316,8 @@ public static boolean validateSecurityObservationValueP( PurposeOfUseSecurityObservation purposeOfUseSecurityObservation, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "PurposeOfUseSecurityObservationSecurityObservationValueP", "ERROR"); + if (VALIDATE_SECURITY_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -403,6 +408,8 @@ public static boolean validateSecurityObservationValue( return true; } + DatatypesUtil.increment(context, "PurposeOfUseSecurityObservationSecurityObservationValue", "ERROR"); + if (VALIDATE_SECURITY_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/RefrainPolicySecurityObservationOperations.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/RefrainPolicySecurityObservationOperations.java index 7ee2d9589c..0e38d6d7fd 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/RefrainPolicySecurityObservationOperations.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/RefrainPolicySecurityObservationOperations.java @@ -8,16 +8,13 @@ import org.eclipse.emf.common.util.BasicDiagnostic; import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.DiagnosticChain; - +import org.eclipse.mdht.uml.hl7.datatypes.util.DatatypesUtil; import org.eclipse.ocl.ParserException; - import org.eclipse.ocl.ecore.Constraint; import org.eclipse.ocl.ecore.OCL; - import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPlugin; import org.hl7.security.ds4p.contentprofile.RefrainPolicySecurityObservation; - import org.hl7.security.ds4p.contentprofile.util.CONTENTPROFILEValidator; /** @@ -92,6 +89,8 @@ public static boolean validateSecurityObservationTemplateId( RefrainPolicySecurityObservation refrainPolicySecurityObservation, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "RefrainPolicySecurityObservationSecurityObservationTemplateId", "ERROR"); + if (VALIDATE_SECURITY_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -158,6 +157,8 @@ public static boolean validateSecurityObservationCodeP( RefrainPolicySecurityObservation refrainPolicySecurityObservation, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "RefrainPolicySecurityObservationSecurityObservationCodeP", "ERROR"); + if (VALIDATE_SECURITY_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -248,6 +249,8 @@ public static boolean validateSecurityObservationCode( return true; } + DatatypesUtil.increment(context, "RefrainPolicySecurityObservationSecurityObservationCode", "ERROR"); + if (VALIDATE_SECURITY_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -313,6 +316,8 @@ public static boolean validateSecurityObservationValueP( RefrainPolicySecurityObservation refrainPolicySecurityObservation, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "RefrainPolicySecurityObservationSecurityObservationValueP", "ERROR"); + if (VALIDATE_SECURITY_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -403,6 +408,8 @@ public static boolean validateSecurityObservationValue( return true; } + DatatypesUtil.increment(context, "RefrainPolicySecurityObservationSecurityObservationValue", "ERROR"); + if (VALIDATE_SECURITY_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/SecurityObservationOperations.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/SecurityObservationOperations.java index e99806a40a..91ec36bc66 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/SecurityObservationOperations.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/operations/SecurityObservationOperations.java @@ -8,18 +8,14 @@ import org.eclipse.emf.common.util.BasicDiagnostic; import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.common.util.DiagnosticChain; - import org.eclipse.mdht.uml.cda.operations.ClinicalStatementOperations; - +import org.eclipse.mdht.uml.hl7.datatypes.util.DatatypesUtil; import org.eclipse.ocl.ParserException; - import org.eclipse.ocl.ecore.Constraint; import org.eclipse.ocl.ecore.OCL; - import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPlugin; import org.hl7.security.ds4p.contentprofile.SecurityObservation; - import org.hl7.security.ds4p.contentprofile.util.CONTENTPROFILEValidator; /** @@ -94,6 +90,8 @@ protected SecurityObservationOperations() { public static boolean validateSecurityObservationTemplateId(SecurityObservation securityObservation, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "SecurityObservationSecurityObservationTemplateId", "ERROR"); + if (VALIDATE_SECURITY_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -137,6 +135,8 @@ public static boolean validateSecurityObservationTemplateId(SecurityObservation public static boolean validateSecurityObservationCodeP(SecurityObservation securityObservation, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "SecurityObservationSecurityObservationCodeP", "ERROR"); + if (VALIDATE_SECURITY_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -200,6 +200,8 @@ public static boolean validateSecurityObservationCode(SecurityObservation securi return true; } + DatatypesUtil.increment(context, "SecurityObservationSecurityObservationCode", "ERROR"); + if (VALIDATE_SECURITY_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -242,6 +244,8 @@ public static boolean validateSecurityObservationCode(SecurityObservation securi public static boolean validateSecurityObservationValue(SecurityObservation securityObservation, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "SecurityObservationSecurityObservationValue", "ERROR"); + if (VALIDATE_SECURITY_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -284,6 +288,8 @@ public static boolean validateSecurityObservationValue(SecurityObservation secur public static boolean validateSecurityObservationValueP(SecurityObservation securityObservation, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "SecurityObservationSecurityObservationValueP", "ERROR"); + if (VALIDATE_SECURITY_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); @@ -435,6 +441,8 @@ public static boolean validateSecurityObservationValueP(SecurityObservation secu public static boolean validateSecurityObservationMoodCode(SecurityObservation securityObservation, DiagnosticChain diagnostics, Map context) { + DatatypesUtil.increment(context, "SecurityObservationSecurityObservationMoodCode", "ERROR"); + if (VALIDATE_SECURITY_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV.get() == null) { OCL.Helper helper = EOCL_ENV.get().createOCLHelper(); diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/util/CONTENTPROFILEAdapterFactory.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/util/CONTENTPROFILEAdapterFactory.java index 4e70d87d4d..02164a5342 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/util/CONTENTPROFILEAdapterFactory.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/util/CONTENTPROFILEAdapterFactory.java @@ -4,11 +4,8 @@ import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; - import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; - import org.eclipse.emf.ecore.EObject; - import org.eclipse.mdht.uml.cda.AssignedAuthor; import org.eclipse.mdht.uml.cda.Author; import org.eclipse.mdht.uml.cda.ClinicalDocument; @@ -23,7 +20,23 @@ import org.eclipse.mdht.uml.hl7.rim.InfrastructureRoot; import org.eclipse.mdht.uml.hl7.rim.Participation; import org.eclipse.mdht.uml.hl7.rim.Role; -import org.hl7.security.ds4p.contentprofile.*; +import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; +import org.hl7.security.ds4p.contentprofile.ConfidentialitySecurityObservation; +import org.hl7.security.ds4p.contentprofile.MandatoryDocumentAssignedAuthor; +import org.hl7.security.ds4p.contentprofile.MandatoryDocumentProvenance; +import org.hl7.security.ds4p.contentprofile.MandatoryEntryAssignedAuthor; +import org.hl7.security.ds4p.contentprofile.MandatoryEntryProvenance; +import org.hl7.security.ds4p.contentprofile.ObligationPolicySecurityObservation; +import org.hl7.security.ds4p.contentprofile.PrivacyAnnotation; +import org.hl7.security.ds4p.contentprofile.PrivacyAnnotationEntryRelationship; +import org.hl7.security.ds4p.contentprofile.PrivacyMarkingsEntry; +import org.hl7.security.ds4p.contentprofile.PrivacyMarkingsSection; +import org.hl7.security.ds4p.contentprofile.PrivacySegmentedDocument; +import org.hl7.security.ds4p.contentprofile.PrivacySegmentedSection; +import org.hl7.security.ds4p.contentprofile.ProtectedProblem; +import org.hl7.security.ds4p.contentprofile.PurposeOfUseSecurityObservation; +import org.hl7.security.ds4p.contentprofile.RefrainPolicySecurityObservation; +import org.hl7.security.ds4p.contentprofile.SecurityObservation; import org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraints; import org.openhealthtools.mdht.uml.cda.consol.ProblemObservation; diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/util/CONTENTPROFILESwitch.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/util/CONTENTPROFILESwitch.java index 4ee20b11e1..eeb0afb809 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/util/CONTENTPROFILESwitch.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/util/CONTENTPROFILESwitch.java @@ -4,9 +4,7 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; - import org.eclipse.emf.ecore.util.Switch; - import org.eclipse.mdht.uml.cda.AssignedAuthor; import org.eclipse.mdht.uml.cda.Author; import org.eclipse.mdht.uml.cda.ClinicalDocument; @@ -21,7 +19,23 @@ import org.eclipse.mdht.uml.hl7.rim.InfrastructureRoot; import org.eclipse.mdht.uml.hl7.rim.Participation; import org.eclipse.mdht.uml.hl7.rim.Role; -import org.hl7.security.ds4p.contentprofile.*; +import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; +import org.hl7.security.ds4p.contentprofile.ConfidentialitySecurityObservation; +import org.hl7.security.ds4p.contentprofile.MandatoryDocumentAssignedAuthor; +import org.hl7.security.ds4p.contentprofile.MandatoryDocumentProvenance; +import org.hl7.security.ds4p.contentprofile.MandatoryEntryAssignedAuthor; +import org.hl7.security.ds4p.contentprofile.MandatoryEntryProvenance; +import org.hl7.security.ds4p.contentprofile.ObligationPolicySecurityObservation; +import org.hl7.security.ds4p.contentprofile.PrivacyAnnotation; +import org.hl7.security.ds4p.contentprofile.PrivacyAnnotationEntryRelationship; +import org.hl7.security.ds4p.contentprofile.PrivacyMarkingsEntry; +import org.hl7.security.ds4p.contentprofile.PrivacyMarkingsSection; +import org.hl7.security.ds4p.contentprofile.PrivacySegmentedDocument; +import org.hl7.security.ds4p.contentprofile.PrivacySegmentedSection; +import org.hl7.security.ds4p.contentprofile.ProtectedProblem; +import org.hl7.security.ds4p.contentprofile.PurposeOfUseSecurityObservation; +import org.hl7.security.ds4p.contentprofile.RefrainPolicySecurityObservation; +import org.hl7.security.ds4p.contentprofile.SecurityObservation; import org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraints; import org.openhealthtools.mdht.uml.cda.consol.ProblemObservation; diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/util/CONTENTPROFILEValidator.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/util/CONTENTPROFILEValidator.java index 68ffc1899b..3f476315ab 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/util/CONTENTPROFILEValidator.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/util/CONTENTPROFILEValidator.java @@ -6,13 +6,27 @@ import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.ResourceLocator; - import org.eclipse.emf.ecore.EPackage; - import org.eclipse.emf.ecore.util.EObjectValidator; - import org.eclipse.mdht.uml.cda.util.CDAValidator; -import org.hl7.security.ds4p.contentprofile.*; +import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; +import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPlugin; +import org.hl7.security.ds4p.contentprofile.ConfidentialitySecurityObservation; +import org.hl7.security.ds4p.contentprofile.MandatoryDocumentAssignedAuthor; +import org.hl7.security.ds4p.contentprofile.MandatoryDocumentProvenance; +import org.hl7.security.ds4p.contentprofile.MandatoryEntryAssignedAuthor; +import org.hl7.security.ds4p.contentprofile.MandatoryEntryProvenance; +import org.hl7.security.ds4p.contentprofile.ObligationPolicySecurityObservation; +import org.hl7.security.ds4p.contentprofile.PrivacyAnnotation; +import org.hl7.security.ds4p.contentprofile.PrivacyAnnotationEntryRelationship; +import org.hl7.security.ds4p.contentprofile.PrivacyMarkingsEntry; +import org.hl7.security.ds4p.contentprofile.PrivacyMarkingsSection; +import org.hl7.security.ds4p.contentprofile.PrivacySegmentedDocument; +import org.hl7.security.ds4p.contentprofile.PrivacySegmentedSection; +import org.hl7.security.ds4p.contentprofile.ProtectedProblem; +import org.hl7.security.ds4p.contentprofile.PurposeOfUseSecurityObservation; +import org.hl7.security.ds4p.contentprofile.RefrainPolicySecurityObservation; +import org.hl7.security.ds4p.contentprofile.SecurityObservation; import org.openhealthtools.mdht.uml.cda.consol.util.ConsolValidator; /** @@ -665,26 +679,26 @@ protected boolean validate(int classifierID, Object value, DiagnosticChain diagn case CONTENTPROFILEPackage.PRIVACY_MARKINGS_SECTION: return validatePrivacyMarkingsSection((PrivacyMarkingsSection) value, diagnostics, context); case CONTENTPROFILEPackage.OBLIGATION_POLICY_SECURITY_OBSERVATION: - return validateObligationPolicySecurityObservation((ObligationPolicySecurityObservation) value, - diagnostics, context); + return validateObligationPolicySecurityObservation( + (ObligationPolicySecurityObservation) value, diagnostics, context); case CONTENTPROFILEPackage.SECURITY_OBSERVATION: return validateSecurityObservation((SecurityObservation) value, diagnostics, context); case CONTENTPROFILEPackage.MANDATORY_DOCUMENT_PROVENANCE: return validateMandatoryDocumentProvenance((MandatoryDocumentProvenance) value, diagnostics, context); case CONTENTPROFILEPackage.MANDATORY_DOCUMENT_ASSIGNED_AUTHOR: - return validateMandatoryDocumentAssignedAuthor((MandatoryDocumentAssignedAuthor) value, diagnostics, - context); + return validateMandatoryDocumentAssignedAuthor( + (MandatoryDocumentAssignedAuthor) value, diagnostics, context); case CONTENTPROFILEPackage.PRIVACY_ANNOTATION: return validatePrivacyAnnotation((PrivacyAnnotation) value, diagnostics, context); case CONTENTPROFILEPackage.REFRAIN_POLICY_SECURITY_OBSERVATION: - return validateRefrainPolicySecurityObservation((RefrainPolicySecurityObservation) value, diagnostics, - context); + return validateRefrainPolicySecurityObservation( + (RefrainPolicySecurityObservation) value, diagnostics, context); case CONTENTPROFILEPackage.PURPOSE_OF_USE_SECURITY_OBSERVATION: - return validatePurposeOfUseSecurityObservation((PurposeOfUseSecurityObservation) value, diagnostics, - context); + return validatePurposeOfUseSecurityObservation( + (PurposeOfUseSecurityObservation) value, diagnostics, context); case CONTENTPROFILEPackage.CONFIDENTIALITY_SECURITY_OBSERVATION: - return validateConfidentialitySecurityObservation((ConfidentialitySecurityObservation) value, - diagnostics, context); + return validateConfidentialitySecurityObservation( + (ConfidentialitySecurityObservation) value, diagnostics, context); case CONTENTPROFILEPackage.PROTECTED_PROBLEM: return validateProtectedProblem((ProtectedProblem) value, diagnostics, context); case CONTENTPROFILEPackage.MANDATORY_ENTRY_PROVENANCE: @@ -692,8 +706,8 @@ protected boolean validate(int classifierID, Object value, DiagnosticChain diagn case CONTENTPROFILEPackage.MANDATORY_ENTRY_ASSIGNED_AUTHOR: return validateMandatoryEntryAssignedAuthor((MandatoryEntryAssignedAuthor) value, diagnostics, context); case CONTENTPROFILEPackage.PRIVACY_ANNOTATION_ENTRY_RELATIONSHIP: - return validatePrivacyAnnotationEntryRelationship((PrivacyAnnotationEntryRelationship) value, - diagnostics, context); + return validatePrivacyAnnotationEntryRelationship( + (PrivacyAnnotationEntryRelationship) value, diagnostics, context); case CONTENTPROFILEPackage.PRIVACY_MARKINGS_ENTRY: return validatePrivacyMarkingsEntry((PrivacyMarkingsEntry) value, diagnostics, context); default: @@ -881,6 +895,14 @@ public boolean validatePrivacySegmentedDocument(PrivacySegmentedDocument privacy result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet( privacySegmentedDocument, diagnostics, context); } + if (result || diagnostics != null) { + result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement( + privacySegmentedDocument, diagnostics, context); + } + if (result || diagnostics != null) { + result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement( + privacySegmentedDocument, diagnostics, context); + } if (result || diagnostics != null) { result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressUse( privacySegmentedDocument, diagnostics, context); @@ -957,6 +979,14 @@ public boolean validatePrivacySegmentedDocument(PrivacySegmentedDocument privacy result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet( privacySegmentedDocument, diagnostics, context); } + if (result || diagnostics != null) { + result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement( + privacySegmentedDocument, diagnostics, context); + } + if (result || diagnostics != null) { + result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement( + privacySegmentedDocument, diagnostics, context); + } if (result || diagnostics != null) { result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressUse( privacySegmentedDocument, diagnostics, context); @@ -1129,6 +1159,14 @@ public boolean validatePrivacySegmentedDocument(PrivacySegmentedDocument privacy result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet( privacySegmentedDocument, diagnostics, context); } + if (result || diagnostics != null) { + result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement( + privacySegmentedDocument, diagnostics, context); + } + if (result || diagnostics != null) { + result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement( + privacySegmentedDocument, diagnostics, context); + } if (result || diagnostics != null) { result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressUse( privacySegmentedDocument, diagnostics, context); @@ -1233,6 +1271,14 @@ public boolean validatePrivacySegmentedDocument(PrivacySegmentedDocument privacy result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet( privacySegmentedDocument, diagnostics, context); } + if (result || diagnostics != null) { + result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement( + privacySegmentedDocument, diagnostics, context); + } + if (result || diagnostics != null) { + result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement( + privacySegmentedDocument, diagnostics, context); + } if (result || diagnostics != null) { result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressUse( privacySegmentedDocument, diagnostics, context); @@ -1317,6 +1363,14 @@ public boolean validatePrivacySegmentedDocument(PrivacySegmentedDocument privacy result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet( privacySegmentedDocument, diagnostics, context); } + if (result || diagnostics != null) { + result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement( + privacySegmentedDocument, diagnostics, context); + } + if (result || diagnostics != null) { + result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement( + privacySegmentedDocument, diagnostics, context); + } if (result || diagnostics != null) { result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse( privacySegmentedDocument, diagnostics, context); @@ -1393,6 +1447,14 @@ public boolean validatePrivacySegmentedDocument(PrivacySegmentedDocument privacy result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet( privacySegmentedDocument, diagnostics, context); } + if (result || diagnostics != null) { + result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement( + privacySegmentedDocument, diagnostics, context); + } + if (result || diagnostics != null) { + result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement( + privacySegmentedDocument, diagnostics, context); + } if (result || diagnostics != null) { result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressUse( privacySegmentedDocument, diagnostics, context); @@ -1473,6 +1535,14 @@ public boolean validatePrivacySegmentedDocument(PrivacySegmentedDocument privacy result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet( privacySegmentedDocument, diagnostics, context); } + if (result || diagnostics != null) { + result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement( + privacySegmentedDocument, diagnostics, context); + } + if (result || diagnostics != null) { + result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement( + privacySegmentedDocument, diagnostics, context); + } if (result || diagnostics != null) { result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse( privacySegmentedDocument, diagnostics, context); @@ -1557,6 +1627,14 @@ public boolean validatePrivacySegmentedDocument(PrivacySegmentedDocument privacy result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet( privacySegmentedDocument, diagnostics, context); } + if (result || diagnostics != null) { + result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement( + privacySegmentedDocument, diagnostics, context); + } + if (result || diagnostics != null) { + result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement( + privacySegmentedDocument, diagnostics, context); + } if (result || diagnostics != null) { result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse( privacySegmentedDocument, diagnostics, context); @@ -1641,6 +1719,14 @@ public boolean validatePrivacySegmentedDocument(PrivacySegmentedDocument privacy result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet( privacySegmentedDocument, diagnostics, context); } + if (result || diagnostics != null) { + result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement( + privacySegmentedDocument, diagnostics, context); + } + if (result || diagnostics != null) { + result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement( + privacySegmentedDocument, diagnostics, context); + } if (result || diagnostics != null) { result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse( privacySegmentedDocument, diagnostics, context); @@ -1701,6 +1787,14 @@ public boolean validatePrivacySegmentedDocument(PrivacySegmentedDocument privacy result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet( privacySegmentedDocument, diagnostics, context); } + if (result || diagnostics != null) { + result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement( + privacySegmentedDocument, diagnostics, context); + } + if (result || diagnostics != null) { + result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement( + privacySegmentedDocument, diagnostics, context); + } if (result || diagnostics != null) { result &= consolValidator.validateGeneralHeaderConstraints_validateGeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressUse( privacySegmentedDocument, diagnostics, context); diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/util/DS4PUtil.java b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/util/DS4PUtil.java index 1e64f8dccc..744c67abba 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/util/DS4PUtil.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/org/hl7/security/ds4p/contentprofile/util/DS4PUtil.java @@ -21,6 +21,7 @@ import org.eclipse.mdht.uml.cda.internal.resource.CDAResource; import org.eclipse.mdht.uml.cda.util.CDAUtil; import org.eclipse.mdht.uml.cda.util.CDAUtil.ValidationHandler; +import org.eclipse.mdht.uml.hl7.datatypes.util.DatatypesUtil.ValidationStatistics; /** * @author seanmuir @@ -56,6 +57,24 @@ public void handleInfo(Diagnostic diagnostic) { } } + @Override + public boolean isCaptureValidationStatistics() { + // TODO Auto-generated method stub + return false; + } + + @Override + public ValidationStatistics getValidationStatistics() { + // TODO Auto-generated method stub + return null; + } + + @Override + public void setValidationStatistics(ValidationStatistics validationStatistics) { + // TODO Auto-generated method stub + + } + }; DS4PUtil.load(is, filterHandler); diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/test/DS4PValidationExample.java b/generated/org.hl7.security.ds4p.contentprofile/src/test/DS4PValidationExample.java index 116c57f336..4d907536fe 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/test/DS4PValidationExample.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/test/DS4PValidationExample.java @@ -12,6 +12,7 @@ import org.eclipse.mdht.uml.cda.util.CDADiagnostic; import org.eclipse.mdht.uml.cda.util.CDAUtil.ValidationHandler; import org.eclipse.mdht.uml.cda.util.ValidationResult; +import org.eclipse.mdht.uml.hl7.datatypes.util.DatatypesUtil.ValidationStatistics; import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; import org.hl7.security.ds4p.contentprofile.util.DS4PUtil; @@ -52,6 +53,24 @@ public void handleWarning(Diagnostic diagnostic) { public void handleInfo(Diagnostic diagnostic) { System.out.println(diagnostic.getMessage()); } + + @Override + public boolean isCaptureValidationStatistics() { + // TODO Auto-generated method stub + return false; + } + + @Override + public ValidationStatistics getValidationStatistics() { + // TODO Auto-generated method stub + return null; + } + + @Override + public void setValidationStatistics(ValidationStatistics validationStatistics) { + // TODO Auto-generated method stub + + } }; try { diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/test/TestValidation.java b/generated/org.hl7.security.ds4p.contentprofile/src/test/TestValidation.java index 16d17cbd6f..43f395fd2c 100644 --- a/generated/org.hl7.security.ds4p.contentprofile/src/test/TestValidation.java +++ b/generated/org.hl7.security.ds4p.contentprofile/src/test/TestValidation.java @@ -5,6 +5,7 @@ import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.mdht.uml.cda.util.CDAUtil.ValidationHandler; +import org.eclipse.mdht.uml.hl7.datatypes.util.DatatypesUtil.ValidationStatistics; import org.hl7.security.ds4p.contentprofile.CONTENTPROFILEPackage; import org.hl7.security.ds4p.contentprofile.util.DS4PUtil; @@ -32,6 +33,24 @@ public void handleInfo(Diagnostic diagnostic) { System.out.println(diagnostic.getMessage()); } + @Override + public boolean isCaptureValidationStatistics() { + // TODO Auto-generated method stub + return false; + } + + @Override + public ValidationStatistics getValidationStatistics() { + // TODO Auto-generated method stub + return null; + } + + @Override + public void setValidationStatistics(ValidationStatistics validationStatistics) { + // TODO Auto-generated method stub + + } + }; DS4PUtil.validateAsDS4P(new FileInputStream("samples/SegmentedDocumentContentProfileSample.xml"), handler);