diff --git a/hapi-fhir-base/src/changes/changes.xml b/hapi-fhir-base/src/changes/changes.xml index c384ed79093..b6193f17df7 100644 --- a/hapi-fhir-base/src/changes/changes.xml +++ b/hapi-fhir-base/src/changes/changes.xml @@ -121,6 +121,16 @@ QuantityParam correctly encodes approximate (~) prefix to values + + If a server defines a method with parameter "_id", incoming search requests for that method may + get delegated to the wrong method. Thanks to Neal Acharya for reporting! + + + SecurityEvent.Object structural element has been renamed to + SecurityEvent.ObjectElement to avoid conflicting names with the + java Object class. Thanks to Laurie Macdougall-Sookraj of UHN for + reporting! + diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java index bbda02ef310..ffa5fa5fde8 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java @@ -20,7 +20,7 @@ package ca.uhn.fhir.context; * #L% */ -import static org.apache.commons.lang3.StringUtils.*; +import static org.apache.commons.lang3.StringUtils.isBlank; import java.io.IOException; import java.io.InputStream; diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/i18n/HapiLocalizer.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/i18n/HapiLocalizer.java similarity index 65% rename from hapi-fhir-base/src/test/java/ca/uhn/fhir/i18n/HapiLocalizer.java rename to hapi-fhir-base/src/main/java/ca/uhn/fhir/i18n/HapiLocalizer.java index 311cfbd7a4f..2a627159977 100644 --- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/i18n/HapiLocalizer.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/i18n/HapiLocalizer.java @@ -1,5 +1,25 @@ package ca.uhn.fhir.i18n; +/* + * #%L + * HAPI FHIR - Core Library + * %% + * Copyright (C) 2014 University Health Network + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + import java.text.MessageFormat; import java.util.Map; import java.util.ResourceBundle; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Bundle.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Bundle.java index 8db3a1aeba1..c96a6d29fb4 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Bundle.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Bundle.java @@ -20,7 +20,7 @@ package ca.uhn.fhir.model.api; * #L% */ -import static org.apache.commons.lang3.StringUtils.*; +import static org.apache.commons.lang3.StringUtils.isNotBlank; import java.util.ArrayList; import java.util.HashMap; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseIdentifierDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseIdentifierDt.java index 016850120e1..3dbf76e9bb0 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseIdentifierDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseIdentifierDt.java @@ -25,6 +25,7 @@ import org.apache.commons.lang3.StringUtils; import ca.uhn.fhir.model.api.BaseIdentifiableElement; import ca.uhn.fhir.model.api.ICompositeDatatype; import ca.uhn.fhir.model.api.IQueryParameterType; +import ca.uhn.fhir.model.dstu.composite.IdentifierDt; import ca.uhn.fhir.model.primitive.StringDt; import ca.uhn.fhir.model.primitive.UriDt; import ca.uhn.fhir.rest.param.ParameterUtil; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/AddressDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/AddressDt.java index 1a6a6046cfe..37003e53619 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/AddressDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/AddressDt.java @@ -518,4 +518,4 @@ public class AddressDt -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/AttachmentDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/AttachmentDt.java index 0b5361057f7..5919b8831bf 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/AttachmentDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/AttachmentDt.java @@ -447,4 +447,4 @@ public class AttachmentDt -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/CodeableConceptDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/CodeableConceptDt.java index 9f358b4baca..4f30bb59763 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/CodeableConceptDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/CodeableConceptDt.java @@ -211,4 +211,4 @@ public class CodeableConceptDt -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/CodingDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/CodingDt.java index 7f9f4b1e7cf..d5805dd00c3 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/CodingDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/CodingDt.java @@ -390,4 +390,4 @@ public class CodingDt -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ContactDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ContactDt.java index 6863159f5bc..8155a7c3725 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ContactDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ContactDt.java @@ -298,4 +298,4 @@ public class ContactDt -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/HumanNameDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/HumanNameDt.java index c1785cbd862..d28f5f01f2e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/HumanNameDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/HumanNameDt.java @@ -569,4 +569,4 @@ public class HumanNameDt -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/IdentifierDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/IdentifierDt.java index b235c6b8bc5..f30a340831d 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/IdentifierDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/IdentifierDt.java @@ -396,4 +396,4 @@ public class IdentifierDt -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/PeriodDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/PeriodDt.java index 813e4cbf653..8814a9ce1b2 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/PeriodDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/PeriodDt.java @@ -216,4 +216,4 @@ public class PeriodDt -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/QuantityDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/QuantityDt.java index 06b7321e2dd..2d02af00b4f 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/QuantityDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/QuantityDt.java @@ -433,4 +433,4 @@ public class QuantityDt -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/RangeDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/RangeDt.java index 8a23cb4785a..c32a2b67956 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/RangeDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/RangeDt.java @@ -318,4 +318,4 @@ public class RangeDt -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/RatioDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/RatioDt.java index 39850e81c07..df5fdb66f94 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/RatioDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/RatioDt.java @@ -318,4 +318,4 @@ public class RatioDt -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ResourceReferenceDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ResourceReferenceDt.java index 4f0a2b479d4..cf3feb9f59e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ResourceReferenceDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ResourceReferenceDt.java @@ -227,4 +227,4 @@ public class ResourceReferenceDt -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/SampledDataDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/SampledDataDt.java index d9b2483396a..390297f599f 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/SampledDataDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/SampledDataDt.java @@ -615,4 +615,4 @@ public class SampledDataDt -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ScheduleDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ScheduleDt.java index d067302f235..07d2c2a7d9b 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ScheduleDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ScheduleDt.java @@ -572,4 +572,4 @@ public class ScheduleDt -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AdverseReaction.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AdverseReaction.java index e9cb4a00a89..2bb5e0db13c 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AdverseReaction.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AdverseReaction.java @@ -977,4 +977,4 @@ public class AdverseReaction extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Alert.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Alert.java index 22fa576dda6..2178f1dc68d 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Alert.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Alert.java @@ -443,4 +443,4 @@ public class Alert extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AllergyIntolerance.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AllergyIntolerance.java index 6e7937d9684..56155bbc798 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AllergyIntolerance.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AllergyIntolerance.java @@ -785,4 +785,4 @@ public class AllergyIntolerance extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Appointment.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Appointment.java index a451a61413f..192928e0d36 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Appointment.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Appointment.java @@ -1352,4 +1352,4 @@ public class Appointment extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AppointmentResponse.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AppointmentResponse.java index 80a08a531cc..6247dbf9846 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AppointmentResponse.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AppointmentResponse.java @@ -891,4 +891,4 @@ public class AppointmentResponse extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Availability.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Availability.java index cf69c7338b3..d3c725de93f 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Availability.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Availability.java @@ -517,4 +517,4 @@ public class Availability extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/CarePlan.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/CarePlan.java index 094c5c459e8..5469d208114 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/CarePlan.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/CarePlan.java @@ -2156,4 +2156,4 @@ public class CarePlan extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Claim.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Claim.java index a80aa7eeaa5..f4305208b65 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Claim.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Claim.java @@ -2031,4 +2031,4 @@ public class Claim extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Composition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Composition.java index 22deb9df433..f87acbd7d6b 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Composition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Composition.java @@ -1696,4 +1696,4 @@ public class Composition extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ConceptMap.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ConceptMap.java index f212e215b0c..65d442a621f 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ConceptMap.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ConceptMap.java @@ -1828,4 +1828,4 @@ public class ConceptMap extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Condition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Condition.java index 0b814ef6d97..e6dbdf1e5c7 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Condition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Condition.java @@ -1775,4 +1775,4 @@ public class Condition extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Conformance.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Conformance.java index 3d5d67b376a..03717a6fb26 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Conformance.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Conformance.java @@ -4881,4 +4881,4 @@ public class Conformance extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Coverage.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Coverage.java index ff9d47c47cc..0dadbb8fe8f 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Coverage.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Coverage.java @@ -974,4 +974,4 @@ public class Coverage extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Device.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Device.java index 51d72c4784c..eea416d03c8 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Device.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Device.java @@ -1017,4 +1017,4 @@ public class Device extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DeviceObservationReport.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DeviceObservationReport.java index c684abe000b..ef24e29543b 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DeviceObservationReport.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DeviceObservationReport.java @@ -821,4 +821,4 @@ public class DeviceObservationReport extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DiagnosticOrder.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DiagnosticOrder.java index 603d898cf5d..4c3686e051d 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DiagnosticOrder.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DiagnosticOrder.java @@ -1532,4 +1532,4 @@ public class DiagnosticOrder extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DiagnosticReport.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DiagnosticReport.java index ff266f3cd4e..302c063baed 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DiagnosticReport.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DiagnosticReport.java @@ -1360,4 +1360,4 @@ public class DiagnosticReport extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DocumentManifest.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DocumentManifest.java index 8a77ab53a85..ee3185fece5 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DocumentManifest.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DocumentManifest.java @@ -1070,4 +1070,4 @@ public class DocumentManifest extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DocumentReference.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DocumentReference.java index a641a56599c..afd367828b9 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DocumentReference.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DocumentReference.java @@ -2479,4 +2479,4 @@ public class DocumentReference extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Encounter.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Encounter.java index a9a1a219fea..a45f9734cd9 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Encounter.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Encounter.java @@ -2086,4 +2086,4 @@ public class Encounter extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/FamilyHistory.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/FamilyHistory.java index 6ae8e650076..da01bd08a28 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/FamilyHistory.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/FamilyHistory.java @@ -882,4 +882,4 @@ public class FamilyHistory extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GVFMeta.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GVFMeta.java index ad262d4ae92..33fbd5861b7 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GVFMeta.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GVFMeta.java @@ -1551,4 +1551,4 @@ public class GVFMeta extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GVFVariant.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GVFVariant.java index 5d90f43e474..b1b52ba6f7c 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GVFVariant.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GVFVariant.java @@ -3196,4 +3196,4 @@ public class GVFVariant extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GeneExpression.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GeneExpression.java index b8f9a6055c1..40b6c67e9ad 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GeneExpression.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GeneExpression.java @@ -1056,4 +1056,4 @@ public class GeneExpression extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GeneticAnalysis.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GeneticAnalysis.java index 1538b9ed17e..67337c3fde1 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GeneticAnalysis.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GeneticAnalysis.java @@ -1423,4 +1423,4 @@ public class GeneticAnalysis extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Group.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Group.java index 1d8e599d85d..2eaae0ee6b7 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Group.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Group.java @@ -876,4 +876,4 @@ public class Group extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ImagingStudy.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ImagingStudy.java index 8705f4273af..2bb51ce5689 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ImagingStudy.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ImagingStudy.java @@ -2186,4 +2186,4 @@ public class ImagingStudy extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Immunization.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Immunization.java index 044b1783188..450a4b48d91 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Immunization.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Immunization.java @@ -2210,4 +2210,4 @@ public class Immunization extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ImmunizationRecommendation.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ImmunizationRecommendation.java index 3f0f521fdd4..7a833d8131d 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ImmunizationRecommendation.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ImmunizationRecommendation.java @@ -1319,4 +1319,4 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ListResource.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ListResource.java index c090a0a4044..6493c7894eb 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ListResource.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ListResource.java @@ -984,4 +984,4 @@ public class ListResource extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Location.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Location.java index 1641976d8b5..d8170729b53 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Location.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Location.java @@ -1152,4 +1152,4 @@ public class Location extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Media.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Media.java index c414e7ea552..e00674ca104 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Media.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Media.java @@ -926,4 +926,4 @@ public class Media extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Medication.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Medication.java index d0c596caacf..361beb3adb2 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Medication.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Medication.java @@ -818,4 +818,4 @@ public class Medication extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationAdministration.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationAdministration.java index d30786c2278..56bd3f840b9 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationAdministration.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationAdministration.java @@ -1353,4 +1353,4 @@ public class MedicationAdministration extends BaseResource implements IResource -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationDispense.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationDispense.java index 63166bbbb21..4be9e924912 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationDispense.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationDispense.java @@ -1971,4 +1971,4 @@ public class MedicationDispense extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationPrescription.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationPrescription.java index 73111af31f1..726e9cc4f4e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationPrescription.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationPrescription.java @@ -1712,4 +1712,4 @@ public class MedicationPrescription extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationStatement.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationStatement.java index 5e6641b2ac8..9119c6594eb 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationStatement.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationStatement.java @@ -1088,4 +1088,4 @@ public class MedicationStatement extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MessageHeader.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MessageHeader.java index f8c68214c12..8142d4cd0b4 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MessageHeader.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MessageHeader.java @@ -1271,4 +1271,4 @@ public class MessageHeader extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Microarray.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Microarray.java index 37317dcfc56..d8e02220cc3 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Microarray.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Microarray.java @@ -1489,4 +1489,4 @@ public class Microarray extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Observation.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Observation.java index 73a9e5b11ee..ccc20ae29c8 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Observation.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Observation.java @@ -1753,4 +1753,4 @@ public class Observation extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/OperationOutcome.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/OperationOutcome.java index 7ca704f5aeb..71c8fe49713 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/OperationOutcome.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/OperationOutcome.java @@ -410,4 +410,4 @@ public class OperationOutcome extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Order.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Order.java index 5e8dd9ff372..88ed533495b 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Order.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Order.java @@ -850,4 +850,4 @@ public class Order extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/OrderResponse.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/OrderResponse.java index 86800ca5c6f..d321925d245 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/OrderResponse.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/OrderResponse.java @@ -659,4 +659,4 @@ public class OrderResponse extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Organization.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Organization.java index 0cb7102589a..3e9f7e2bb06 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Organization.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Organization.java @@ -1115,4 +1115,4 @@ public class Organization extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Other.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Other.java index da67c67cc3d..781bde4933c 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Other.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Other.java @@ -448,4 +448,4 @@ public class Other extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Patient.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Patient.java index 28504939aa2..e8886ffa649 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Patient.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Patient.java @@ -2099,4 +2099,4 @@ public class Patient extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Practitioner.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Practitioner.java index 03affc4e245..76d54166551 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Practitioner.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Practitioner.java @@ -1370,4 +1370,4 @@ public class Practitioner extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Procedure.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Procedure.java index 85868e468fc..944d2a976d2 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Procedure.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Procedure.java @@ -1186,4 +1186,4 @@ public class Procedure extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Profile.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Profile.java index d63a5899b2c..6c7ef1807cd 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Profile.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Profile.java @@ -5135,4 +5135,4 @@ public class Profile extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Provenance.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Provenance.java index c467247aaea..0e33c9b82dc 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Provenance.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Provenance.java @@ -1202,4 +1202,4 @@ public class Provenance extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Query.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Query.java index 01e41b02419..4253bdb42f2 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Query.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Query.java @@ -860,4 +860,4 @@ public class Query extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Questionnaire.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Questionnaire.java index fb987f1d753..cec5d605e3e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Questionnaire.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Questionnaire.java @@ -1503,4 +1503,4 @@ public class Questionnaire extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/RelatedPerson.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/RelatedPerson.java index b72577e5d60..b7b5e71aa66 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/RelatedPerson.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/RelatedPerson.java @@ -744,4 +744,4 @@ public class RelatedPerson extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Remittance.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Remittance.java index c167fd52eab..f822d20c57d 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Remittance.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Remittance.java @@ -536,4 +536,4 @@ public class Remittance extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/SecurityEvent.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/SecurityEvent.java index f08ba47a5b9..ac6ffde560c 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/SecurityEvent.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/SecurityEvent.java @@ -448,7 +448,7 @@ public class SecurityEvent extends BaseResource implements IResource { shortDefinition="Specific instances of data or objects that have been accessed", formalDefinition="Specific instances of data or objects that have been accessed" ) - private java.util.List myObject; + private java.util.List myObject; @Override @@ -593,9 +593,9 @@ public class SecurityEvent extends BaseResource implements IResource { * Specific instances of data or objects that have been accessed *

*/ - public java.util.List getObject() { + public java.util.List getObject() { if (myObject == null) { - myObject = new java.util.ArrayList(); + myObject = new java.util.ArrayList(); } return myObject; } @@ -608,7 +608,7 @@ public class SecurityEvent extends BaseResource implements IResource { * Specific instances of data or objects that have been accessed *

*/ - public SecurityEvent setObject(java.util.List theValue) { + public SecurityEvent setObject(java.util.List theValue) { myObject = theValue; return this; } @@ -621,8 +621,8 @@ public class SecurityEvent extends BaseResource implements IResource { * Specific instances of data or objects that have been accessed *

*/ - public Object addObject() { - Object newType = new Object(); + public ObjectElement addObject() { + ObjectElement newType = new ObjectElement(); getObject().add(newType); return newType; } @@ -636,7 +636,7 @@ public class SecurityEvent extends BaseResource implements IResource { * Specific instances of data or objects that have been accessed *

*/ - public Object getObjectFirstRep() { + public ObjectElement getObjectFirstRep() { if (getObject().isEmpty()) { return addObject(); } @@ -1735,7 +1735,7 @@ public class SecurityEvent extends BaseResource implements IResource { *

*/ @Block() - public static class Object extends BaseIdentifiableElement implements IResourceBlock { + public static class ObjectElement extends BaseIdentifiableElement implements IResourceBlock { @Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=1) @Description( @@ -1844,7 +1844,7 @@ public class SecurityEvent extends BaseResource implements IResource { * Identifies a specific instance of the participant object. The reference should always be version specific *

*/ - public Object setIdentifier(IdentifierDt theValue) { + public ObjectElement setIdentifier(IdentifierDt theValue) { myIdentifier = theValue; return this; } @@ -1857,7 +1857,7 @@ public class SecurityEvent extends BaseResource implements IResource { * Identifies a specific instance of the participant object. The reference should always be version specific *

*/ - public Object setIdentifier( IdentifierUseEnum theUse, String theSystem, String theValue, String theLabel) { + public ObjectElement setIdentifier( IdentifierUseEnum theUse, String theSystem, String theValue, String theLabel) { myIdentifier = new IdentifierDt(theUse, theSystem, theValue, theLabel); return this; } @@ -1870,7 +1870,7 @@ public class SecurityEvent extends BaseResource implements IResource { * Identifies a specific instance of the participant object. The reference should always be version specific *

*/ - public Object setIdentifier( String theSystem, String theValue) { + public ObjectElement setIdentifier( String theSystem, String theValue) { myIdentifier = new IdentifierDt(theSystem, theValue); return this; } @@ -1901,7 +1901,7 @@ public class SecurityEvent extends BaseResource implements IResource { * Identifies a specific instance of the participant object. The reference should always be version specific *

*/ - public Object setReference(ResourceReferenceDt theValue) { + public ObjectElement setReference(ResourceReferenceDt theValue) { myReference = theValue; return this; } @@ -1932,7 +1932,7 @@ public class SecurityEvent extends BaseResource implements IResource { * Object type being audited *

*/ - public Object setType(BoundCodeDt theValue) { + public ObjectElement setType(BoundCodeDt theValue) { myType = theValue; return this; } @@ -1945,7 +1945,7 @@ public class SecurityEvent extends BaseResource implements IResource { * Object type being audited *

*/ - public Object setType(SecurityEventObjectTypeEnum theValue) { + public ObjectElement setType(SecurityEventObjectTypeEnum theValue) { getType().setValueAsEnum(theValue); return this; } @@ -1976,7 +1976,7 @@ public class SecurityEvent extends BaseResource implements IResource { * Code representing the functional application role of Participant Object being audited *

*/ - public Object setRole(BoundCodeDt theValue) { + public ObjectElement setRole(BoundCodeDt theValue) { myRole = theValue; return this; } @@ -1989,7 +1989,7 @@ public class SecurityEvent extends BaseResource implements IResource { * Code representing the functional application role of Participant Object being audited *

*/ - public Object setRole(SecurityEventObjectRoleEnum theValue) { + public ObjectElement setRole(SecurityEventObjectRoleEnum theValue) { getRole().setValueAsEnum(theValue); return this; } @@ -2020,7 +2020,7 @@ public class SecurityEvent extends BaseResource implements IResource { * Identifier for the data life-cycle stage for the participant object *

*/ - public Object setLifecycle(BoundCodeDt theValue) { + public ObjectElement setLifecycle(BoundCodeDt theValue) { myLifecycle = theValue; return this; } @@ -2033,7 +2033,7 @@ public class SecurityEvent extends BaseResource implements IResource { * Identifier for the data life-cycle stage for the participant object *

*/ - public Object setLifecycle(SecurityEventObjectLifecycleEnum theValue) { + public ObjectElement setLifecycle(SecurityEventObjectLifecycleEnum theValue) { getLifecycle().setValueAsEnum(theValue); return this; } @@ -2064,7 +2064,7 @@ public class SecurityEvent extends BaseResource implements IResource { * Denotes policy-defined sensitivity for the Participant Object ID such as VIP, HIV status, mental health status or similar topics *

*/ - public Object setSensitivity(BoundCodeableConceptDt theValue) { + public ObjectElement setSensitivity(BoundCodeableConceptDt theValue) { mySensitivity = theValue; return this; } @@ -2077,7 +2077,7 @@ public class SecurityEvent extends BaseResource implements IResource { * Denotes policy-defined sensitivity for the Participant Object ID such as VIP, HIV status, mental health status or similar topics *

*/ - public Object setSensitivity(SecurityEventObjectSensitivityEnum theValue) { + public ObjectElement setSensitivity(SecurityEventObjectSensitivityEnum theValue) { getSensitivity().setValueAsEnum(theValue); return this; } @@ -2108,7 +2108,7 @@ public class SecurityEvent extends BaseResource implements IResource { * An instance-specific descriptor of the Participant Object ID audited, such as a person's name *

*/ - public Object setName(StringDt theValue) { + public ObjectElement setName(StringDt theValue) { myName = theValue; return this; } @@ -2121,7 +2121,7 @@ public class SecurityEvent extends BaseResource implements IResource { * An instance-specific descriptor of the Participant Object ID audited, such as a person's name *

*/ - public Object setName( String theString) { + public ObjectElement setName( String theString) { myName = new StringDt(theString); return this; } @@ -2152,7 +2152,7 @@ public class SecurityEvent extends BaseResource implements IResource { * Text that describes the object in more detail *

*/ - public Object setDescription(StringDt theValue) { + public ObjectElement setDescription(StringDt theValue) { myDescription = theValue; return this; } @@ -2165,7 +2165,7 @@ public class SecurityEvent extends BaseResource implements IResource { * Text that describes the object in more detail *

*/ - public Object setDescription( String theString) { + public ObjectElement setDescription( String theString) { myDescription = new StringDt(theString); return this; } @@ -2196,7 +2196,7 @@ public class SecurityEvent extends BaseResource implements IResource { * The actual query for a query-type participant object *

*/ - public Object setQuery(Base64BinaryDt theValue) { + public ObjectElement setQuery(Base64BinaryDt theValue) { myQuery = theValue; return this; } @@ -2209,7 +2209,7 @@ public class SecurityEvent extends BaseResource implements IResource { * The actual query for a query-type participant object *

*/ - public Object setQuery( byte[] theBytes) { + public ObjectElement setQuery( byte[] theBytes) { myQuery = new Base64BinaryDt(theBytes); return this; } @@ -2240,7 +2240,7 @@ public class SecurityEvent extends BaseResource implements IResource { * *

*/ - public Object setDetail(java.util.List theValue) { + public ObjectElement setDetail(java.util.List theValue) { myDetail = theValue; return this; } @@ -2409,4 +2409,4 @@ public class SecurityEvent extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/SequencingAnalysis.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/SequencingAnalysis.java index 89cf488f1e3..6f88b713bd3 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/SequencingAnalysis.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/SequencingAnalysis.java @@ -659,4 +659,4 @@ public class SequencingAnalysis extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/SequencingLab.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/SequencingLab.java index f0944b79bcb..c81a66ee824 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/SequencingLab.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/SequencingLab.java @@ -976,4 +976,4 @@ public class SequencingLab extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Slot.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Slot.java index 4ffaef211a0..9fc76b608aa 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Slot.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Slot.java @@ -702,4 +702,4 @@ public class Slot extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Specimen.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Specimen.java index 96e24f7dbe3..107ffe1e0cf 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Specimen.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Specimen.java @@ -1871,4 +1871,4 @@ public class Specimen extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Substance.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Substance.java index 7800d20dac8..fa49d4c673c 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Substance.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Substance.java @@ -797,4 +797,4 @@ public class Substance extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Supply.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Supply.java index 20ece25f013..dab47981b3a 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Supply.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Supply.java @@ -1128,4 +1128,4 @@ public class Supply extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Test.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Test.java index 1302b654641..bda3b487e5d 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Test.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Test.java @@ -1430,4 +1430,4 @@ public class Test extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/User.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/User.java index 95cb7940a4d..18b94f5dd99 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/User.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/User.java @@ -656,4 +656,4 @@ public class User extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ValueSet.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ValueSet.java index 440bb883b51..006e3bece8a 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ValueSet.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ValueSet.java @@ -2770,4 +2770,4 @@ public class ValueSet extends BaseResource implements IResource { -} +} \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParserState.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParserState.java index c0783fb8326..d433a80edee 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParserState.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParserState.java @@ -20,7 +20,8 @@ package ca.uhn.fhir.parser; * #L% */ -import static org.apache.commons.lang3.StringUtils.*; +import static org.apache.commons.lang3.StringUtils.defaultIfBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; import java.util.ArrayList; import java.util.HashMap; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/OptionalParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/OptionalParam.java index 2d76eb586c7..b35eea90414 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/OptionalParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/OptionalParam.java @@ -27,6 +27,7 @@ import ca.uhn.fhir.model.api.IQueryParameterType; import ca.uhn.fhir.model.api.IResource; import ca.uhn.fhir.model.dstu.resource.Observation; import ca.uhn.fhir.model.dstu.resource.Patient; +import ca.uhn.fhir.rest.param.CompositeParam; import ca.uhn.fhir.rest.param.ReferenceParam; @Retention(RetentionPolicy.RUNTIME) diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/RequiredParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/RequiredParam.java index 9385c605335..9dae7c2351a 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/RequiredParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/RequiredParam.java @@ -27,6 +27,7 @@ import ca.uhn.fhir.model.api.IQueryParameterType; import ca.uhn.fhir.model.api.IResource; import ca.uhn.fhir.model.dstu.resource.Observation; import ca.uhn.fhir.model.dstu.resource.Patient; +import ca.uhn.fhir.rest.param.CompositeParam; import ca.uhn.fhir.rest.param.ReferenceParam; @Retention(RetentionPolicy.RUNTIME) diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/BaseMethodBinding.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/BaseMethodBinding.java index cb3fadf02b8..1b682e2e52d 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/BaseMethodBinding.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/BaseMethodBinding.java @@ -20,7 +20,7 @@ package ca.uhn.fhir.rest.method; * #L% */ -import static org.apache.commons.lang3.StringUtils.*; +import static org.apache.commons.lang3.StringUtils.isBlank; import java.io.IOException; import java.io.Reader; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/BaseResourceReturningMethodBinding.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/BaseResourceReturningMethodBinding.java index 5ad5468fea5..bc157621327 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/BaseResourceReturningMethodBinding.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/BaseResourceReturningMethodBinding.java @@ -61,6 +61,10 @@ abstract class BaseResourceReturningMethodBinding extends BaseMethodBinding SPECIAL_PARAM_NAMES; - - static { - HashSet specialParamNames = new HashSet(); - specialParamNames.add("_id"); - specialParamNames.add("_language"); - SPECIAL_PARAM_NAMES = Collections.unmodifiableSet(specialParamNames); - } private Class myDeclaredResourceType; private String myQueryName; @@ -81,16 +73,17 @@ public class SearchMethodBinding extends BaseResourceReturningMethodBinding { if (!(next instanceof SearchParameter)) { continue; } - - SearchParameter sp = (SearchParameter)next; + + SearchParameter sp = (SearchParameter) next; if (sp.getName().startsWith("_")) { if (ALLOWED_PARAMS.contains(sp.getName())) { - String msg = getContext().getLocalizer().getMessage(getClass().getName() + ".invalidSpecialParamName", theMethod.getName(), theMethod.getDeclaringClass().getSimpleName(), sp.getName()); - throw new ConfigurationException(msg); + String msg = getContext().getLocalizer().getMessage(getClass().getName() + ".invalidSpecialParamName", theMethod.getName(), theMethod.getDeclaringClass().getSimpleName(), + sp.getName()); + throw new ConfigurationException(msg); } } } - + } public String getDescription() { @@ -237,11 +230,11 @@ public class SearchMethodBinding extends BaseResourceReturningMethodBinding { } Set keySet = theRequest.getParameters().keySet(); for (String next : keySet) { - if (next.startsWith("_")) { - if (!SPECIAL_PARAM_NAMES.contains(next)) { - continue; - } - } + // if (next.startsWith("_")) { + // if (!SPECIAL_PARAM_NAMES.contains(next)) { + // continue; + // } + // } if (!methodParamsTemp.contains(next)) { return false; } diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/TransactionMethodBinding.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/TransactionMethodBinding.java index ecf8cade8a8..f382a6c7956 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/TransactionMethodBinding.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/TransactionMethodBinding.java @@ -20,7 +20,7 @@ package ca.uhn.fhir.rest.method; * #L% */ -import static org.apache.commons.lang3.StringUtils.*; +import static org.apache.commons.lang3.StringUtils.isNotBlank; import java.io.IOException; import java.lang.reflect.Method; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/QuantityParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/QuantityParam.java index ec33fcad7fd..4745abbb13b 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/QuantityParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/QuantityParam.java @@ -20,10 +20,12 @@ package ca.uhn.fhir.rest.param; * #L% */ +import static ca.uhn.fhir.rest.param.ParameterUtil.escape; +import static org.apache.commons.lang3.StringUtils.defaultString; + import java.math.BigDecimal; import java.util.List; -import static ca.uhn.fhir.rest.param.ParameterUtil.*; -import static org.apache.commons.lang3.StringUtils.*; + import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/interceptor/ResponseValidatingInterceptor.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/interceptor/ResponseValidatingInterceptor.java index 1851bc0c488..b5097b7e633 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/interceptor/ResponseValidatingInterceptor.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/interceptor/ResponseValidatingInterceptor.java @@ -1,5 +1,25 @@ package ca.uhn.fhir.rest.server.interceptor; +/* + * #%L + * HAPI FHIR - Core Library + * %% + * Copyright (C) 2014 University Health Network + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/hapi-fhir-structures-dstu/.classpath b/hapi-fhir-structures-dstu/.classpath index 9ea3e60fb23..84085937997 100644 --- a/hapi-fhir-structures-dstu/.classpath +++ b/hapi-fhir-structures-dstu/.classpath @@ -8,12 +8,6 @@ - - - - - - diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/TinderStructuresMojo.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/TinderStructuresMojo.java index 268a5e884ea..04270238303 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/TinderStructuresMojo.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/TinderStructuresMojo.java @@ -198,8 +198,8 @@ public class TinderStructuresMojo extends AbstractMojo { public static void main(String[] args) throws Exception { - ProfileParser pp = new ProfileParser(); - pp.parseSingleProfile(new File("../hapi-tinder-test/src/test/resources/profile/patient.xml"), "http://foo"); +// ProfileParser pp = new ProfileParser(); +// pp.parseSingleProfile(new File("../hapi-tinder-test/src/test/resources/profile/patient.xml"), "http://foo"); ValueSetGenerator vsp = new ValueSetGenerator(); // vsp.setDirectory("src/test/resources/vs/"); @@ -213,7 +213,7 @@ public class TinderStructuresMojo extends AbstractMojo { dtp.writeAll(new File(dtOutputDir), null, "ca.uhn.fhir.model.dstu"); ResourceGeneratorUsingSpreadsheet rp = new ResourceGeneratorUsingSpreadsheet(); - rp.setBaseResourceNames(Arrays.asList("patient")); + rp.setBaseResourceNames(Arrays.asList("securityevent")); rp.parse(); // rp.bindValueSets(vsp); diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/model/ResourceBlock.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/model/ResourceBlock.java index d03918f8a97..be4ce717cbc 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/model/ResourceBlock.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/model/ResourceBlock.java @@ -11,6 +11,15 @@ public class ResourceBlock extends Child { return super.getChildren(); } + @Override + public void setElementName(String theName) { + super.setElementName(theName); + String name = theName; + if ("object".equals(name)) { + setForcedClassName("ObjectElement"); + } + } + public String getClassName() { if (myForcedClassName != null) { return myForcedClassName; diff --git a/hapi-tinder-test/pom.xml b/hapi-tinder-test/pom.xml index a3c3d5c6c29..69984f42eab 100644 --- a/hapi-tinder-test/pom.xml +++ b/hapi-tinder-test/pom.xml @@ -84,6 +84,8 @@ device location practitioner + list + securityevent true diff --git a/hapi-tinder-test/src/test/java/test/TestParticulars.java b/hapi-tinder-test/src/test/java/test/TestParticulars.java index f96106ab0d8..073b30293b8 100644 --- a/hapi-tinder-test/src/test/java/test/TestParticulars.java +++ b/hapi-tinder-test/src/test/java/test/TestParticulars.java @@ -2,8 +2,18 @@ package test; import org.junit.Test; +import ca.uhn.test.realstructs.resource.ListResource; +import ca.uhn.test.realstructs.resource.SecurityEvent.ObjectElement; + public class TestParticulars { + @Test + public void testElementsWithSpecialNames() { + // This won't compile if tinder didn't getenerate the right names... + ListResource.class.getName(); + ObjectElement.class.getName(); + } + @Test public void testReferenceDoesntReturnNull() { ca.uhn.test.realstructs.resource.Patient p = new ca.uhn.test.realstructs.resource.Patient();